|
|
@@ -242,10 +242,6 @@ public class ProductOrderServiceImpl implements ProductOrderService { |
|
|
|
if(productOrder == null){ |
|
|
|
return; |
|
|
|
} |
|
|
|
if(productOrder.getPayVendor() == null){ |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
if(!EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode().equals(productOrder.getOrderStatus())){ |
|
|
|
return; |
|
|
|
} |
|
|
@@ -253,17 +249,20 @@ public class ProductOrderServiceImpl implements ProductOrderService { |
|
|
|
if(productOrder.getCreateDate().after(hourDateBefore)){ |
|
|
|
return; |
|
|
|
} |
|
|
|
PayAdapterService payAdapterService = payServiceFactory.getPayAdapterService(productOrder.getPayVendor()); |
|
|
|
EnumProductOrderPayVendor payVendoEnum = EnumProductOrderPayVendor.getEnum(productOrder.getPayVendor()); |
|
|
|
|
|
|
|
WxAppinfo appinfo = wxAppinfoService.getProjectCAppInfoFromRedis(productOrder.getProjectType(), payVendoEnum.getPlat()); |
|
|
|
WxPayAccount payAccount = wxPayAccountService.getByIdFromRedis(appinfo.getPayId()); |
|
|
|
ResultData resultData = handleProductOrderByQuery(appinfo,payAccount,productOrder,payAdapterService); |
|
|
|
if(ResultData.SUCCESS != resultData.code){ |
|
|
|
return; |
|
|
|
} |
|
|
|
if(!EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode().equals(productOrder.getProfitSharing())){ |
|
|
|
return; |
|
|
|
if(productOrder.getPayVendor() != null){ |
|
|
|
PayAdapterService payAdapterService = payServiceFactory.getPayAdapterService(productOrder.getPayVendor()); |
|
|
|
EnumProductOrderPayVendor payVendoEnum = EnumProductOrderPayVendor.getEnum(productOrder.getPayVendor()); |
|
|
|
|
|
|
|
WxAppinfo appinfo = wxAppinfoService.getProjectCAppInfoFromRedis(productOrder.getProjectType(), payVendoEnum.getPlat()); |
|
|
|
WxPayAccount payAccount = wxPayAccountService.getByIdFromRedis(appinfo.getPayId()); |
|
|
|
ResultData resultData = handleProductOrderByQuery(appinfo,payAccount,productOrder,payAdapterService); |
|
|
|
if(ResultData.SUCCESS != resultData.code){ |
|
|
|
return; |
|
|
|
} |
|
|
|
if(!EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode().equals(productOrder.getProfitSharing())){ |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
productOrder.setOrderStatus(EnumProductOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode()); |
|
|
|