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

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

@@ -470,7 +470,8 @@ public class OrderServiceImpl implements OrderService {
             }
             cusListing.setConsigneeTel(orderEntity.getMobile());
             if (StringUtils.isNotEmpty(cusListing.getConsigneeTel())) {
-                cusListing.setConsigneeTel(new StringBuilder(cusListing.getConsigneeTel()).replace(3, 7, "****").toString());
+//                cusListing.setConsigneeTel(new StringBuilder(cusListing.getConsigneeTel()).replace(3, 7, "****").toString());
+                cusListing.setConsigneeTel(cusListing.getConsigneeTel());
             }
         }
         cusListing.setOriginAddress(PrintTicketPropertiesBuilder.instance().getAddress());
@@ -516,7 +517,8 @@ public class OrderServiceImpl implements OrderService {
         mailInfo.setSenderAddress("前海综合保税区W104");
 
         // 收货人
-        mailInfo.setConsigneeMob(new StringBuilder(orderEntity.getMobile()).replace(3, 7, "****").toString());
+//        mailInfo.setConsigneeMob(new StringBuilder(orderEntity.getMobile()).replace(3, 7, "****").toString());
+        mailInfo.setConsigneeMob(orderEntity.getMobile());
         mailInfo.setConsigneeName(new StringBuilder(orderEntity.getConsignee()).replace(1, 2, "*").toString());
         mailInfo.setConsigneeProvince(orderEntity.getProvince());
         mailInfo.setConsigneeCity(orderEntity.getCity());

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

@@ -1255,9 +1255,12 @@ function printArea(content) {
     doc.close();
     var frameWindow = iframe.contentWindow;
 
-    frameWindow.focus();
-    frameWindow.print();
-    alert('打印小票完成');
+    $(iframe).load(function(){
+        frameWindow.focus();
+        frameWindow.print();
+        alert('打印小票完成');
+    });
+
 }
 
 function printArea2(content) {

kmall-manager/src/main/java/com/kmall/manager/manager/wechat/WechatUtil.java

@@ -1,10 +1,8 @@
 package com.kmall.manager.manager.wechat;
 
-import com.alibaba.druid.support.logging.Log;
-import com.alibaba.druid.support.logging.LogFactory;
-import com.kmall.manager.manager.pay.wxpay.CommonWxPayPropertiesBuilder;
 import com.kmall.common.utils.*;
 import com.kmall.common.utils.wechat.*;
+import com.kmall.manager.manager.pay.wxpay.CommonWxPayPropertiesBuilder;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;

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

@@ -1,7 +1,7 @@
 ########## \u6D77\u5173 \u914D\u7F6E ##########
 
 # [dev, prod]
-cus.env = dev
+cus.env = prod
 
 # \u5F00\u53D1\u73AF\u5883
 # \u4F01\u4E1A\u8FD4\u56DE\u6D77\u5173\u5B9E\u65F6\u6570\u636E\u63A5\u53E3\u5730\u5740

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

@@ -41,7 +41,7 @@ merch.quotaInquiryUrl=http://ws.ds-bay.com/al/cus/yearLimit
 merch.addPdProductListUrl=http://ws.ds-bay.com/al/product/addPdProductList
 #\u4EA7\u54C1\u5907\u6848\u56FE\u7247\u66F4\u65B0\u63A5\u53E3
 merch.pdProductImgInsertOrUpdateUrl=http://ws.ds-bay.com/oms-controller-mgt/pdProductImg/insertOrUpdateSkuImg
-\u4EA7\u54C1\u5907\u6848\u62C9\u53D6\u63A5\u53E3
+#\u4EA7\u54C1\u5907\u6848\u62C9\u53D6\u63A5\u53E3
 merch.queryPdProductRecordListUrl=http://ws.ds-bay.com/al/product/getPdProductRecordList
 
 

kmall-manager/src/main/resources/conf/pingan-pay.properties

@@ -1,7 +1,7 @@
 ########## \u5E73\u5B89\u652F\u4ED8\u914D\u7F6E ##########
 
 # [dev, prod]
-pay.pingan.env = dev
+pay.pingan.env = prod
 
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========

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

@@ -26,6 +26,7 @@ redis.dev.pool.testOnBorrow=true
 redis.prod.keyPrefix=platform
 redis.prod.host=127.0.0.1
 redis.prod.port=6379
+redis.prod.password=
 redis.prod.pool.maxIdle=200
 redis.prod.pool.maxWait=1000
 redis.prod.pool.maxTotal=10000

kmall-manager/src/main/resources/conf/wx-global.properties

@@ -1,7 +1,7 @@
 ########## \u5FAE\u4FE1\u5C0F\u7A0B\u5E8F\u914D\u7F6E ##########
 
 # [dev, prod]
-pay.wx.global.env = dev
+pay.wx.global.env = prod
 
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========

切换环境需要修改的.md

@@ -38,3 +38,6 @@
 
 
 11. sale.js修改WebSocket地址
+
+
+12. 测试环境注释掉支付OrderServiceImpl第2022行下面支付方法，正式环境切记不要注释支付方法