修改buyeridNumber的字段

src/main/java/com/emato/ccnet/domain/ccnet/CusOrder.java

@@ -164,7 +164,7 @@ public class CusOrder implements Serializable {
     /**
      * 订购人的身份证号
      */
-    private String buyeridNumber;
+    private String buyerIdNumber;
 
     /**
      * 支付企业的海关注册登记编号。
@@ -472,12 +472,12 @@ public class CusOrder implements Serializable {
         this.buyerIdType = buyerIdType;
     }
 
-    public String getBuyeridNumber() {
-        return buyeridNumber;
+    public String getbuyerIdNumber() {
+        return buyerIdNumber;
     }
 
-    public void setBuyeridNumber(String buyeridNumber) {
-        this.buyeridNumber = buyeridNumber;
+    public void setbuyerIdNumber(String buyerIdNumber) {
+        this.buyerIdNumber = buyerIdNumber;
     }
 
     public String getPayCode() {
@@ -672,7 +672,7 @@ public class CusOrder implements Serializable {
             && (this.getBuyerRegNo() == null ? other.getBuyerRegNo() == null : this.getBuyerRegNo().equals(other.getBuyerRegNo()))
             && (this.getBuyerName() == null ? other.getBuyerName() == null : this.getBuyerName().equals(other.getBuyerName()))
             && (this.getBuyerIdType() == null ? other.getBuyerIdType() == null : this.getBuyerIdType().equals(other.getBuyerIdType()))
-            && (this.getBuyeridNumber() == null ? other.getBuyeridNumber() == null : this.getBuyeridNumber().equals(other.getBuyeridNumber()))
+            && (this.getbuyerIdNumber() == null ? other.getbuyerIdNumber() == null : this.getbuyerIdNumber().equals(other.getbuyerIdNumber()))
             && (this.getPayCode() == null ? other.getPayCode() == null : this.getPayCode().equals(other.getPayCode()))
             && (this.getPayName() == null ? other.getPayName() == null : this.getPayName().equals(other.getPayName()))
             && (this.getPayTransactionId() == null ? other.getPayTransactionId() == null : this.getPayTransactionId().equals(other.getPayTransactionId()))
@@ -726,7 +726,7 @@ public class CusOrder implements Serializable {
         result = prime * result + ((getBuyerRegNo() == null) ? 0 : getBuyerRegNo().hashCode());
         result = prime * result + ((getBuyerName() == null) ? 0 : getBuyerName().hashCode());
         result = prime * result + ((getBuyerIdType() == null) ? 0 : getBuyerIdType().hashCode());
-        result = prime * result + ((getBuyeridNumber() == null) ? 0 : getBuyeridNumber().hashCode());
+        result = prime * result + ((getbuyerIdNumber() == null) ? 0 : getbuyerIdNumber().hashCode());
         result = prime * result + ((getPayCode() == null) ? 0 : getPayCode().hashCode());
         result = prime * result + ((getPayName() == null) ? 0 : getPayName().hashCode());
         result = prime * result + ((getPayTransactionId() == null) ? 0 : getPayTransactionId().hashCode());
@@ -783,7 +783,7 @@ public class CusOrder implements Serializable {
         sb.append(", buyerRegNo=").append(buyerRegNo);
         sb.append(", buyerName=").append(buyerName);
         sb.append(", buyerIdType=").append(buyerIdType);
-        sb.append(", buyeridNumber=").append(buyeridNumber);
+        sb.append(", buyerIdNumber=").append(buyerIdNumber);
         sb.append(", payCode=").append(payCode);
         sb.append(", payName=").append(payName);
         sb.append(", payTransactionId=").append(payTransactionId);

src/main/java/com/emato/ccnet/dto/OrderDto.java

@@ -65,7 +65,7 @@ public class OrderDto implements Serializable {
 
     private String buyerIdType;
 
-    private String buyeridNumber;
+    private String buyerIdNumber;
 
     private String payCode;
 
@@ -113,7 +113,7 @@ public class OrderDto implements Serializable {
         this.buyerRegNo = cusOrder.getBuyerRegNo();
         this.buyerName = cusOrder.getBuyerName();
         this.buyerIdType = cusOrder.getBuyerIdType();
-        this.buyeridNumber = cusOrder.getBuyeridNumber();
+        this.buyerIdNumber = cusOrder.getbuyerIdNumber();
         this.payCode = cusOrder.getPayCode();
         this.payName = cusOrder.getPayName();
         this.payTransactionId = cusOrder.getPayTransactionId();
@@ -274,12 +274,12 @@ public class OrderDto implements Serializable {
         this.buyerIdType = buyerIdType;
     }
 
-    public String getBuyeridNumber() {
-        return buyeridNumber;
+    public String getbuyerIdNumber() {
+        return buyerIdNumber;
     }
 
-    public void setBuyeridNumber(String buyeridNumber) {
-        this.buyeridNumber = buyeridNumber;
+    public void setbuyerIdNumber(String buyerIdNumber) {
+        this.buyerIdNumber = buyerIdNumber;
     }
 
     public String getPayCode() {

src/main/java/com/emato/ccnet/service/ccent/impl/CusOrderImpl.java

@@ -213,19 +213,19 @@ public class CusOrderImpl implements CusOrderService{
         cusOrder.setThirdPartyMerchCode(orderBill.getSellerId());
         cusOrder.setThirdPartyMerchName(orderBill.getSellerName());
         cusOrder.setPlaceOrderlTime(orderBill.getCreateTime());
-        cusOrder.setAppStatus(Contants.INIT_STATUS);
+        cusOrder.setAppType(Contants.APP_STATUS_DECLARE);
+        cusOrder.setAppStatus(Contants.APP_STATUS_SEPARETE);
         cusOrder.setAppTime(getNormalOrderNo());
-        cusOrder.setAppStatus(Contants.INIT_STATUS);
         cusOrder.setOrderNo(orderBill.getOrderNo());
         cusOrder.setEbpCode(merchant.getPlatSn());
         cusOrder.setEbpName(merchant.getPlatName());
         cusOrder.setEbcCode(merchant.getMerchSn());
         cusOrder.setEbcName(merchant.getMerchName());
         cusOrder.setGoodsValue(orderBill.getRealAmount());
-        cusOrder.setBuyeridNumber(orderBill.getUserId());
+        cusOrder.setbuyerIdNumber(orderBill.getUserId());
         cusOrder.setBuyerName(orderBill.getTrueName());
         cusOrder.setBuyerIdType(orderBill.getIdType());
-        cusOrder.setBuyeridNumber(orderBill.getIdCode());
+        cusOrder.setbuyerIdNumber(orderBill.getIdCode());
         cusOrder.setPayCode(merchant.getMerchantCustomsCode());
         cusOrder.setPayName(merchant.getMerchantCustomsName());
         cusOrder.setPayTransactionId(orderBill.getTradeNo());

src/main/resources/mybatis/mapper/ccnet/cus_order.xml

@@ -30,7 +30,7 @@
     <result column="buyer_reg_no" jdbcType="VARCHAR" property="buyerRegNo" />
     <result column="buyer_name" jdbcType="VARCHAR" property="buyerName" />
     <result column="buyer_id_type" jdbcType="VARCHAR" property="buyerIdType" />
-    <result column="buyerId_number" jdbcType="VARCHAR" property="buyeridNumber" />
+    <result column="buyerId_number" jdbcType="VARCHAR" property="buyerIdNumber" />
     <result column="pay_code" jdbcType="VARCHAR" property="payCode" />
     <result column="pay_name" jdbcType="VARCHAR" property="payName" />
     <result column="pay_transaction_id" jdbcType="VARCHAR" property="payTransactionId" />
@@ -89,7 +89,7 @@
       #{ebcName,jdbcType=VARCHAR}, #{goodsValue,jdbcType=DECIMAL}, #{freight,jdbcType=DECIMAL}, 
       #{discount,jdbcType=DECIMAL}, #{taxTotal,jdbcType=DECIMAL}, #{acturalPaid,jdbcType=DECIMAL}, 
       #{currency,jdbcType=VARCHAR}, #{buyerRegNo,jdbcType=VARCHAR}, #{buyerName,jdbcType=VARCHAR}, 
-      #{buyerIdType,jdbcType=VARCHAR}, #{buyeridNumber,jdbcType=VARCHAR}, #{payCode,jdbcType=VARCHAR}, 
+      #{buyerIdType,jdbcType=VARCHAR}, #{buyerIdNumber,jdbcType=VARCHAR}, #{payCode,jdbcType=VARCHAR},
       #{payName,jdbcType=VARCHAR}, #{payTransactionId,jdbcType=VARCHAR}, #{batchNumbers,jdbcType=VARCHAR}, 
       #{consignee,jdbcType=VARCHAR}, #{consigneeTelephone,jdbcType=VARCHAR}, #{consigneeAddress,jdbcType=VARCHAR}, 
       #{consigneeDistrict,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{createrSn,jdbcType=VARCHAR}, 
@@ -186,7 +186,7 @@
       <if test="buyerIdType != null">
         buyer_id_type,
       </if>
-      <if test="buyeridNumber != null">
+      <if test="buyerIdNumber != null">
         buyerId_number,
       </if>
       <if test="payCode != null">
@@ -332,8 +332,8 @@
       <if test="buyerIdType != null">
         #{buyerIdType,jdbcType=VARCHAR},
       </if>
-      <if test="buyeridNumber != null">
-        #{buyeridNumber,jdbcType=VARCHAR},
+      <if test="buyerIdNumber != null">
+        #{buyerIdNumber,jdbcType=VARCHAR},
       </if>
       <if test="payCode != null">
         #{payCode,jdbcType=VARCHAR},
@@ -478,7 +478,7 @@
           #{item.buyerRegNo,jdbcType=VARCHAR},
           #{item.buyerName,jdbcType=VARCHAR},
           #{item.buyerIdType,jdbcType=VARCHAR},
-          #{item.buyeridNumber,jdbcType=VARCHAR},
+          #{item.buyerIdNumber,jdbcType=VARCHAR},
           #{item.payCode,jdbcType=VARCHAR},
           #{item.payName,jdbcType=VARCHAR},
           #{item.payTransactionId,jdbcType=VARCHAR},
@@ -606,8 +606,8 @@
       <if test="buyerIdType != null">
         buyer_id_type = #{buyerIdType,jdbcType=VARCHAR},
       </if>
-      <if test="buyeridNumber != null">
-        buyerId_number = #{buyeridNumber,jdbcType=VARCHAR},
+      <if test="buyerIdNumber != null">
+        buyerId_number = #{buyerIdNumber,jdbcType=VARCHAR},
       </if>
       <if test="payCode != null">
         pay_code = #{payCode,jdbcType=VARCHAR},