配置修改

kmall-admin/src/main/java/com/kmall/admin/haikong/task/MemberOrderSyncResendTask.java

@@ -40,7 +40,7 @@ public class MemberOrderSyncResendTask {
     @Autowired
     private HaiKongMemberOrderSyncResendService haiKongMemberOrderSyncResendService;
 
-//    @Scheduled(cron = "0 0/2 * * * ?")
+    @Scheduled(cron = "0 0/2 * * * ?")
     public void resend() {
         // 查询等待发送和发送失败的记录
         List<HaiKongMemberOrderSyncResendEntity> haiKongMemberOrderSyncResendEntities = haiKongMemberOrderSyncResendService.queryListByResendStatus();

kmall-admin/src/main/java/com/kmall/admin/haikong/task/MemberScoreChangeResendTask.java

@@ -39,7 +39,7 @@ public class MemberScoreChangeResendTask {
     @Autowired
     private HaiKongMemberScoreChangeRecordService haiKongMemberScoreChangeRecordService;
 
-//    @Scheduled(cron = "0 0/2 * * * ?")
+    @Scheduled(cron = "0 0/2 * * * ?")
     public void resend() {
         // 查询等待发送和发送失败的记录
         List<HaiKongMemberScoreChangeRecordEntity> haiKongMemberScoreChangeRecordEntities = haiKongMemberScoreChangeRecordService.queryListByResendStatus();

kmall-admin/src/main/java/com/kmall/admin/haikong/task/MemberSysAccessTokenRefreshTask.java

@@ -32,7 +32,7 @@ public class MemberSysAccessTokenRefreshTask {
     private HaiKongMemberTemplate haiKongMemberTemplate;
 
 
-//    @Scheduled(cron = "0/30 * * * * ?")
+    @Scheduled(cron = "0/30 * * * * ?")
     public void refresh() {
         String refreshToken = JedisUtil.get(Constants.MEMBER_SYS_REFRESH_TOKEN_REDIS_KEY);
         String accessToken = JedisUtil.get(Constants.MEMBER_SYS_ACCESS_TOKEN_REDIS_KEY);

kmall-admin/src/main/java/com/kmall/admin/haikong/task/SendOrderInfoTask.java

@@ -44,7 +44,7 @@ public class SendOrderInfoTask {
     @Autowired
     private VmcShopTemplate vmcShopTemplate;
 
-//    @Scheduled(cron = "0 0/1 * * * ?")
+    @Scheduled(cron = "0 0/1 * * * ?")
     public void resend() {
         // 查询等待发送和发送失败的记录
         List<HaiKongSendOrderInfoRecordEntity> haiKongSendOrderInfoRecordEntities = haiKongSendOrderInfoRecordService.queryListByResendStatus();
@@ -72,7 +72,7 @@ public class SendOrderInfoTask {
             List<OrderInfoItemDTO> dtoList = detailRecordEntities.stream().map(detailRecord -> {
                 OrderInfoItemDTO orderInfoItemDTO = new OrderInfoItemDTO();
                 BeanUtils.copyProperties(detailRecord, orderInfoItemDTO);
-                orderInfoItemDTO.setTax(Boolean.getBoolean(detailRecord.getIsTax()));
+                orderInfoItemDTO.setTax(detailRecord.getIsTax());
                 return orderInfoItemDTO;
             }).collect(Collectors.toList());
 

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

@@ -2518,7 +2518,7 @@ public class OrderServiceImpl implements OrderService {
 
             String env = environment.getProperty("haikong.env");
             // 判断是微信的支付码还是支付宝的支付码
-            env = "prod";
+
             if (!org.springframework.util.StringUtils.isEmpty(env) && Constants.PROD.equals(env)) {
                 if (parCode.startsWith("28")) {
                     // 支付宝支付

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

@@ -7,19 +7,19 @@ wx.payment.query.url=https://api.mch.weixin.qq.com/cgi-bin/mch/customs/customdec
 
 # \u6D77\u63A7\u5546\u6237\u4FE1\u606F   \u751F\u4EA7\u914D\u7F6E
 # \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
-## appid
-#cus.play.wx.app-id=wxd3e627dd62d6ff32
-## \u5FAE\u4FE1\u652F\u4ED8\u5546\u6237\u53F7
-#cus.play.wx.mch-id=1574349031
-## \u6D77\u5173\uFF0C\u5E7F\u5DDE\uFF08\u603B\u7F72\uFF09
-#cus.play.wx.customs=GUANGZHOU_ZS
+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
+# appid
+cus.play.wx.app-id=wxd3e627dd62d6ff32
+# \u5FAE\u4FE1\u652F\u4ED8\u5546\u6237\u53F7
+cus.play.wx.mch-id=1574349031
+# \u6D77\u5173\uFF0C\u5E7F\u5DDE\uFF08\u603B\u7F72\uFF09
+cus.play.wx.customs=GUANGZHOU_ZS
 
 
 # \u5B9A\u65F6\u5668\u62A5\u5173\u4E00\u6B21\u533A\u7684\u6570\u636E
@@ -28,17 +28,17 @@ db.wx.declare.count=2
 
 
 
-# \u4E2D\u7F51\u751F\u4EA7
+# \u4E2D\u7F51\u751F\u4EA7\uFF08\u6D4B\u8BD5\u7528\uFF09\uFF0C\u5982\u679C\u8981\u6D4B\u8BD5\u4ED8\u6B3E\uFF0C\u6253\u5F00\u4E0B\u9762\u7684\u6CE8\u91CA
 # \u4E2D\u7F51\u5FAE\u4FE1\u516C\u4F17ID
-cus.play.wx.app-id=wxb6b30b1b14ee502a
-# \u5FAE\u4FE1\u652F\u4ED8\u5546\u6237\u53F7
-cus.play.wx.mch-id=1501125641
-# \u6D77\u5173\uFF0C\u6DF1\u5733
-cus.play.wx.customs=SHENZHEN
-merchant.plat-sn=146001
-merchant.customs-code=4403160Z3Y
-merchant.plat-name=\u4E2D\u7F51\u5546\u57CE
-merchant.customs-name=\u4E2D\u7F51\u79D1\u6280\uFF08\u6DF1\u5733\uFF09\u6709\u9650\u516C\u53F8
+#cus.play.wx.app-id=wxb6b30b1b14ee502a
+## \u5FAE\u4FE1\u652F\u4ED8\u5546\u6237\u53F7
+#cus.play.wx.mch-id=1501125641
+## \u6D77\u5173\uFF0C\u6DF1\u5733
+#cus.play.wx.customs=SHENZHEN
+#merchant.plat-sn=146001
+#merchant.customs-code=4403160Z3Y
+#merchant.plat-name=\u4E2D\u7F51\u5546\u57CE
+#merchant.customs-name=\u4E2D\u7F51\u79D1\u6280\uFF08\u6DF1\u5733\uFF09\u6709\u9650\u516C\u53F8
 
 # ccnet dev\u914D\u7F6E\u6587\u4EF6\u7684\u503C
 #cus.play.wx.app-id=wx24013b34e349db3c

kmall-admin/src/main/resources/conf/fastdfs.properties

@@ -35,73 +35,73 @@
 #
 ##############\u6D4B\u8BD5\u73AF\u5883################
 ##\u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4
-connect_timeout=30
-#
-##\u7F51\u7EDC\u8D85\u65F6\u65F6\u95F4
-network_timeout=60
-
-#\u6587\u4EF6\u8DEF\u5F84
-base_path=/data/files/
-
-#tracker server\u662FFastDFS\u6587\u4EF6\u7CFB\u7EDF\u7684\u534F\u8C03\u8005,\u5176\u4E3B\u8981\u4F5C\u7528\u662F\u8D1F\u8F7D\u5747\u8861\u548C\u8C03\u5EA6\u3002
-#Tracker server\u5728\u5185\u5B58\u4E2D\u8BB0\u5F55\u5206\u7EC4\u548CStorage server\u7684\u72B6\u6001\u7B49\u4FE1\u606F\uFF0C\u4E0D\u8BB0\u5F55\u6587\u4EF6\u7D22\u5F15\u4FE1\u606F
-tracker_server=120.76.26.84:22122
-
-log_level=info
-
-use_connection_pool = false
-
-connection_pool_max_idle_time = 3600
-
-load_fdfs_parameters_from_tracker=false
-
-use_storage_id = false
-
-storage_ids_filename = storage_ids.conf
-
-#HTTP \u670D\u52A1\u5668\u5730\u5740
-http.tracket_nginx_addr=120.76.26.84
-
-#HTTP \u670D\u52A1\u5668\u7AEF\u53E3\u53F7
-http.tracker_server_port=80
-
-#\u6587\u4EF6\u4F5C\u8005
-file.author=kmall-pt
-
-
-
-
-##############\u751F\u4EA7\u73AF\u5883################
-##\u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4
 #connect_timeout=30
 ##
 ###\u7F51\u7EDC\u8D85\u65F6\u65F6\u95F4
 #network_timeout=60
 #
 ##\u6587\u4EF6\u8DEF\u5F84
-#base_path=/home/logs/fastdfs
+#base_path=/data/files/
 #
 ##tracker server\u662FFastDFS\u6587\u4EF6\u7CFB\u7EDF\u7684\u534F\u8C03\u8005,\u5176\u4E3B\u8981\u4F5C\u7528\u662F\u8D1F\u8F7D\u5747\u8861\u548C\u8C03\u5EA6\u3002
 ##Tracker server\u5728\u5185\u5B58\u4E2D\u8BB0\u5F55\u5206\u7EC4\u548CStorage server\u7684\u72B6\u6001\u7B49\u4FE1\u606F\uFF0C\u4E0D\u8BB0\u5F55\u6587\u4EF6\u7D22\u5F15\u4FE1\u606F
-#tracker_server=172.18.246.243:22122
+#tracker_server=120.76.26.84:22122
 #
 #log_level=info
 #
-#use_connection_pool=false
+#use_connection_pool = false
 #
-#connection_pool_max_idle_time=3600
+#connection_pool_max_idle_time = 3600
 #
 #load_fdfs_parameters_from_tracker=false
 #
-#use_storage_id=false
+#use_storage_id = false
 #
-#storage_ids_filename=storage_ids.conf
+#storage_ids_filename = storage_ids.conf
 #
 ##HTTP \u670D\u52A1\u5668\u5730\u5740
-#http.tracket_nginx_addr=172.18.246.243
+#http.tracket_nginx_addr=120.76.26.84
 #
 ##HTTP \u670D\u52A1\u5668\u7AEF\u53E3\u53F7
 #http.tracker_server_port=80
 #
 ##\u6587\u4EF6\u4F5C\u8005
-#file.author=kmall-haikong
+#file.author=kmall-pt
+
+
+
+
+##############\u751F\u4EA7\u73AF\u5883################
+##\u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4
+connect_timeout=30
+#
+##\u7F51\u7EDC\u8D85\u65F6\u65F6\u95F4
+network_timeout=60
+
+#\u6587\u4EF6\u8DEF\u5F84
+base_path=/home/logs/fastdfs
+
+#tracker server\u662FFastDFS\u6587\u4EF6\u7CFB\u7EDF\u7684\u534F\u8C03\u8005,\u5176\u4E3B\u8981\u4F5C\u7528\u662F\u8D1F\u8F7D\u5747\u8861\u548C\u8C03\u5EA6\u3002
+#Tracker server\u5728\u5185\u5B58\u4E2D\u8BB0\u5F55\u5206\u7EC4\u548CStorage server\u7684\u72B6\u6001\u7B49\u4FE1\u606F\uFF0C\u4E0D\u8BB0\u5F55\u6587\u4EF6\u7D22\u5F15\u4FE1\u606F
+tracker_server=172.18.246.243:22122
+
+log_level=info
+
+use_connection_pool=false
+
+connection_pool_max_idle_time=3600
+
+load_fdfs_parameters_from_tracker=false
+
+use_storage_id=false
+
+storage_ids_filename=storage_ids.conf
+
+#HTTP \u670D\u52A1\u5668\u5730\u5740
+http.tracket_nginx_addr=172.18.246.243
+
+#HTTP \u670D\u52A1\u5668\u7AEF\u53E3\u53F7
+http.tracker_server_port=80
+
+#\u6587\u4EF6\u4F5C\u8005
+file.author=kmall-haikong

kmall-admin/src/main/resources/logback.xml

@@ -7,7 +7,7 @@ debug：当此属性设置为true时，将打印出logback内部日志信息，
 <configuration scan="false" scanPeriod="60 seconds" debug="false">
 
 <!--    <property name="LOG_HOME" value="/data/project/logs/kmall-haikong/kmall-admin/"/>-->
-    <property name="LOG_HOME" value="/app/project/logs/kmall-haikong/kmall-admin/"/>
+    <property name="LOG_HOME" value="/data/project/logs/kmall-haikong/kmall-admin/"/>
     <!-- 定义日志的根目录 -->
     <property name="TRACE_DIR" value="trace" />
     <property name="DEBUG_DIR" value="debug" />

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

@@ -115,12 +115,12 @@
                         <Row :gutter="16">
                             <ul class="nav navbar-top-links navbar-right" style="font-size: 1.3em;">
 
-                                <li>
+                                <!--<li>
                                     <i-input v-model="orderSn1" @on-enter="queryInveResponse" placeholder="输入要查询回执的订单号" id="queryInveResponse" />
                                 </li>
                                 <li>
                                     <i-input v-model="orderSn" @on-enter="queryOrderStatus" placeholder="输入要查询订单状态的订单号" id="queryOrderStatus" />
-                                </li>
+                                </li>-->
                                 <li >
                                     <span style="margin-right: 40px">&nbsp; 门店：<b>{{storeName}}</b></span>
                                 </li>

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

@@ -1453,10 +1453,10 @@ function openWebSocket() {
         // webSocket = new WebSocket("ws://183.62.225.124:3080/ws/server/"+storeId);
         // 预发布环境
         // webSocket = new WebSocket("ws://14.29.226.8:8080/ws/server/"+storeId);
-        //kmall正式环境
-        // webSocket = new WebSocket("ws://8.135.102.238:8080/ws/server/"+storeId);
+        //kmall海控正式环境
+        webSocket = new WebSocket("ws://127.0.0.1:8080/ws/server/"+storeId);
         //kmall本地环境
-        webSocket = new WebSocket("ws://127.0.0.1:8089/ws/server/"+storeId);
+        // webSocket = new WebSocket("ws://127.0.0.1:8089/ws/server/"+storeId);
         // webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
         if (webSocket.readyState === webSocket.CONNECTING) {
             console.log('1.连接正在打开......');

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

@@ -1,8 +1,8 @@
 ########## \u6D77\u5173 \u914D\u7F6E ##########
 
+#################### \u5DF2\u5E9F\u5F03 ####################
 # [dev, prod]
 cus.env = prod
-#################### \u5DF2\u5E9F\u5F03 ####################
 # \u5F00\u53D1\u73AF\u5883
 # \u4F01\u4E1A\u8FD4\u56DE\u6D77\u5173\u5B9E\u65F6\u6570\u636E\u63A5\u53E3\u5730\u5740
 cus.dev.payDateUrl=https://swapptest.singlewindow.cn/ceb2grab/grab/realTimeDataUpload

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

@@ -1,6 +1,6 @@
 ########## \u6570\u636E\u5E93\u914D\u7F6E ##########
 # \u73AF\u5883\u914D\u7F6E\uFF1A[dev, prod, pre, test]
-jdbc.env=test
+jdbc.env=prod
 ####========== \u6D4B\u8BD5\u73AF\u5883 ==========
 jdbc.test.url=jdbc:mysql://14.29.226.8:3306/kmall-haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 jdbc.test.username=root

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

@@ -1,7 +1,7 @@
 # \u683C\u529B\u5730\u4EA7\u4F1A\u5458\u7CFB\u7EDF
 
 # \u73AF\u5883\uFF1A[test, prod]
-haikong.env=test
+haikong.env=prod
 haikong.retry=3
 
 #### \u4F1A\u5458\u7CFB\u7EDF\u6D4B\u8BD5\u73AF\u5883

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

@@ -1,7 +1,7 @@
 ########## redis \u914D\u7F6E ##########1
 
 # [dev, test, prod]
-redis.env=dev
+redis.env=prod
 
 # \u5F00\u53D1\u73AF\u5883
 redis.dev.keyPrefix=platform

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

@@ -1,10 +1,10 @@
 ########## \u5FAE\u4FE1\u5C0F\u7A0B\u5E8F\u652F\u4ED8\u914D\u7F6E ##########
 
 # [dev, prod]
-pay.wx.env=dev
+pay.wx.env=prod
 
 
-#========== \u5F00\u53D1\u73AF\u5883 \u4E2D\u7F51\u7684\u914D\u7F6E ==========
+#========== \u5F00\u53D1\u73AF\u5883 \u4E2D\u7F51\u7684\u914D\u7F6E\uFF08\u6D4B\u8BD5\u7528\uFF09 ==========
 #\u5C0F\u7A0B\u5E8FID
 wx.dev.appId=wxb6b30b1b14ee502a
 #\u5C0F\u7A0B\u5E8F\u5BC6\u94A5

切换环境需要修改的.md

@@ -1,43 +1,34 @@
 切换环境需要修改的：
 
-1. 微信小程序支付配置
+1. 微信支付配置
     文件目录：resources\conf\wx-mp.properties
-        修改env为prod
+        修改env为prod，需要支付签名文件
 2. Redis配置
     文件目录：resources\conf\redis.properties
         修改env为prod
-3. 打印机配置
-    文件目录：resources\conf\print-ticket.properties
-
-4. 快递鸟配置
-    文件目录：resources\conf\express-kdn.properties
-        修改env为prod
-41. sf快递配置
-    文件目录：resources\conf\express-sf.properties
-        
-5. 云片短信配置
-    文件目录：resources\conf\common.properties
-
-6. 数据源配置
+3. 数据源配置
     文件目录：resources\conf\db.properties
-        切换为生产环境配置
-
-7. 商户配置
-    文件目录：resources\conf\oms-merch.properties
-        oms配置切换为生产环境配置
-
-8. 图片上传配置
+        修改为prod
+4. 图片上传配置
     文件目录：resources\conf\fastdfs.properties
-        切换为生产环境配置
-        
-9. Jdk1.8
+        切换为海控生产环境配置
+
+5. Jdk1.8
     服务器安装jdk1.8，微信退款回调信息解密需要在目录“jdk1.8.0_131\jre\lib\security”中
 替换local_policy.jar、US_export_policy.jar两个安全的jar文件
 
-10. cert安装目录配置在wx-mp.properties的certName中
+6. cert安装目录配置在wx-mp.properties的certName中
 
+7. sale.js修改WebSocket地址，海控为127.0.0.1:8080
 
-11. sale.js修改WebSocket地址
+8. haikong.properties，修改env为prod
 
+9. 系统管理-->系统参数中需配置：
+    HAIKONG_MEMBER_SCORE_LIMIT: 30 (海控平台统一30积分1块钱)
+    HAIKONG_MEMBER_MAX_SCORE_RATIO： 0.5 (积分最大抵扣比例（最多能抵扣订单金额的比例）)
+    CUSTOMS_PORT_CODE: 5791 (海关口岸代码)
+    HK_NOTICE_KEY: aD9MNIuAATSUazu64nBz (海控通知回调秘钥)
+    HK_NOTICE_NUM: 100 (通知数据阀值)
 
-12. 测试环境注释掉支付OrderServiceImpl第2022行下面支付方法，正式环境切记不要注释支付方法
+10. 微信支付推送海关支付凭证
+    cuspay-wx.properties，修改为海控生产环境配置