增加功能:dc_base_sku增加article_number字段

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

@@ -1052,7 +1052,7 @@ public class OrderSyncJob extends PointJob {
                                     if(pickingVariancesList != null && pickingVariancesList.size() > 0){
                                         PickingVariances pickingVariances = pickingVariancesList.stream().filter(l -> pickingOrder.getPickOrderId().equals(l.getPickOrderId()) && l.getBillCost() != null && l.getBillCost().compareTo(BigDecimal.ZERO) != 0).findFirst().orElse(null);
                                         if(pickingVariances != null){
-                                            shipping = pickingVariances.getBillCost();
+                                            shipping = pickingVariances.getBillCost().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
                                         }
                                     }
                                     BigDecimal opf = wmsFeeDetailDtos.getOpf() == null ? BigDecimal.ZERO : wmsFeeDetailDtos.getOpf().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);

data-base/base-sync-sku/src/main/java/com/bailuntec/domain/pojo/SkuInfo.java

@@ -443,4 +443,10 @@ public class SkuInfo {
 
     @JSONField(name = "productTags")
     private List<GmtProductTag> tags;
+
+    /// <summary>
+    /// 供应商货号
+    /// </summary>
+    @JSONField(name = "articleNumber")
+    public String articleNumber;
 }

data-base/base-sync-sku/src/main/resources/job.properties

@@ -3,7 +3,7 @@
 #EVENT_RDB_STORAGE_PASSWORD=123456
 #ZOOKEEPER_SERVER=127.0.0.1:2181
 EVENT_RDB_STORAGE_DRIVER=com.mysql.jdbc.Driver
-EVENT_RDB_STORAGE_URL=jdbc:mysql://10.0.8.15:3306/bailun_datacenter?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+EVENT_RDB_STORAGE_URL=jdbc:mysql://10.0.8.113:3306/bailun_datacenter?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false
 EVENT_RDB_STORAGE_USERNAME=root
 EVENT_RDB_STORAGE_PASSWORD=#7kfnymAM$Y9-Ntf
 ZOOKEEPER_SERVER=172.31.255.120:2181

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

@@ -665,6 +665,15 @@ public class DcBaseSku {
     private String tags;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_sku.articleNumber
+     *
+     * @mbg.generated
+     */
+    private String articleNumber;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_sku
      *
@@ -749,6 +758,7 @@ public class DcBaseSku {
         sb.append(", productType=").append(productType);
         sb.append(", productTypeDesc=").append(productTypeDesc);
         sb.append(", tags=").append(tags);
+        sb.append(", articleNumber=").append(articleNumber);
         sb.append("]");
         return sb.toString();
     }
@@ -843,7 +853,8 @@ public class DcBaseSku {
             && (this.getBrand() == null ? other.getBrand() == null : this.getBrand().equals(other.getBrand()))
             && (this.getProductType() == null ? other.getProductType() == null : this.getProductType().equals(other.getProductType()))
             && (this.getProductTypeDesc() == null ? other.getProductTypeDesc() == null : this.getProductTypeDesc().equals(other.getProductTypeDesc()))
-            && (this.getTags() == null ? other.getTags() == null : this.getTags().equals(other.getTags()));
+            && (this.getTags() == null ? other.getTags() == null : this.getTags().equals(other.getTags()))
+            && (this.getArticleNumber() == null ? other.getArticleNumber() == null : this.getArticleNumber().equals(other.getArticleNumber()));
     }
 
     /**
@@ -929,6 +940,7 @@ public class DcBaseSku {
         result = prime * result + ((getProductType() == null) ? 0 : getProductType().hashCode());
         result = prime * result + ((getProductTypeDesc() == null) ? 0 : getProductTypeDesc().hashCode());
         result = prime * result + ((getTags() == null) ? 0 : getTags().hashCode());
+        result = prime * result + ((getArticleNumber() == null) ? 0 : getArticleNumber().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -502,6 +502,9 @@
             <if test="tags != null">
                 tags,
             </if>
+            <if test="articleNumber != null">
+                article_number,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -723,6 +726,9 @@
             <if test="tags != null">
                 #{tags,jdbcType=VARCHAR},
             </if>
+            <if test="articleNumber != null">
+                #{articleNumber,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseSkuExample"
@@ -962,6 +968,9 @@
             <if test="record.tags != null">
                 tags = #{record.tags,jdbcType=VARCHAR},
             </if>
+            <if test="record.articleNumber != null">
+                article_number = #{record.articleNumber,jdbcType=VARCHAR},
+            </if>
         </set>
         <if test="_parameter != null">
             <include refid="Update_By_Example_Where_Clause"/>