订单处理新增一个字段

data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java

@@ -855,7 +855,7 @@ public class OrderSyncJob extends PointJob {
         dcBaseOmsOrder.setCompanyId(omsResult.getCompanyId());
         dcBaseOmsOrder.setAreaId(omsResult.getAreaId());
         dcBaseOmsOrder.setHasCancle(omsResult.getHasCancle());
-
+        dcBaseOmsOrder.setProfitOms(omsResult.getOrderCharge().getProfitTotal() != null? omsResult.getOrderCharge().getProfitTotal().getAmount() : BigDecimal.ZERO);
         if (omsResult.getLogisticsItems() != null && omsResult.getLogisticsItems().size() > 0) {
             Warehouse warehouse = omsResult.getLogisticsItems().get(0).getWarehouse();
             Logistics logisticsMethod = omsResult.getLogisticsItems().get(0).getLogisticsMethod();

data-base/base-sync-oms-order/src/main/java/com/bailuntec/mapper/DcBaseOmsOrderMapper.java

@@ -122,7 +122,6 @@ public interface DcBaseOmsOrderMapper {
      */
     int upsertSelective(DcBaseOmsOrder record);
 
-
     void logicDeleteOmsSku(DcBaseOmsOrder dcBaseOmsOrder);
 
     void logicDeleteOmsPick(DcBaseOmsOrder dcBaseOmsOrder);

data-base/base-sync-oms-order/src/main/java/com/bailuntec/mapper/DcBaseOmsOrderMapper.xml

@@ -95,6 +95,7 @@
     <result column="has_scalp" jdbcType="BIT" property="hasScalp" />
     <result column="has_innersale" jdbcType="BIT" property="hasInnersale" />
     <result column="company_id" jdbcType="INTEGER" property="companyId" />
+    <result column="profit_oms" jdbcType="DECIMAL" property="profitOms" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -184,7 +185,7 @@
     buyer_email, has_fba_exception, has_platform_exception, has_cancle, area_id, gmt_create, 
     gmt_modified, quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name, 
     logistics_method_code, logistics_method_name, bailun_picking_status, bailun_require_logistics, 
-    has_scalp, has_innersale, company_id
+    has_scalp, has_innersale, company_id, profit_oms
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
     <!--
@@ -277,8 +278,8 @@
       logistics_warehouse_code, logistics_warehouse_name, 
       logistics_method_code, logistics_method_name, 
       bailun_picking_status, bailun_require_logistics, 
-      has_scalp, has_innersale, company_id
-      )
+      has_scalp, has_innersale, company_id, 
+      profit_oms)
     values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, 
       #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, 
       #{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR}, 
@@ -311,8 +312,8 @@
       #{logisticsWarehouseCode,jdbcType=VARCHAR}, #{logisticsWarehouseName,jdbcType=VARCHAR}, 
       #{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR}, 
       #{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR}, 
-      #{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}
-      )
+      #{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, 
+      #{profitOms,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
     <!--
@@ -588,6 +589,9 @@
       <if test="companyId != null">
         company_id,
       </if>
+      <if test="profitOms != null">
+        profit_oms,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -857,6 +861,9 @@
       <if test="companyId != null">
         #{companyId,jdbcType=INTEGER},
       </if>
+      <if test="profitOms != null">
+        #{profitOms,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultType="java.lang.Long">
@@ -1143,6 +1150,9 @@
       <if test="record.companyId != null">
         company_id = #{record.companyId,jdbcType=INTEGER},
       </if>
+      <if test="record.profitOms != null">
+        profit_oms = #{record.profitOms,jdbcType=DECIMAL},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -1242,7 +1252,8 @@
       bailun_require_logistics = #{record.bailunRequireLogistics,jdbcType=VARCHAR},
       has_scalp = #{record.hasScalp,jdbcType=BIT},
       has_innersale = #{record.hasInnersale,jdbcType=BIT},
-      company_id = #{record.companyId,jdbcType=INTEGER}
+      company_id = #{record.companyId,jdbcType=INTEGER},
+      profit_oms = #{record.profitOms,jdbcType=DECIMAL}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1518,6 +1529,9 @@
       <if test="companyId != null">
         company_id = #{companyId,jdbcType=INTEGER},
       </if>
+      <if test="profitOms != null">
+        profit_oms = #{profitOms,jdbcType=DECIMAL},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1614,7 +1628,8 @@
       bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
       has_scalp = #{hasScalp,jdbcType=BIT},
       has_innersale = #{hasInnersale,jdbcType=BIT},
-      company_id = #{companyId,jdbcType=INTEGER}
+      company_id = #{companyId,jdbcType=INTEGER},
+      profit_oms = #{profitOms,jdbcType=DECIMAL}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
@@ -1892,6 +1907,9 @@
       <if test="companyId != null">
         company_id,
       </if>
+      <if test="profitOms != null">
+        profit_oms,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -2162,6 +2180,9 @@
       <if test="companyId != null">
         #{companyId,jdbcType=INTEGER},
       </if>
+      <if test="profitOms != null">
+        #{profitOms,jdbcType=DECIMAL},
+      </if>
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -2432,6 +2453,9 @@
       <if test="companyId != null">
         company_id = #{companyId,jdbcType=INTEGER},
       </if>
+      <if test="profitOms != null">
+        profit_oms = #{profitOms,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
@@ -2458,7 +2482,7 @@
       buyer_email, has_fba_exception, has_platform_exception, has_cancle, area_id, gmt_create, 
       gmt_modified, quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name, 
       logistics_method_code, logistics_method_name, bailun_picking_status, bailun_require_logistics, 
-      has_scalp, has_innersale, company_id)
+      has_scalp, has_innersale, company_id, profit_oms)
     values
     (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, 
       #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, 
@@ -2492,8 +2516,8 @@
       #{logisticsWarehouseCode,jdbcType=VARCHAR}, #{logisticsWarehouseName,jdbcType=VARCHAR}, 
       #{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR}, 
       #{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR}, 
-      #{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}
-      )
+      #{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, 
+      #{profitOms,jdbcType=DECIMAL})
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
     origin_order_id = #{originOrderId,jdbcType=VARCHAR}, 
@@ -2583,7 +2607,8 @@
     bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR}, 
     has_scalp = #{hasScalp,jdbcType=BIT}, 
     has_innersale = #{hasInnersale,jdbcType=BIT}, 
-    company_id = #{companyId,jdbcType=INTEGER}
+    company_id = #{companyId,jdbcType=INTEGER}, 
+    profit_oms = #{profitOms,jdbcType=DECIMAL}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
     <!--
@@ -2603,10 +2628,11 @@
     limit 1
   </select>
 
+
   <update id="logicDeleteOmsSku">
         update  dc_base_oms_sku set has_delete=1 where origin_order_id=#{originOrderId,jdbcType=VARCHAR} and bailun_account_id = #{bailunAccountId,jdbcType=INTEGER}
   </update>
-  
+
   <update id="logicDeleteOmsPick">
         update  dc_base_oms_pick set has_delete=1 where origin_order_id=#{originOrderId,jdbcType=VARCHAR} and bailun_account_id = #{bailunAccountId,jdbcType=INTEGER}
   </update>

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

@@ -809,6 +809,15 @@ public class DcBaseOmsOrder {
     private Integer companyId;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.profit_oms
+     *
+     * @mbg.generated
+     */
+    private BigDecimal profitOms;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_oms_order
      *
@@ -909,6 +918,7 @@ public class DcBaseOmsOrder {
         sb.append(", hasScalp=").append(hasScalp);
         sb.append(", hasInnersale=").append(hasInnersale);
         sb.append(", companyId=").append(companyId);
+        sb.append(", profitOms=").append(profitOms);
         sb.append("]");
         return sb.toString();
     }
@@ -1019,7 +1029,8 @@ public class DcBaseOmsOrder {
             && (this.getBailunRequireLogistics() == null ? other.getBailunRequireLogistics() == null : this.getBailunRequireLogistics().equals(other.getBailunRequireLogistics()))
             && (this.getHasScalp() == null ? other.getHasScalp() == null : this.getHasScalp().equals(other.getHasScalp()))
             && (this.getHasInnersale() == null ? other.getHasInnersale() == null : this.getHasInnersale().equals(other.getHasInnersale()))
-            && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()));
+            && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
+            && (this.getProfitOms() == null ? other.getProfitOms() == null : this.getProfitOms().equals(other.getProfitOms()));
     }
 
     /**
@@ -1121,6 +1132,7 @@ public class DcBaseOmsOrder {
         result = prime * result + ((getHasScalp() == null) ? 0 : getHasScalp().hashCode());
         result = prime * result + ((getHasInnersale() == null) ? 0 : getHasInnersale().hashCode());
         result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
+        result = prime * result + ((getProfitOms() == null) ? 0 : getProfitOms().hashCode());
         return result;
     }
 }
\ No newline at end of file

data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsOrderExample.java

@@ -6110,6 +6110,66 @@ public class DcBaseOmsOrderExample {
             addCriterion("company_id not between", value1, value2, "companyId");
             return (Criteria) this;
         }
+
+        public Criteria andProfitOmsIsNull() {
+            addCriterion("profit_oms is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitOmsIsNotNull() {
+            addCriterion("profit_oms is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitOmsEqualTo(BigDecimal value) {
+            addCriterion("profit_oms =", value, "profitOms");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitOmsNotEqualTo(BigDecimal value) {
+            addCriterion("profit_oms <>", value, "profitOms");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitOmsGreaterThan(BigDecimal value) {
+            addCriterion("profit_oms >", value, "profitOms");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitOmsGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("profit_oms >=", value, "profitOms");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitOmsLessThan(BigDecimal value) {
+            addCriterion("profit_oms <", value, "profitOms");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitOmsLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("profit_oms <=", value, "profitOms");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitOmsIn(List<BigDecimal> values) {
+            addCriterion("profit_oms in", values, "profitOms");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitOmsNotIn(List<BigDecimal> values) {
+            addCriterion("profit_oms not in", values, "profitOms");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitOmsBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("profit_oms between", value1, value2, "profitOms");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitOmsNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("profit_oms not between", value1, value2, "profitOms");
+            return (Criteria) this;
+        }
     }
 
     /**