Merge remote-tracking branch 'origin/master'

data-base/base-sync-purchase-details/src/main/java/com/bailuntec/domain/dto/PurchaseDetailDTO.java

@@ -371,5 +371,14 @@ public class PurchaseDetailDTO {
     @JSONField(name = "arrivalstatus")
     private Integer arrivalStatus;
 
+    @JSONField(name = "buyamount")
+    private Integer amountBuy;
+
+    @JSONField(name = "payamount")
+    private Integer amountPayed;
+
+    @JSONField(name = "expressfee")
+    private Integer amountExpress;
+
 }
 

data-base/base-sync-purchase-details/src/main/resources/const.properties

-PURCHASE_DETAILS_URL=http://purchase.bailuntec.com/api/GetPagePurchaseSkuInfo
+PURCHASE_DETAILS_URL=http://api.purchase.bailuntec.com/api/GetPagePurchaseSkuInfo
 SEMI_PURCHASE_DETAILS_URL=http://mjcg.bailuntec.com/Api/GetPagePurchaseSkuInfo
 #PURCHASE_DETAILS_URL=http://10.0.6.15:3333/api/GetPagePurchaseSkuInfo
 PURCHASE_AIMS_URL=http://api.purchase.bailuntec.com/Api/PurchaseSource
\ No newline at end of file

data-common/src/main/java/com/bailuntec/domain/entity/DcBasePurchaseDetails.java

 package com.bailuntec.domain.entity;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -422,6 +423,16 @@ public class DcBasePurchaseDetails {
      */
     private Integer arrivalStatus;
 
+
+    private Integer amountBuy;
+
+
+    private Integer amountPayed;
+
+
+    private Integer amountExpress;
+
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_purchase_details

data-common/src/main/java/com/bailuntec/mapper/DcBasePurchaseDetailsMapper.xml

@@ -52,6 +52,9 @@
     <result column="pay_status" jdbcType="INTEGER" property="payStatus" />
     <result column="last_signtime" jdbcType="TIMESTAMP" property="lastSigntime" />
     <result column="arrival_status" jdbcType="INTEGER" property="arrivalStatus" />
+    <result column="amount_buy" jdbcType="DECIMAL" property="amountBuy" />
+    <result column="amount_payed" jdbcType="DECIMAL" property="amountPayed" />
+    <result column="amount_express" jdbcType="DECIMAL" property="amountExpress" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -209,7 +212,9 @@
       logistics_order_id, logistics_company_name, 
       company_id, ispush, isallot, 
       isaims, pay_type, pay_status, 
-      last_signtime, arrival_status)
+      last_signtime, arrival_status
+
+      )
     values (#{id,jdbcType=INTEGER}, #{purchaseId,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, 
       #{purchaseCategoryName,jdbcType=VARCHAR}, #{deliverId,jdbcType=INTEGER}, #{deliverName,jdbcType=VARCHAR}, 
       #{deliverValue,jdbcType=INTEGER}, #{buyerName,jdbcType=VARCHAR}, #{warehouseFromCode,jdbcType=VARCHAR}, 
@@ -373,6 +378,15 @@
       <if test="arrivalStatus != null">
         arrival_status,
       </if>
+      <if test="amountBuy != null">
+        amount_buy,
+      </if>
+      <if test="amountPayed != null">
+        amount_payed,
+      </if>
+      <if test="amountExpress != null">
+        amount_express
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -513,6 +527,15 @@
       <if test="arrivalStatus != null">
         #{arrivalStatus,jdbcType=INTEGER},
       </if>
+      <if test="amountBuy != null">
+        #{amountBuy,jdbcType=DECIMAL},
+      </if>
+      <if test="amountPayed != null">
+        #{amountPayed,jdbcType=DECIMAL},
+      </if>
+      <if test="amountExpress != null">
+        #{amountExpress,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBasePurchaseDetailsExample" resultType="java.lang.Long">
@@ -670,6 +693,19 @@
       <if test="record.arrivalStatus != null">
         arrival_status = #{record.arrivalStatus,jdbcType=INTEGER},
       </if>
+
+
+
+      <if test="record.arrivalStatus != null">
+        amount_buy = #{record.amountBuy,jdbcType=DECIMAL},
+      </if>
+      <if test="record.arrivalStatus != null">
+        amount_payed = #{record.amountPayed,jdbcType=DECIMAL},
+      </if>
+      <if test="record.arrivalStatus != null">
+        amount_express = #{record.amountExpress,jdbcType=DECIMAL},
+      </if>
+
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />