1.配置文件修改为正式环境配置

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

@@ -496,14 +496,14 @@ public class OrderServiceImpl implements OrderService {
         String logoUrl = "/statics/img/yto_logo.jpg";
 
         Map<String, String> logoMap = new HashMap<>();
-        logoMap.put("best", "/statics/img/yto_logo.jpg");
-        logoMap.put("yto", "/statics/img/bestex_logo3.png");
-        if (logoMap.containsKey(orderEntity.getShippingCode())) {
+        logoMap.put("yto", "/statics/img/yto_logo.jpg");
+        logoMap.put("best", "/statics/img/bestex_logo3.png");
+        if (StringUtils.isNotEmpty(orderEntity.getShippingCode()) && logoMap.containsKey(orderEntity.getShippingCode())) {
             logoUrl = logoMap.get(orderEntity.getShippingCode());
         }
 
         mailInfo.setExprLogoUrl(logoUrl);
-        byte[] barCode128 = BarcodeUtil.generateBarCode128(exprNo, null, null, true, false);
+        byte[] barCode128 = BarcodeUtil.generateBarCode128(exprNo, 6.0D, null, true, false);
         String exprNoBase64Img = new String(Base64.getEncoder().encode(barCode128));
         mailInfo.setShopTel("0752-2688660");
 
@@ -2198,31 +2198,31 @@ public class OrderServiceImpl implements OrderService {
 
             // 设置支付单开始时间
             processRecordEntity.setPaymentStartTime(new Date());
-//            // 判断是微信的支付码还是支付宝的支付码
-//            if (parCode.startsWith("28")) {
-//                // 支付宝支付
-//                try {
-//                    AliPay(user, parCode, order, processRecordEntity, orderWXPayRecordCurrent, store);
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                    throw e;
-//                }
-//            } else {
-//                // 微信支付
-//                try {
-//                    wxPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                    throw e;
-//                }
-//            }
+            // 判断是微信的支付码还是支付宝的支付码
+            if (parCode.startsWith("28")) {
+                // 支付宝支付
+                try {
+                    AliPay(user, parCode, order, processRecordEntity, orderWXPayRecordCurrent, store);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    throw e;
+                }
+            } else {
+                // 微信支付
+                try {
+                    wxPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    throw e;
+                }
+            }
 
-            // TODO 到时候要注释掉，测试用而已
-            OrderEntity orderEntity = queryObject(order.getId());
-            orderEntity.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_201.getItem()));
-            orderEntity.setPayStatus(Integer.parseInt(Dict.payStatus.item_2.getItem()));
-            orderEntity.setPayTime(new Date());
-            orderDao.update(orderEntity);
+//            // TODO 到时候要注释掉，测试用而已
+//            OrderEntity orderEntity = queryObject(order.getId());
+//            orderEntity.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_201.getItem()));
+//            orderEntity.setPayStatus(Integer.parseInt(Dict.payStatus.item_2.getItem()));
+//            orderEntity.setPayTime(new Date());
+//            orderDao.update(orderEntity);
 
 
             resultObj.put("shopName", store.getStoreName()); // 根据门店编号查询

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

@@ -391,6 +391,13 @@
         </div>
     </div>
 </div>
+<div style="display: none">
+    <img src="/statics/img/yto_logo.jpg">
+    <img src="/statics/img/bestex_logo.jpeg">
+    <img src="/statics/img/bestex_logo2.jpeg">
+    <img src="/statics/img/bestex_logo2.png">
+    <img src="/statics/img/bestex_logo3.png">
+</div>
 <script type="application/javascript">
     let mailTypes = ["best", "yto"];
     var strategies = {

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

@@ -1278,9 +1278,9 @@ function openWebSocket() {
         //kmall测试环境
         // webSocket = new WebSocket("ws://183.62.225.124:8080/ws/server/"+storeId);
         //kmall正式环境
-        // webSocket = new WebSocket("ws://8.135.102.238:8080//ws/server/"+storeId);
+        webSocket = new WebSocket("ws://8.135.102.238:8080//ws/server/"+storeId);
         //kmall本地环境
-        webSocket = new WebSocket("ws://127.0.0.1:9090//ws/server/"+163);
+        // webSocket = new WebSocket("ws://127.0.0.1:9090//ws/server/"+163);
         // webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
         if (webSocket.readyState === webSocket.CONNECTING) {
             console.log('1.连接正在打开......');
@@ -1519,6 +1519,7 @@ function getPrintContentOrder(ticket) {
     content += "关注CW大药房客服号，获取更多优惠信息"
     content += "</div>";
     content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\">--------------------------------------------------</div>";
+    content += "<div style=\"width: 100%;height: 50px;\"></div>";
 
     // var strategies = {
     //     "best": function(data){
@@ -1545,7 +1546,7 @@ function getPrintContentOrder(ticket) {
 
     <!-- 面单条码 -->
     <div style="width: 100%;height: 98px; border-width: 0 1px 1px 1px; border-style: solid; border-color: black;">
-        <div style="width: 200px; height: 88px; overflow: hidden;">
+        <div style="width: 200px; height: 88px;">
             <img src='data:image/png;base64,${ticket.ticketMailInfo.exprNoBase64Img}' style='max-width:199px;' />
         </div>
     

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

@@ -30,9 +30,9 @@
 #\u963F\u91CC\u4E91\u5185\u7F51\u5730\u5740
 #jdbc.url=jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 #\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
-jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_cw?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+#jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_cw?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 # \u65B0\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
-#jdbc.url=jdbc:mysql://out-rm-wz92efl25x02n44xego.mysql.rds.aliyuncs.com:3306/kmall_cw?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+jdbc.url=jdbc:mysql://out-rm-wz92efl25x02n44xego.mysql.rds.aliyuncs.com:3306/kmall_cw?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 jdbc.username=kmall_cw
 jdbc.password=eb6zHJg%x3
 

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

@@ -24,21 +24,21 @@ merch.wxOrderResendUrl=http://8.135.102.238:8680/wx/wxOrderResendQueryAll
 ##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:8181/al/product/addPdProductList
-#\u7533\u8BF7\u4EA7\u54C1\u5907\u6848\u63A5\u53E3
-merch.pdProductImgInsertOrUpdateUrl=http://127.0.0.1:8181/pdProductImg/insertOrUpdateSkuImg
+#merch.addPdProductListUrl=http://127.0.0.1:8680/al/product/addPdProductList
+##\u7533\u8BF7\u4EA7\u54C1\u5907\u6848\u63A5\u53E3
+#merch.pdProductImgInsertOrUpdateUrl=http://127.0.0.1:8181/pdProductImg/insertOrUpdateSkuImg
 
 
-####oms\u751F\u4EA7\u73AF\u5883\u5BC6\u94A5
+###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.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/al/pdProductImg/insertOrUpdateSkuImg
+merch.pdProductImgInsertOrUpdateUrl=http://ws.ds-bay.com/oms-controller-mgt/pdProductImg/insertOrUpdateSkuImg
 
 
 
@@ -52,4 +52,4 @@ merch.quotaInquiryUrl=http://ws.ds-bay.com/al/cus/yearLimit
 #\u7533\u8BF7\u4EA7\u54C1\u5907\u6848\u63A5\u53E3
 #merch.addPdProductListUrl=http://183.3.221.143:8680/al/product/addPdProductList
 #\u4EA7\u54C1\u5907\u6848\u56FE\u7247\u66F4\u65B0\u63A5\u53E3
-#merch.pdProductImgInsertOrUpdateUrl=http://183.3.221.143:8680/al/pdProductImg/insertOrUpdateSkuImg
+#merch.pdProductImgInsertOrUpdateUrl=http://183.3.221.143:8080/oms-controller-mgt/pdProductImg/insertOrUpdateSkuImg

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

@@ -24,9 +24,8 @@ redis.dev.pool.testOnBorrow=true
 
 # \u4E2D\u7F51\u751F\u4EA7\u73AF\u5883
 redis.prod.keyPrefix=platform
-redis.prod.host=183.3.221.144
+redis.prod.host=127.0.0.1
 redis.prod.port=6379
-redis.prod.password=Abc-123#*.-
 redis.prod.pool.maxIdle=200
 redis.prod.pool.maxWait=1000
 redis.prod.pool.maxTotal=10000

切换环境需要修改的.md

@@ -35,3 +35,6 @@
 替换local_policy.jar、US_export_policy.jar两个安全的jar文件
 
 10. cert安装目录配置在wx-mp.properties的certName中
+
+
+11. sale.js修改WebSocket地址