Merge branch 'master' of xwh/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/Test.java

@@ -55,6 +55,7 @@ public class Test {
         //构建Request
         String  url = "http://127.0.0.1:8680/al/product/addPdProductList";
         Request request = com.kmall.admin.utils.oms.OkHttpUtils.buildRequest(url, JSON.toJSONString(sParaTemp));
+        String s = JSON.toJSONString(sParaTemp);
         // 同步访问,返回结果字符串
         String responseString = null;
         try {

kmall-admin/src/main/java/com/kmall/admin/entity/GoodsEntity.java

@@ -146,6 +146,29 @@ public class GoodsEntity implements Serializable {
 
     private Long createUserDeptId;
 
+
+
+    private String prodName;
+
+    public String getProdName() {
+        return prodName;
+    }
+
+    public void setProdName(String prodName) {
+        this.prodName = prodName;
+    }
+
+    private String prodRecordName; // 产品中文备案名称
+
+
+    public String getProdRecordName() {
+        return prodRecordName;
+    }
+
+    public void setProdRecordName(String prodRecordName) {
+        this.prodRecordName = prodRecordName;
+    }
+
     // 商品规格
 
     // 商品规格编号

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsServiceImpl.java

@@ -624,6 +624,7 @@ public class GoodsServiceImpl implements GoodsService {
 
 
     @Transactional
+    @Override
     public void updateForImgUrl(GoodsEntity goodsEntity){
         // 修改商品
         goodsDao.update(goodsEntity);
@@ -1971,6 +1972,8 @@ public class GoodsServiceImpl implements GoodsService {
                 if (Objects.nonNull(skuInfoMap)){
                     String hsCodeName = (String) skuInfoMap.get("cusGoodsName");
                     String hsCode = (String) skuInfoMap.get("cusGoodsCode");
+                    String prodName = (String) skuInfoMap.get("prodName");
+                    String prodRecordName = (String) skuInfoMap.get("prodRecordName");
                     BigDecimal impConsumTaxRate = (BigDecimal) skuInfoMap.get("impConsumTaxRate");
                     BigDecimal valueAddedTaxRate = (BigDecimal) skuInfoMap.get("valueAddedTaxRate");
                     BigDecimal legalUnit1Qty = (BigDecimal) skuInfoMap.get("legalUnit1Qty");
@@ -1986,6 +1989,8 @@ public class GoodsServiceImpl implements GoodsService {
                                 goodsEntity.setValueAddedTaxRate(valueAddedTaxRate);
                                 goodsEntity.setIsSyncHsCode("1");
                                 goodsEntity.setLegalUnit1Qty(legalUnit1Qty);
+                                goodsEntity.setProdName(prodName);
+                                goodsEntity.setProdRecordName(prodRecordName);
                                 goodsEntity.setLegalUnit2Qty(legalUnit2Qty);
                                 goodsEntity.setCosmThresholdValue(cosmThresholdValue);
                                 goodsDao.update(goodsEntity);

kmall-admin/src/main/resources/mybatis/mapper/GoodsDao.xml

@@ -82,6 +82,8 @@
         <result column="legal_unit2_qty" property="legalUnit2Qty"/>
         <result column="cosm_threshold_value" property="cosmThresholdValue"/>
         <result column="to_be_restored" property="toBeRestored" />
+        <result column="prod_name" property="prodName" />
+        <result column="prod_record_name" property="prodRecordName" />
     </resultMap>
 
     <select id="queryObject" resultType="com.kmall.admin.entity.GoodsEntity">