点睛计划配置

common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/PassengerInfoServiceImpl.java

@@ -7,6 +7,7 @@ import javax.annotation.Resource;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.google.common.collect.Ordering;
+import com.jpsoft.bus.config.WxJpsoftConfig;
 import com.jpsoft.bus.modules.base.entity.MergeOrderInfo;
 import com.jpsoft.bus.modules.base.entity.OrderInfo;
 import com.jpsoft.bus.modules.base.entity.PaymentInfo;
@@ -40,6 +41,9 @@ public class PassengerInfoServiceImpl implements PassengerInfoService {
     @Autowired
     private MergeOrderInfoService mergeOrderInfoService;
 
+    @Autowired
+    private WxJpsoftConfig wxJpsoftConfig;
+
     @Autowired
     private PriceInfoService priceInfoService;
 
@@ -198,7 +202,7 @@ public class PassengerInfoServiceImpl implements PassengerInfoService {
             mergeOrderInfo.setId(UUID.randomUUID().toString());
             mergeOrderInfo.setVehicleShiftId(passengerInfo.getVehicleShiftId());
             mergeOrderInfo.setPayStatus(20);
-            mergeOrderInfo.setOutOrderNo(com.jpsoft.bus.modules.common.utils.StringUtils.getOutTradeNo());
+            mergeOrderInfo.setOutOrderNo(wxJpsoftConfig.getUrlKey() + com.jpsoft.bus.modules.common.utils.StringUtils.getOutTradeNo());
             mergeOrderInfo.setPayName(payName);
             mergeOrderInfo.setPaymentId(paymentId);
             mergeOrderInfo.setCreateTime(new Date());
@@ -240,7 +244,7 @@ public class PassengerInfoServiceImpl implements PassengerInfoService {
             mergeOrderInfo.setId(UUID.randomUUID().toString());
             mergeOrderInfo.setVehicleShiftId(passengerInfo.getVehicleShiftId());
             mergeOrderInfo.setPayStatus(10);
-            mergeOrderInfo.setOutOrderNo(com.jpsoft.bus.modules.common.utils.StringUtils.getOutTradeNo());
+            mergeOrderInfo.setOutOrderNo(wxJpsoftConfig.getUrlKey() + com.jpsoft.bus.modules.common.utils.StringUtils.getOutTradeNo());
             mergeOrderInfo.setPaymentId(paymentId);
             mergeOrderInfo.setCreateTime(new Date());
             mergeOrderInfoService.insert(mergeOrderInfo);
@@ -350,7 +354,7 @@ public class PassengerInfoServiceImpl implements PassengerInfoService {
             mergeOrderInfo.setVehicleShiftId(shiftInfo.getId());
             mergeOrderInfo.setOpenId(openId);
             mergeOrderInfo.setPayStatus(10);
-            mergeOrderInfo.setOutOrderNo(com.jpsoft.bus.modules.common.utils.StringUtils.getOutTradeNo());
+            mergeOrderInfo.setOutOrderNo(wxJpsoftConfig.getUrlKey() + com.jpsoft.bus.modules.common.utils.StringUtils.getOutTradeNo());
             mergeOrderInfo.setPaymentId(paymentId);
             mergeOrderInfo.setCreateTime(new Date());
             mergeOrderInfoService.insert(mergeOrderInfo);

web/src/main/resources/application-production.yml

@@ -67,7 +67,7 @@ wx:
     ip: 101.37.31.116
     certPath: /usr/local/tomcat/webapps/cert/xiaoxinda/apiclient_cert.p12
     temporaryUrl: http://ykt.xiaoxinda.com/wxPay/wxJsapiPayTemporaryNotify
-    urlKey: a3
+    urlKey: c3
 
 
 alipay:

web/src/main/resources/application-test.yml

@@ -63,7 +63,7 @@ wx:
     ip: 101.37.31.116
     certPath: /usr/local/tomcat/webapps/cert/xiaoxinda/apiclient_cert.p12
     temporaryUrl: http://ykt.xiaoxinda.com/wxPay/wxJsapiPayTemporaryNotify
-    urlKey: a2
+    urlKey: c2
 
 
 alipay: