FengChaoYu 9 kuukautta sitten
vanhempi
commit
89d3d21aa4

+ 3 - 1
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/common/AllInPayLogic.java

@@ -23,6 +23,8 @@ public class AllInPayLogic {
 
     @Value("${allIn.payment.notifyUrl}")
     private String notifyUrl;
+    @Value("${share.mall.appid}")
+    private String mallAppid;
 
     @Resource
     CommonLogic commonLogic;
@@ -39,7 +41,7 @@ public class AllInPayLogic {
         reqMap.put("appid", order.getAppid());
         if (SybConstants.PAY_TYPE_W06.equals(payType)) {
             reqMap.put("acct", order.getOpenid());
-            reqMap.put("sub_appid", "wx21d155e8a449d9b1");
+            reqMap.put("sub_appid", mallAppid);
         }
         reqMap.put("notify_url", this.notifyUrl);
         reqMap.put("trxamt", (int) ArithUtils.mul(order.getPayValue().doubleValue(), 100) + "");

+ 1 - 1
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/WebsitSalesLogic.java

@@ -487,7 +487,7 @@ public class WebsitSalesLogic {
             }
         }
 
-        sheetPayMap.setId(null);
+        sheetPayMap.setId(IdWorker.getIdStr());
         sheetPayMap.setAppid(mallAppid);
         sheetPayMap.setAppOrderId(sheetPayMap.getId());
         websitSalesPayMapService.save(sheetPayMap);

+ 3 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/common/AllInPayLogic.java

@@ -26,6 +26,8 @@ public class AllInPayLogic {
 
     @Value("${allIn.payment.notifyUrl}")
     private String notifyUrl;
+    @Value("${share.mall.appid}")
+    private String mallAppid;
 
     @Resource
     CommonLogic commonLogic;
@@ -42,7 +44,7 @@ public class AllInPayLogic {
         reqMap.put("appid", order.getAppid());
         if (SybConstants.PAY_TYPE_W06.equals(payType)) {
             reqMap.put("acct", order.getOpenid());
-            reqMap.put("sub_appid", "wx21d155e8a449d9b1");
+            reqMap.put("sub_appid", mallAppid);
         }
         reqMap.put("notify_url", this.notifyUrl);
         reqMap.put("trxamt", (int) ArithUtils.mul(order.getPayValue().doubleValue(), 100) + "");

+ 3 - 0
mall-server-api/src/main/resources/bootstrap-dev.properties

@@ -92,4 +92,7 @@ inf.url=http://121.43.111.127:11111
 inf.token.appid=zfire-jsm-sxb
 inf.token.appSecret=3e7iee31ub94rvvesp7266kwske7fple
 
+#分销商城appid
+share.mall.appid=wx21d155e8a449d9b1
+
 

+ 4 - 1
mall-server-api/src/main/resources/bootstrap-test.properties

@@ -75,4 +75,7 @@ allIn.payment.notifyUrl=${php.interface.url}/java_fucai/common/allInPayCall
 #内部接口
 inf.url=http://121.43.111.127:11111
 inf.token.appid=zfire-jsm-sxb
-inf.token.appSecret=3e7iee31ub94rvvesp7266kwske7fple
+inf.token.appSecret=3e7iee31ub94rvvesp7266kwske7fple
+
+#分销商城appid
+share.mall.appid=wx21d155e8a449d9b1