增加功能:同步OMS订单增加Skutype字段

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

@@ -1357,7 +1357,6 @@ public class OrderSyncJob extends PointJob {
         dcBaseOmsSku.setBailunSku(bailunSku.getBailunSku());
         if (bailunSku.getProSkuItemExtVO() != null) {
             dcBaseOmsSku.setBailunGroupSku(bailunSku.getProSkuItemExtVO().getGroupSku());
-            dcBaseOmsSku.setBailunToSkuType(bailunSku.getProSkuItemExtVO().getToSkumsType());
         }
         if (dcBaseWarehouse != null) {
             dcBaseOmsSku.setWarehouseCode(dcBaseWarehouse.getWarehouseCode());

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

@@ -449,4 +449,10 @@ public class SkuInfo {
     /// </summary>
     @JSONField(name = "articleNumber")
     public String articleNumber;
+
+    /// <summary>
+    /// 商品来源
+    /// </summary>
+    @JSONField(name = "toSkumsType")
+    public Integer bailunToSkuType;
 }

data-base/base-sync-sku/src/main/java/com/bailuntec/job/SkuCoroutineMSSyncJob.java

@@ -56,7 +56,7 @@ public class SkuCoroutineMSSyncJob extends PointJob {
                 response = client.newCall(request).execute();
                 resultStr = response.body().string();
             } catch (IOException e) {
-                throw new RuntimeException("调用SKUMS系统接口失败", e);
+                throw new RuntimeException("调用SKUMS系统接口dc_base_stock失败", e);
             } finally {
                 if (response != null) {
                     response.close();

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

@@ -378,15 +378,6 @@ public class DcBaseOmsSku {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column dc_base_oms_sku.bailun_to_sku_type
-     *
-     * @mbg.generated
-     */
-    private Integer bailunToSkuType;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_base_oms_sku.bailun_sku_title_en
      *
      * @mbg.generated

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

@@ -674,6 +674,15 @@ public class DcBaseSku {
     private String articleNumber;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_sku.bailun_to_sku_type
+     *
+     * @mbg.generated
+     */
+    private Integer bailunToSkuType;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_sku
      *
@@ -759,6 +768,7 @@ public class DcBaseSku {
         sb.append(", productTypeDesc=").append(productTypeDesc);
         sb.append(", tags=").append(tags);
         sb.append(", articleNumber=").append(articleNumber);
+        sb.append(", bailunToSkuType=").append(bailunToSkuType);
         sb.append("]");
         return sb.toString();
     }
@@ -854,7 +864,9 @@ public class DcBaseSku {
             && (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.getArticleNumber() == null ? other.getArticleNumber() == null : this.getArticleNumber().equals(other.getArticleNumber()));
+            && (this.getArticleNumber() == null ? other.getArticleNumber() == null : this.getArticleNumber().equals(other.getArticleNumber()))
+            && (this.getBailunToSkuType() == null ? other.getBailunToSkuType() == null : this.getBailunToSkuType().equals(other.getBailunToSkuType()));
+
     }
 
     /**
@@ -941,6 +953,7 @@ public class DcBaseSku {
         result = prime * result + ((getProductTypeDesc() == null) ? 0 : getProductTypeDesc().hashCode());
         result = prime * result + ((getTags() == null) ? 0 : getTags().hashCode());
         result = prime * result + ((getArticleNumber() == null) ? 0 : getArticleNumber().hashCode());
+        result = prime * result + ((getBailunToSkuType() == null) ? 0 : getBailunToSkuType().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -524,9 +524,6 @@
             <if test="bailunGroupSku != null">
                 bailun_group_sku,
             </if>
-            <if test="bailunToSkuType != null">
-                bailun_to_sku_type,
-            </if>
             <if test="bailunSkuTitleEn != null">
                 bailun_sku_title_en,
             </if>
@@ -925,9 +922,6 @@
             <if test="bailunGroupSku != null">
                 #{bailunGroupSku,jdbcType=VARCHAR},
             </if>
-            <if test="bailunToSkuType != null">
-                #{bailunToSkuType,jdbcType=INTEGER},
-            </if>
             <if test="bailunSkuTitleEn != null">
                 #{bailunSkuTitleEn,jdbcType=VARCHAR},
             </if>
@@ -1344,9 +1338,6 @@
             <if test="record.bailunGroupSku != null">
                 bailun_group_sku = #{record.bailunGroupSku,jdbcType=VARCHAR},
             </if>
-            <if test="record.bailunToSkuType != null">
-                bailun_to_sku_type = #{record.bailunToSkuType,jdbcType=INTEGER},
-            </if>
             <if test="record.bailunSkuTitleEn != null">
                 bailun_sku_title_en = #{record.bailunSkuTitleEn,jdbcType=VARCHAR},
             </if>

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

@@ -505,6 +505,9 @@
             <if test="articleNumber != null">
                 article_number,
             </if>
+            <if test="bailunToSkuType != null">
+                bailun_to_sku_type,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -729,6 +732,9 @@
             <if test="articleNumber != null">
                 #{articleNumber,jdbcType=VARCHAR},
             </if>
+            <if test="bailunToSkuType != null">
+                #{bailunToSkuType,jdbcType=INTEGER},
+            </if>
         </trim>
     </insert>
     <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseSkuExample"
@@ -971,6 +977,9 @@
             <if test="record.articleNumber != null">
                 article_number = #{record.articleNumber,jdbcType=VARCHAR},
             </if>
+            <if test="record.bailunToSkuType != null">
+                bailun_to_sku_type = #{record.bailunToSkuType,jdbcType=INTEGER},
+            </if>
         </set>
         <if test="_parameter != null">
             <include refid="Update_By_Example_Where_Clause"/>