|
|
@@ -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); |
|
|
|
} |
|
|
|
|
|
|
|