Merge branch 'master' of http://git.ds-bay.com/project/kmall-haikong

kmall-admin/src/main/java/com/kmall/admin/cuspay/biz/ali/AliCusDeclareBiz.java

@@ -122,11 +122,11 @@ public class AliCusDeclareBiz extends AbstractCusDeclareBiz implements CuspayBiz
             aliCbPayDoc.setTradeNo(params.get("tradeNo").toString());
             // 订购人姓名，可空
             if (params.get("buyerIdNo") != null) {
-                aliCbPayDoc.setBuyerName(params.get("buyerIdNo").toString());
+                aliCbPayDoc.setBuyerIdNo(params.get("buyerIdNo").toString());
             }
             // 订购人身份证号，可空
             if (params.get("buyerName") != null) {
-                aliCbPayDoc.setBuyerIdNo(params.get("buyerName").toString());
+                aliCbPayDoc.setBuyerName(params.get("buyerName").toString());
             }
 
             // *********设置支付单报关参数*********
@@ -353,6 +353,7 @@ public class AliCusDeclareBiz extends AbstractCusDeclareBiz implements CuspayBiz
     protected String assemblyDeclareXml(AliCbPayDoc aliCbPayDoc) {
         String MD5Key = environment.getProperty("ali.payment.md5.key");
         String RSAPrivateKey = environment.getProperty("ali.payment.rsa.private-key");
+        String encryption = environment.getProperty("ali.payment.encryption");
 
         Map<String, String> paramMap = new HashMap<>();
         paramMap.put("amount", aliCbPayDoc.getAmount());
@@ -382,13 +383,18 @@ public class AliCusDeclareBiz extends AbstractCusDeclareBiz implements CuspayBiz
                 prestr = prestr + key + "=" + value + "&";
             }
         }
-        // MD5加密
-        String sign = MD5.sign(prestr, MD5Key, "UTF-8");
-        prestr = prestr + "&sign_type=MD5";
 
-        // RSA加密
-        // String sign = RSA.sign(prestr, RSAPrivateKey, "UTF-8");
-        // prestr = prestr + "&sign_type=RSA";
+        String sign = "";
+        // 判断环境
+        if ("dev".equals(encryption)) {
+            // MD5加密
+            sign = MD5.sign(prestr, MD5Key, "UTF-8");
+            prestr = prestr + "&sign_type=MD5";
+        } else if ("prod".equals(encryption)) {
+            // RSA加密
+            sign = RSA.sign(prestr, RSAPrivateKey, "UTF-8");
+            prestr = prestr + "&sign_type=RSA";
+        }
 
         prestr = prestr + "&sign=" + sign;
         prestr = "?" + prestr;

kmall-admin/src/main/java/com/kmall/admin/cuspay/biz/ali/AliCusDeclareQueryBiz.java

@@ -314,6 +314,7 @@ public class AliCusDeclareQueryBiz extends AbstractCusDeclareBiz implements Cusp
     protected String assemblyDeclareQueryXml(AliCbPayDoc aliCbPayDoc, String key2) {
         String MD5Key = environment.getProperty("ali.payment.md5.key");
         String RSAPrivateKey = environment.getProperty("ali.payment.rsa.private-key");
+        String encryption = environment.getProperty("ali.payment.encryption");
 
         Map<String, String> paramMap = new HashMap<>();
         paramMap.put("_input_charset", "UTF-8");
@@ -332,13 +333,18 @@ public class AliCusDeclareQueryBiz extends AbstractCusDeclareBiz implements Cusp
                 prestr = prestr + key + "=" + value + "&";
             }
         }
-        // MD5加密
-        String sign = MD5.sign(prestr, MD5Key, "UTF-8");
-        prestr = prestr + "&sign_type=MD5";
 
-        // RSA加密
-        // String sign = RSA.sign(prestr, RSAPrivateKey, "UTF-8");
-        // prestr = prestr + "&sign_type=RSA";
+        String sign = "";
+        // 判断环境
+        if ("dev".equals(encryption)) {
+            // MD5加密
+            sign = MD5.sign(prestr, MD5Key, "UTF-8");
+            prestr = prestr + "&sign_type=MD5";
+        } else if ("prod".equals(encryption)) {
+            // RSA加密
+            sign = RSA.sign(prestr, RSAPrivateKey, "UTF-8");
+            prestr = prestr + "&sign_type=RSA";
+        }
 
         prestr = prestr + "&sign=" + sign;
         prestr = "?" + prestr;

kmall-admin/src/main/resources/conf/cuspay/cuspay-ali.properties

@@ -1,6 +1,8 @@
 ########## \u6D77\u5173\u63A8\u652F\u4ED8\u51ED\u8BC1\u901A\u7528\u7248\u672C\u914D\u7F6E ##########
 ########## \u539F\u9879\u76EE\u65E0\u914D\u7F6E\u6587\u4EF6\u6CE8\u91CA ##########
 
+# dev\u4F7F\u7528MD5\u52A0\u5BC6\uFF0Cprod\u4F7F\u7528RSA\u52A0\u5BC6
+ali.payment.encryption = prod
 
 # \u652F\u4ED8\u5B9D\u65E7\u7248\u672C\u63A5\u53E3\u914D\u7F6E
 ali.payment.declare.url=https://mapi.alipay.com/gateway.do?
@@ -20,30 +22,30 @@ db.ali.declare.count=2
 
 ## \u5F00\u53D1\u73AF\u5883 - \u5546\u6237\u4FE1\u606F
 # \u5E73\u53F0\u7F16\u53F7
-merchant.plat-sn=146001
-# \u5E73\u53F0\u4E2D\u6587\u540D
-merchant.plat-name=\u4E2D\u7F51\u5546\u57CE
-# \u5546\u6237\u6D77\u5173\u5907\u6848\u7F16\u53F7
-merchant.customs-code=4403160Z3Y
-# \u5546\u6237\u6D77\u5173\u5907\u6848\u540D\u79F0
-merchant.customs-name=\u4E2D\u7F51\u79D1\u6280\uFF08\u6DF1\u5733\uFF09\u6709\u9650\u516C\u53F8
-
-## \u751F\u4EA7\u73AF\u5883 - \u6D77\u63A7\u5546\u6237\u4FE1\u606F
-# \u5E73\u53F0\u7F16\u53F7
-#merchant.plat-sn=44048600Y8
+#merchant.plat-sn=146001
 ## \u5E73\u53F0\u4E2D\u6587\u540D
-#merchant.plat-name=\u73E0\u6D77\u6D77\u63A7\u79D1\u6280\u6709\u9650\u516C\u53F8
+#merchant.plat-name=\u4E2D\u7F51\u5546\u57CE
 ## \u5546\u6237\u6D77\u5173\u5907\u6848\u7F16\u53F7
-#merchant.customs-code=44048600Y8
+#merchant.customs-code=4403160Z3Y
 ## \u5546\u6237\u6D77\u5173\u5907\u6848\u540D\u79F0
-#merchant.customs-name=\u73E0\u6D77\u6D77\u63A7\u79D1\u6280\u6709\u9650\u516C\u53F8
+#merchant.customs-name=\u4E2D\u7F51\u79D1\u6280\uFF08\u6DF1\u5733\uFF09\u6709\u9650\u516C\u53F8
+
+## \u751F\u4EA7\u73AF\u5883 - \u6D77\u63A7\u5546\u6237\u4FE1\u606F
+# \u5E73\u53F0\u7F16\u53F7
+merchant.plat-sn=44048600Y8
+# \u5E73\u53F0\u4E2D\u6587\u540D
+merchant.plat-name=\u73E0\u6D77\u6D77\u63A7\u79D1\u6280\u6709\u9650\u516C\u53F8
+# \u5546\u6237\u6D77\u5173\u5907\u6848\u7F16\u53F7
+merchant.customs-code=44048600Y8
+# \u5546\u6237\u6D77\u5173\u5907\u6848\u540D\u79F0
+merchant.customs-name=\u73E0\u6D77\u6D77\u63A7\u79D1\u6280\u6709\u9650\u516C\u53F8
 
 ############################################
 
 ## \u5F00\u53D1\u73AF\u5883
 # ccnet\u9ED8\u8BA4\u914D\u7F6E\u6587\u4EF6\u7684\u503C
-cus.play.alipay.partner=2088821582509154
-cus.play.alipay.customs=ZONGSHU
+#cus.play.alipay.partner=2088821582509154
+#cus.play.alipay.customs=ZONGSHU
 
 # ccnet dev\u914D\u7F6E\u6587\u4EF6\u7684\u503C
 #cus.play.alipay.partner=2088821582509154
@@ -56,6 +58,6 @@ cus.play.alipay.customs=ZONGSHU
 
 ## \u751F\u4EA7\u73AF\u5883 - \u6D77\u63A7\u652F\u4ED8\u5B9D\u4FE1\u606F
 ## \u652F\u4ED8\u5B9D\u5546\u6237\u5408\u4F5C\u4F19\u4F34\u8EAB\u4EFD\uFF08PID\uFF09
-#cus.play.alipay.partner=2088731576886261
-## \u6D77\u5173\uFF0C\u5E7F\u5DDE\uFF08\u603B\u7F72\uFF09
-#cus.play.alipay.customs=GUANGZHOU_ZS
+cus.play.alipay.partner=2088731576886261
+# \u6D77\u5173\uFF0C\u5E7F\u5DDE\uFF08\u603B\u7F72\uFF09
+cus.play.alipay.customs=GUANGZHOU_ZS

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

@@ -432,7 +432,7 @@
                         <div class="modal-body">
                                 <div class="row" style="border:0">
                                     <div class="col-md-3" id="orderNo">订单编号: {{orderEntity.orderSn}}</div>
-                                    <div class="col-md-3" id="serialNumber">支付流水号: <span>{{orderProcessRecord.payTransactionId}}</span></div>
+                                    <div class="col-md-3" id="serialNumber">支付流水号: <span>{{orderEntity.payTransactionId}}</span></div>
                                     <div class="col-md-3" id="waybillNo">运单编号: {{orderProcessRecord.logisticsNo}}</div>
                                     <div class="col-md-3" id="inventoryNo">清单编号: {{orderProcessRecord.invtNo}}</div>
                                 </div>

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -1565,7 +1565,7 @@ function getPrintContent(ticket) {
     content += "打印日期:" + ticket.time;
     content += "</div>";
     content += "<div style=\"width: 100%;margin:5px 0px;font-size: 13px;\">";
-    content += "该取货单号只有当天有效!"
+    content += "该小票只有当天有效!"
     content += "</div>";
     content += "<div style=\"width: 100%;margin:5px 0px;font-size: 13px;\">";
     content += "请妥善保管好小票，以免造成个人信息泄露!"

kmall-manager/src/main/resources/conf/haikong.properties

@@ -32,6 +32,6 @@ haikong.test.vmcconnect.requestRetry=2
 
 #### \u514D\u7A0Emall\u751F\u4EA7\u73AF\u5883
 haikong.prod.vmcconnect.url=https://testmall.booniu.com/openapi/vmcconnect/json
-haikong.prod.vmcconnect.appId=1
+haikong.prod.vmcconnect.appId=3
 haikong.prod.vmcconnect.secretKey=0AhZJYj7EAxMmXS1ntxnyWdGM98XdZnE
 haikong.prod.vmcconnect.requestRetry=2

切换环境需要修改的.md

@@ -36,6 +36,4 @@
 11. 如果测试环境需要测试支付，请在OrderServiceImpl的判断付款码之前加上：env = "prod";
 
 12. 支付宝支付推送海关支付凭证
-    cuspay-ali.properties，修改为海控生产环境配置
-    AliCusDeclareBiz.assemblyDeclareXml() 修改加密方法为RSA
-    AliCusDeclareQueryBiz.assemblyDeclareQueryXml() 修改加密方法为RSA
+    cuspay-ali.properties，修改为海控生产环境配置,包含加密信息、商户信息、支付宝信息