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

kmall-admin/src/main/java/com/kmall/admin/dto/GoodsDto.java

@@ -119,6 +119,89 @@ public class GoodsDto implements Serializable {
 
     private String thirdPartyMerchCode;
 
+
+    // MychemID
+    private String mychemId;
+
+
+    private String hsCode;
+
+    private String hsCodeName;
+
+    private String plu;
+
+    public String getCounterPrice() {
+        return counterPrice;
+    }
+
+    public void setCounterPrice(String counterPrice) {
+        this.counterPrice = counterPrice;
+    }
+
+    public String getExtraPrice() {
+        return extraPrice;
+    }
+
+    public void setExtraPrice(String extraPrice) {
+        this.extraPrice = extraPrice;
+    }
+
+    public String getUnitPrice() {
+        return unitPrice;
+    }
+
+    public void setUnitPrice(String unitPrice) {
+        this.unitPrice = unitPrice;
+    }
+
+    public String getPromotionDesc() {
+        return promotionDesc;
+    }
+
+    public void setPromotionDesc(String promotionDesc) {
+        this.promotionDesc = promotionDesc;
+    }
+
+    public Integer getGoodsType() {
+        return goodsType;
+    }
+
+    public void setGoodsType(Integer goodsType) {
+        this.goodsType = goodsType;
+    }
+
+    public String getMychemId() {
+        return mychemId;
+    }
+
+    public void setMychemId(String mychemId) {
+        this.mychemId = mychemId;
+    }
+
+    public String getHsCode() {
+        return hsCode;
+    }
+
+    public void setHsCode(String hsCode) {
+        this.hsCode = hsCode;
+    }
+
+    public String getHsCodeName() {
+        return hsCodeName;
+    }
+
+    public void setHsCodeName(String hsCodeName) {
+        this.hsCodeName = hsCodeName;
+    }
+
+    public String getPlu() {
+        return plu;
+    }
+
+    public void setPlu(String plu) {
+        this.plu = plu;
+    }
+
     public String getThirdPartyMerchCode() {
         return thirdPartyMerchCode;
     }

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

@@ -951,6 +951,8 @@ public class GoodsServiceImpl implements GoodsService {
                 goodsEntity.setUpdateTime(new Date());
                 goodsEntity.setModTime(new Date());
                 goodsEntity.setGoodsNumber(Integer.parseInt(goodsDto.getGoodsNumber()));
+                goodsEntity.setPlu(goodsDto.getPlu());
+                goodsEntity.setMychemId(goodsDto.getMychemId());
 
                 if(!isFail){
                     GoodsEntity goods = goodsDao.queryObjectBySn(goodsDto.getGoodsSn());

kmall-admin/src/main/resources/XmlTemplate/GoodsDtoList.xml

@@ -30,6 +30,8 @@
                 <mapping row="1" col="17">GoodsDto.cusDeclEle</mapping>
                 <mapping row="1" col="18">GoodsDto.cusRecCode</mapping>
                 <mapping row="1" col="19">GoodsDto.goodsNumber</mapping>
+                <mapping row="1" col="20">GoodsDto.plu</mapping>
+                <mapping row="1" col="21">GoodsDto.mychemId</mapping>
             </section>
             <loopbreakcondition>
                 <rowcheck offset="0">

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

@@ -501,6 +501,9 @@
 			`create_time`,
 			`moder_sn`,
 			`mod_time`,
+			`mychem_id`,
+			`hs_code`,
+			`hs_code_name`,
 			`tstm`)
 		values(
 			#{merchSn},
@@ -553,6 +556,9 @@
 			#{createTime},
 			#{moderSn},
 			#{modTime},
+			#{mychemId},
+			#{hsCode},
+			#{hsCodeName},
 			#{tstm})
     </insert>
 

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

@@ -2039,8 +2039,8 @@
         o.pay_time as timeStampDetails,
         u.username as staffID,
         u.username as staffName,
-        c.id as hsCode,
-        c.name as hsCodeName,
+        gs.hs_code as hsCode,
+        gs.hs_code_name as hsCodeName,
         gs.goods_sn as ematouCode,
         gs.plu as plu,
         gs.mychem_id as mychemID,
@@ -2068,7 +2068,6 @@
         left join sys_cus_unit_code uc on uc.code = gs.unit_code
         left join mall_product_store_rela sr on sr.goods_id=gs.id
         left join mall_brand b on b.id=sr.brand_id
-        left join mall_category c on b.category_id = c.id
         left join mall_supplier sup on gs.supplier_id = sup.id
         WHERE 1=1
         <if test="orderSn != null and orderSn.trim() != ''">