From 276cf2a0085fa49e2e3e7350dff7e947463384dd Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 28 Aug 2023 18:16:46 +0800 Subject: [PATCH] // --- .../controller/ProductOrderController.java | 32 +++++++++---------- .../service/impl/ProductOrderServiceImpl.java | 4 +-- .../appPay/WxMiniAppPayV3AdapterService.java | 1 - 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java b/suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java index ce20665..efeebad 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java @@ -186,30 +186,28 @@ public class ProductOrderController extends BaseController { if(productOrder == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"未查询到订单"); } - if(!EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode().equals(productOrder.getOrderStatus())){ - return new ResultData(ErrorCode.ORDER_HAD_PAY); - } if(productOrder.getPayVendor() == null){ return new ResultData(productOrder); } + if(EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode().equals(productOrder.getOrderStatus())){ + PayAdapterService payAdapterService = payServiceFactory.getPayAdapterService(productOrder.getPayVendor()); + if(payAdapterService == null){ + return new ResultData(ErrorCode.ORDER_IS_NOT_PAY.getCode(),"该订单不支持当前支付"); + } + EnumProductOrderPayVendor payVendoEnum = EnumProductOrderPayVendor.getEnum(productOrder.getPayVendor()); - PayAdapterService payAdapterService = payServiceFactory.getPayAdapterService(productOrder.getPayVendor()); - if(payAdapterService == null){ - return new ResultData(ErrorCode.ORDER_IS_NOT_PAY.getCode(),"该订单不支持当前支付"); - } - EnumProductOrderPayVendor payVendoEnum = EnumProductOrderPayVendor.getEnum(productOrder.getPayVendor()); + WxAppinfo appinfo = wxAppinfoService.getProjectCAppInfoFromRedis(productOrder.getProjectType(), payVendoEnum.getPlat()); + if(appinfo == null){ + return new ResultData(ErrorCode.ORDER_IS_NOT_PAY.getCode(),"未找到支付应用"); + } + WxPayAccount payAccount = wxPayAccountService.getByIdFromRedis(appinfo.getPayId()); + if(payAccount == null){ + return new ResultData(ErrorCode.ORDER_IS_NOT_PAY.getCode(),"未找到支付密钥"); + } - WxAppinfo appinfo = wxAppinfoService.getProjectCAppInfoFromRedis(productOrder.getProjectType(), payVendoEnum.getPlat()); - if(appinfo == null){ - return new ResultData(ErrorCode.ORDER_IS_NOT_PAY.getCode(),"未找到支付应用"); - } - WxPayAccount payAccount = wxPayAccountService.getByIdFromRedis(appinfo.getPayId()); - if(payAccount == null){ - return new ResultData(ErrorCode.ORDER_IS_NOT_PAY.getCode(),"未找到支付密钥"); + ResultData resultData = productOrderService.handleProductOrderByQuery(appinfo,payAccount,productOrder,payAdapterService); } - ResultData resultData = productOrderService.handleProductOrderByQuery(appinfo,payAccount,productOrder,payAdapterService); - return new ResultData(productOrder); } diff --git a/suimangService/src/main/java/com/iformall/service/impl/ProductOrderServiceImpl.java b/suimangService/src/main/java/com/iformall/service/impl/ProductOrderServiceImpl.java index cf6b9f8..194c078 100644 --- a/suimangService/src/main/java/com/iformall/service/impl/ProductOrderServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/impl/ProductOrderServiceImpl.java @@ -90,7 +90,7 @@ public class ProductOrderServiceImpl implements ProductOrderService { public ResultData createPay(ProductOrder productOrder) { if(!EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode().equals(productOrder.getOrderStatus())){ - return new ResultData(ErrorCode.ORDER_HAD_PAY); + return new ResultData(ErrorCode.ORDER_IS_FAIL.getCode(),"订单已取消或已支付"); } PayAdapterService payAdapterService = payServiceFactory.getPayAdapterService(productOrder.getPayVendor()); @@ -113,7 +113,7 @@ public class ProductOrderServiceImpl implements ProductOrderService { return resultData; } if(!EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode().equals(productOrder.getOrderStatus())){ - return new ResultData(ErrorCode.ORDER_HAD_PAY); + return new ResultData(ErrorCode.ORDER_IS_FAIL.getCode(),"订单已取消或已支付"); } try { PayAdapterResult payResult = payAdapterService.createPay(productOrder, appinfo, payAccount); 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 4475839..6023ee9 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 @@ -144,7 +144,6 @@ public class WxMiniAppPayV3AdapterService extends BaseWxPayV3AdapterService impl String timestamp = String.valueOf(Utility.getCurrentTimeStamp()); String noncestr = Utility.generate32UUID(); String signAgent = WxPayV3.getMiniAppPayEntry(payService, appInfo.getAppId(), timestamp, noncestr, prepayId); - log.info("不知道是哪的问题"+signAgent); Map returnMap = new HashMap(); returnMap.put("appId", appInfo.getAppId()); returnMap.put("timeStamp", timestamp);