浏览代码

//

private_deployment
xhxu 1年前
父节点
当前提交
276cf2a008
共有 3 个文件被更改,包括 17 次插入20 次删除
  1. +15
    -17
      suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java
  2. +2
    -2
      suimangService/src/main/java/com/iformall/service/impl/ProductOrderServiceImpl.java
  3. +0
    -1
      suimangService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java

+ 15
- 17
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);
}



+ 2
- 2
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);


+ 0
- 1
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);


正在加载...
取消
保存