xwh修改产品备案对接相关代码

kmall-admin/src/main/java/com/kmall/admin/controller/GoodsProductController.java

@@ -141,7 +141,8 @@ public class GoodsProductController {
                 builder.put("merchSn", "商户编号");
                 builder.put("sku", "sku（商品料件号）");
                 builder.put("prodBarcode", "商品条形码");
-                builder.put("prodName", "品名");
+                builder.put("prodName", "商品中文名");
+                builder.put("prodEname", "商品英文名");
                 builder.put("prodBrand", "品牌");
                 builder.put("unitCode", "计量单位");
                 builder.put("cusGoodsCode", "商品编码");
@@ -150,7 +151,7 @@ public class GoodsProductController {
                 builder.put("ciqProdModel", "规格型号");
                 builder.put("ciqMainEle", "主要成分");
                 builder.put("declCurrencyCode", "申报币种代码");
-                builder.put("netWeight", "单个净重（g）");
+                builder.put("netWeight", "净重（kg）");
                 builder.put("declPrice", "申报价格（RMB）");
                 builder.put("legalUnit1Qty", "第一法定单位数量");
                 builder.put("legalUnit2Qty", "第二法定单位数量");

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

@@ -121,6 +121,25 @@ public class GoodsProductDto implements Serializable {
 
     private String thirdMerchSn;
 
+    private String prodRecordName;
+
+    private String prodRecordEname;
+
+    public String getProdRecordName() {
+        return prodRecordName;
+    }
+
+    public void setProdRecordName(String prodRecordName) {
+        this.prodRecordName = prodRecordName;
+    }
+
+    public String getProdRecordEname() {
+        return prodRecordEname;
+    }
+
+    public void setProdRecordEname(String prodRecordEname) {
+        this.prodRecordEname = prodRecordEname;
+    }
 
     public String getMerchSn() {
         return merchSn;

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

@@ -186,6 +186,36 @@ public class GoodsProductEntity implements Serializable {
 
     private String isSend;
 
+    private String prodRecordName;
+
+    private String prodRecordEname;
+
+    private String prodEname;
+
+
+    public String getProdRecordName() {
+        return prodRecordName;
+    }
+
+    public void setProdRecordName(String prodRecordName) {
+        this.prodRecordName = prodRecordName;
+    }
+
+    public String getProdRecordEname() {
+        return prodRecordEname;
+    }
+
+    public void setProdRecordEname(String prodRecordEname) {
+        this.prodRecordEname = prodRecordEname;
+    }
+
+    public String getProdEname() {
+        return prodEname;
+    }
+
+    public void setProdEname(String prodEname) {
+        this.prodEname = prodEname;
+    }
 
     public String getIsSend() {
         return isSend;

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

@@ -94,7 +94,10 @@ public class GoodsProductServiceImpl implements GoodsProductService {
                     throw new RRException("第" + count + "行的商品条形码为空！");
                 }
                 if (StringUtils.isEmpty(goodsProductDto.getProdName())) {
-                    throw new RRException("第" + count + "行的品名为空！");
+                    throw new RRException("第" + count + "行的商品中文名为空！");
+                }
+                if (StringUtils.isEmpty(goodsProductDto.getProdEname())) {
+                    throw new RRException("第" + count + "行的商品英文名为空！");
                 }
                 if (StringUtils.isEmpty(goodsProductDto.getProdBrand())) {
                     throw new RRException("第" + count + "行的品牌为空！");

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

@@ -9,30 +9,33 @@
                 <mapping row="1" col="1">GoodsProductDto.sku</mapping>
                 <mapping row="1" col="2">GoodsProductDto.prodBarcode</mapping>
                 <mapping row="1" col="3">GoodsProductDto.prodName</mapping>
-                <mapping row="1" col="4">GoodsProductDto.prodBrand</mapping>
-                <mapping row="1" col="5">GoodsProductDto.unitCode</mapping>
-                <mapping row="1" col="6">GoodsProductDto.cusGoodsCode</mapping>
-                <mapping row="1" col="7">GoodsProductDto.cusDeclEle</mapping>
-                <mapping row="1" col="8">GoodsProductDto.oriCntCode</mapping>
-                <mapping row="1" col="9">GoodsProductDto.ciqProdModel</mapping>
-                <mapping row="1" col="10">GoodsProductDto.ciqMainEle</mapping>
-                <mapping row="1" col="11">GoodsProductDto.declCurrencyCode</mapping>
-                <mapping row="1" col="12">GoodsProductDto.netWeight</mapping>
-                <mapping row="1" col="13">GoodsProductDto.declPrice</mapping>
-                <mapping row="1" col="14">GoodsProductDto.legalUnit1Qty</mapping>
-                <mapping row="1" col="15">GoodsProductDto.legalUnit2Qty</mapping>
-                <mapping row="1" col="16">GoodsProductDto.ciqMonitorType</mapping>
-                <mapping row="1" col="17">GoodsProductDto.prodCompName</mapping>
-                <mapping row="1" col="18">GoodsProductDto.prodCompCntCode</mapping>
-                <mapping row="1" col="19">GoodsProductDto.itemRecordNo</mapping>
-                <mapping row="1" col="20">GoodsProductDto.isLaw</mapping>
-                <mapping row="1" col="21">GoodsProductDto.isGift</mapping>
-                <mapping row="1" col="22">GoodsProductDto.supplierName</mapping>
-                <mapping row="1" col="23">GoodsProductDto.supplierCntCode</mapping>
-                <mapping row="1" col="24">GoodsProductDto.grossWeight</mapping>
-                <mapping row="1" col="25">GoodsProductDto.localEmsNo</mapping>
-                <mapping row="1" col="26">GoodsProductDto.emsClassCode</mapping>
-                <mapping row="1" col="27">GoodsProductDto.thirdMerchSn</mapping>
+                <mapping row="1" col="4">GoodsProductDto.prodEname</mapping>
+                <mapping row="1" col="5">GoodsProductDto.prodBrand</mapping>
+                <mapping row="1" col="6">GoodsProductDto.unitCode</mapping>
+                <mapping row="1" col="7">GoodsProductDto.cusGoodsCode</mapping>
+                <mapping row="1" col="8">GoodsProductDto.cusDeclEle</mapping>
+                <mapping row="1" col="9">GoodsProductDto.oriCntCode</mapping>
+                <mapping row="1" col="10">GoodsProductDto.ciqProdModel</mapping>
+                <mapping row="1" col="11">GoodsProductDto.ciqMainEle</mapping>
+                <mapping row="1" col="12">GoodsProductDto.declCurrencyCode</mapping>
+                <mapping row="1" col="13">GoodsProductDto.netWeight</mapping>
+                <mapping row="1" col="14">GoodsProductDto.declPrice</mapping>
+                <mapping row="1" col="15">GoodsProductDto.legalUnit1Qty</mapping>
+                <mapping row="1" col="16">GoodsProductDto.legalUnit2Qty</mapping>
+                <mapping row="1" col="17">GoodsProductDto.ciqMonitorType</mapping>
+                <mapping row="1" col="18">GoodsProductDto.prodCompName</mapping>
+                <mapping row="1" col="19">GoodsProductDto.prodCompCntCode</mapping>
+                <mapping row="1" col="20">GoodsProductDto.itemRecordNo</mapping>
+                <mapping row="1" col="21">GoodsProductDto.isLaw</mapping>
+                <mapping row="1" col="22">GoodsProductDto.isGift</mapping>
+                <mapping row="1" col="23">GoodsProductDto.supplierName</mapping>
+                <mapping row="1" col="24">GoodsProductDto.supplierCntCode</mapping>
+                <mapping row="1" col="25">GoodsProductDto.grossWeight</mapping>
+                <mapping row="1" col="26">GoodsProductDto.localEmsNo</mapping>
+                <mapping row="1" col="27">GoodsProductDto.emsClassCode</mapping>
+                <mapping row="1" col="28">GoodsProductDto.thirdMerchSn</mapping>
+                <mapping row="1" col="29">GoodsProductDto.prodRecordName</mapping>
+                <mapping row="1" col="30">GoodsProductDto.prodRecordEname</mapping>
             </section>
             <loopbreakcondition>
                 <rowcheck offset="0">

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

@@ -11,6 +11,9 @@
         <result property="sku" column="sku"/>
         <result property="cusGoodsCode" column="cus_goods_code"/>
         <result property="prodName" column="prod_name"/>
+		<result property="prodEname" column="prod_ename"/>
+		<result property="prodRecordName" column="prod_record_name"/>
+		<result property="prodRecordEname" column="prod_record_ename"/>
         <result property="ciqProdModel" column="ciq_prod_model"/>
         <result property="prodBrand" column="prod_brand"/>
         <result property="oriCntCode" column="ori_cnt_code"/>
@@ -55,6 +58,9 @@
 			`sku`,
 			`cus_goods_code`,
 			`prod_name`,
+			`prod_ename`,
+			`prod_record_name`,
+			`prod_record_ename`,
 			`ciq_prod_model`,
 			`prod_brand`,
 			`ori_cnt_code`,
@@ -101,6 +107,9 @@
     		`sku`,
     		`cus_goods_code`,
     		`prod_name`,
+			`prod_ename`,
+			`prod_record_name`,
+			`prod_record_ename`,
     		`ciq_prod_model`,
     		`prod_brand`,
     		`ori_cnt_code`,
@@ -168,6 +177,9 @@
 		`sku`,
 		`cus_goods_code`,
 		`prod_name`,
+		`prod_ename`,
+		`prod_record_name`,
+		`prod_record_ename`,
 		`ciq_prod_model`,
 		`prod_brand`,
 		`ori_cnt_code`,
@@ -222,6 +234,9 @@
 		`sku`,
 		`cus_goods_code`,
 		`prod_name`,
+		`prod_ename`,
+		`prod_record_name`,
+		`prod_record_ename`,
 		`ciq_prod_model`,
 		`prod_brand`,
 		`ori_cnt_code`,
@@ -275,6 +290,9 @@
 			`sku`,
 			`cus_goods_code`,
 			`prod_name`,
+			`prod_ename`,
+			`prod_record_name`,
+			`prod_record_ename`,
 			`ciq_prod_model`,
 			`prod_brand`,
 			`ori_cnt_code`,
@@ -316,6 +334,9 @@
 			#{sku},
 			#{cusGoodsCode},
 			#{prodName},
+			#{prodEname},
+			#{prodRecordName},
+			#{prodRecordEname},
 			#{ciqProdModel},
 			#{prodBrand},
 			#{oriCntCode},
@@ -360,6 +381,9 @@
 			<if test="sku != null">`sku` = #{sku}, </if>
 			<if test="cusGoodsCode != null">`cus_goods_code` = #{cusGoodsCode}, </if>
 			<if test="prodName != null">`prod_name` = #{prodName}, </if>
+			<if test="prodEname != null">`prod_ename` = #{prodEname}, </if>
+			<if test="prodRecordName != null">`prod_record_name` = #{prodRecordName}, </if>
+			<if test="prodRecordEname != null">`prod_record_ename` = #{prodRecordEname}, </if>
 			<if test="ciqProdModel != null">`ciq_prod_model` = #{ciqProdModel}, </if>
 			<if test="prodBrand != null">`prod_brand` = #{prodBrand}, </if>
 			<if test="oriCntCode != null">`ori_cnt_code` = #{oriCntCode}, </if>

kmall-admin/src/main/webapp/WEB-INF/page/shop/goodsproduct.html

@@ -32,10 +32,10 @@
                             :on-progress="uploadExcelProgress"
                             :format="['xls','xlsx']"
                             action="../goodsproduct/upload">
-                        <i-button type="ghost" icon="ios-cloud-upload-outline">商品导入</i-button>
+                        <i-button type="ghost" icon="ios-cloud-upload-outline">产品备案导入</i-button>
                     </Upload>
                 </i-col>
-                <a href="../statics/file/goods_product_export_yyyy_mm_dd_v1.0.0.xlsx">产品备案excel导入模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                <a href="../statics/file/goods_product_import_yyyy_mm_dd_v1.0.0.xlsx">产品备案excel导入模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
             </div>
         </Row>
 	    <table id="jqGrid"></table>

kmall-admin/src/main/webapp/js/shop/goods.js

@@ -375,7 +375,7 @@ var vm = new Vue({
             });
         },
         syncGoodsRate: function () {
-            confirm('同步商品税率会影响线上收银，请谨慎确认，同步税率预需要数分钟，确定要同步商品税率？', function () {
+            confirm('同步商品税率会影响线上收银，请谨慎确认，并会同步产品备案信息，同步税率和产品备案信息预需要数分钟，确定要同步？', function () {
                 $.ajax({
                     type: "POST",
                     url: "../goods/syncGoodsRate",

kmall-admin/src/main/webapp/js/shop/goodsproduct.js

@@ -10,6 +10,9 @@ $(function () {
 			{label: 'sku', name: 'sku', index: 'sku', width: 80},
 			{label: '海关商品编码', name: 'cusGoodsCode', index: 'cus_goods_code', width: 80},
 			{label: '中文名称', name: 'prodName', index: 'prod_name', width: 80},
+			{label: '英文名称', name: 'prodEname', index: 'prod_ename', width: 80},
+			{label: '中文备案名称', name: 'prodRecordName', index: 'prod_record_name', width: 80},
+			{label: '英文备案名称', name: 'prodRecordEname', index: 'prod_record_ename', width: 80},
 			{label: '国检规格型号', name: 'ciqProdModel', index: 'ciq_prod_model', width: 80},
 			{label: '品牌', name: 'prodBrand', index: 'prod_brand', width: 80},
 			{label: '原产国代码', name: 'oriCntCode', index: 'ori_cnt_code', width: 80},

kmall-manager/src/main/resources/conf/oms-merch.properties

@@ -17,24 +17,24 @@ merch.queryInveResponseUrl=http://ws.ds-bay.com/al/queryInveResponse
 
 #ccnet\u751F\u4EA7\u73AF\u5883\u67E5\u8BE2\u652F\u4ED8\u5355\u3001\u7535\u5B50\u8BA2\u5355\u3001\u8FD0\u5355\u5931\u8D25\u8BA2\u5355\u63A5\u53E3
 merch.wxOrderResendUrl=http://8.135.102.238:8680/wx/wxOrderResendQueryAll
-#oms\u6D4B\u8BD5\u73AF\u5883\u5BC6\u94A5
-#merch.md5Salt=IxyIvP0sJqlUZinx
-##oms\u6D4B\u8BD5\u73AF\u5883\u6D3B\u4F53\u4EBA\u8138\u6838\u8EAB\u63A5\u53E3
-#merch.livenessRecognitionUrl=http://127.0.0.1:8680/al/faceid/livenessRecognition
-##oms\u6D4B\u8BD5\u73AF\u5883\u8DE8\u5883\u989D\u5EA6\u67E5\u8BE2\u63A5\u53E3
-#merch.quotaInquiryUrl=http://127.0.0.1:8680/al/cus/yearLimit
-#\u7533\u8BF7\u4EA7\u54C1\u5907\u6848\u63A5\u53E3(\u672C\u5730\u6D4B\u8BD5)
-#merch.addPdProductListUrl=http://127.0.0.1:8680/al/product/addPdProductList
+oms\u6D4B\u8BD5\u73AF\u5883\u5BC6\u94A5
+merch.md5Salt=IxyIvP0sJqlUZinx
+#oms\u6D4B\u8BD5\u73AF\u5883\u6D3B\u4F53\u4EBA\u8138\u6838\u8EAB\u63A5\u53E3
+merch.livenessRecognitionUrl=http://127.0.0.1:8680/al/faceid/livenessRecognition
+#oms\u6D4B\u8BD5\u73AF\u5883\u8DE8\u5883\u989D\u5EA6\u67E5\u8BE2\u63A5\u53E3
+merch.quotaInquiryUrl=http://127.0.0.1:8680/al/cus/yearLimit
+\u7533\u8BF7\u4EA7\u54C1\u5907\u6848\u63A5\u53E3(\u672C\u5730\u6D4B\u8BD5)
+merch.addPdProductListUrl=http://127.0.0.1:8680/al/product/addPdProductList
 
 
 ####oms\u751F\u4EA7\u73AF\u5883\u5BC6\u94A5
-merch.md5Salt=IxyIvP0sJqlUZinx
-##oms\u751F\u4EA7\u73AF\u5883\u6D3B\u4F53\u4EBA\u8138\u6838\u8EAB\u63A5\u53E3
-merch.livenessRecognitionUrl=http://ws.ds-bay.com/al/faceid/livenessRecognition
-##oms\u6D4B\u8BD5\u73AF\u5883\u8DE8\u5883\u989D\u5EA6\u67E5\u8BE2\u63A5\u53E3
-merch.quotaInquiryUrl=http://ws.ds-bay.com/al/cus/yearLimit
-#\u7533\u8BF7\u4EA7\u54C1\u5907\u6848\u63A5\u53E3
-merch.addPdProductListUrl=http://ws.ds-bay.com/al/product/addPdProductList
+#merch.md5Salt=IxyIvP0sJqlUZinx
+###oms\u751F\u4EA7\u73AF\u5883\u6D3B\u4F53\u4EBA\u8138\u6838\u8EAB\u63A5\u53E3
+#merch.livenessRecognitionUrl=http://ws.ds-bay.com/al/faceid/livenessRecognition
+###oms\u6D4B\u8BD5\u73AF\u5883\u8DE8\u5883\u989D\u5EA6\u67E5\u8BE2\u63A5\u53E3
+#merch.quotaInquiryUrl=http://ws.ds-bay.com/al/cus/yearLimit
+##\u7533\u8BF7\u4EA7\u54C1\u5907\u6848\u63A5\u53E3
+#merch.addPdProductListUrl=http://ws.ds-bay.com/al/product/addPdProductList