diff --git a/suimangCApi/src/main/java/com/iformall/controller/CallbackPayController.java b/suimangCApi/src/main/java/com/iformall/controller/CallbackPayController.java index 87617ce..9288f97 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/CallbackPayController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/CallbackPayController.java @@ -58,7 +58,7 @@ public class CallbackPayController extends BaseController { //todo 解密回调数据 String decryptString = AesUtils.decryptToString(associatedData, nonce, ciphertext, payAccount.getMerchantApiv3Key()); - + logger.info("微信支付回调解密数据{}"+decryptString); JSONObject jsonObject = JSONObject.parseObject(decryptString); String out_order_no = jsonObject.getString("out_trade_no"); //todo 处理支付数据 diff --git a/suimangService/src/main/java/com/iformall/domain/po/WxPayAccount.java b/suimangService/src/main/java/com/iformall/domain/po/WxPayAccount.java index 9021072..32fe025 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/WxPayAccount.java +++ b/suimangService/src/main/java/com/iformall/domain/po/WxPayAccount.java @@ -77,8 +77,11 @@ public class WxPayAccount extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="销售提点",name="sellRate") private Integer sellRate; - public String getPayNotifyV3Url() { - return notifyUrl + "/pay/v3"; + public String getPayNotifyV3Url(Integer projectType) { + if(projectType == null){ + return notifyUrl + "/pay/v3"; + } + return notifyUrl + "/" + projectType + "/pay/v3"; } public String getPayNotifyUrl() { return notifyUrl + "/pay"; diff --git a/suimangService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java b/suimangService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java index 5c58ea6..82a5641 100644 --- a/suimangService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java +++ b/suimangService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java @@ -77,7 +77,7 @@ public class WxMiniAppPaySFTAdapterService extends BaseWxPaySFTAdapterService i } req.setAttach(getAttach(record)); req.setOut_trade_no(String.valueOf(composeOrder.getMainOrderId())); - req.setNotify_url(payAccount.getPayNotifyV3Url()); + req.setNotify_url(payAccount.getPayNotifyV3Url(appInfo.getProjectType())); SFTPaySettleReq settle = new SFTPaySettleReq(); settle.setProfit_sharing(true); @@ -117,7 +117,7 @@ public class WxMiniAppPaySFTAdapterService extends BaseWxPaySFTAdapterService i payer.setOpenid(openId); req.setCombine_payer_info(payer); - req.setNotify_url(payAccount.getPayNotifyV3Url()); + req.setNotify_url(payAccount.getPayNotifyV3Url(appInfo.getProjectType())); return req; } diff --git a/suimangService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java b/suimangService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java index 072d9fb..3b60236 100644 --- a/suimangService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java +++ b/suimangService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java @@ -79,7 +79,7 @@ public class WxMiniAppPayV3AdapterService extends BaseWxPayV3AdapterService impl } req.setOut_trade_no(record.getPayOrderNo()); req.setAttach(getAttach(record)); - req.setNotify_url(payAccount.getPayNotifyV3Url()); + req.setNotify_url(payAccount.getPayNotifyV3Url(appInfo.getProjectType())); V3PaySettleReq settle = new V3PaySettleReq(); settle.setProfit_sharing(true); @@ -107,7 +107,7 @@ public class WxMiniAppPayV3AdapterService extends BaseWxPayV3AdapterService impl req.setDescription("weixin miniApp product"); } req.setOut_trade_no(productOrder.getOrderNumber()); - req.setNotify_url(payAccount.getPayNotifyV3Url()); + req.setNotify_url(payAccount.getPayNotifyV3Url(appInfo.getProjectType())); V3PayAmountReq amout = new V3PayAmountReq(); amout.setTotal(productOrder.getOrderPrice()); @@ -186,7 +186,7 @@ public class WxMiniAppPayV3AdapterService extends BaseWxPayV3AdapterService impl payer.setSub_openid(openId); req.setCombine_payer_info(payer); - req.setNotify_url(payAccount.getPayNotifyV3Url()); + req.setNotify_url(payAccount.getPayNotifyV3Url(appInfo.getProjectType())); return req; }