diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/exception/ErrorData.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/exception/ErrorData.java index 9330aa295..9b7947b26 100644 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/exception/ErrorData.java +++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/exception/ErrorData.java @@ -10,5 +10,5 @@ import lombok.Data; */ @Data public class ErrorData { - private String errorData; + private Object[] errorData; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/purchase/PurchaseRecordDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/purchase/PurchaseRecordDO.java index efe5f92a2..aec054af9 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/purchase/PurchaseRecordDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/purchase/PurchaseRecordDO.java @@ -159,4 +159,9 @@ public class PurchaseRecordDO extends BaseDO { * 第三方支付链接 */ private String displayContent; + + /** + * 支付订单id + */ + private Long payOrderId; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java index 9b13836ba..681b506c1 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java @@ -173,7 +173,11 @@ public class PayOrderServiceImpl implements PayOrderService { PurchaseRecordDO latestPendingPurchase = pendingPurchaseList.stream() .max(Comparator.comparing(BaseDO::getUpdateTime)) .orElse(null); - throw new ServiceException(ORG_PRODUCT_PURCHASE_WAIT_PAY_ERROR, new ErrorData().setErrorData(latestPendingPurchase.getDisplayContent()), payConfig.getPayExpireTime().toMinutes()); + Object[] errorData = new Object[3]; + errorData[0] = latestPendingPurchase.getPayOrderId(); + errorData[1] = latestPendingPurchase.getPaymentMethod(); + errorData[2] = latestPendingPurchase.getDisplayContent(); + throw new ServiceException(ORG_PRODUCT_PURCHASE_WAIT_PAY_ERROR, new ErrorData().setErrorData(errorData), payConfig.getPayExpireTime().toMinutes()); } // 查询组织产品的首次购买记录 @@ -207,6 +211,7 @@ public class PayOrderServiceImpl implements PayOrderService { // 购买记录入库,记录外部支付请求 purchaseRecordDO.setDisplayContent(payOrderRespDTO.getDisplayContent()); + purchaseRecordDO.setPayOrderId(payOrder.getId()); purchaseService.createRecord(purchaseRecordDO); return payOrderRespDTO; @@ -247,7 +252,11 @@ public class PayOrderServiceImpl implements PayOrderService { PurchaseRecordDO latestPendingPurchase = pendingPurchaseList.stream() .max(Comparator.comparing(BaseDO::getUpdateTime)) .orElse(null); - throw new ServiceException(ORG_PRODUCT_PURCHASE_WAIT_PAY_ERROR, new ErrorData().setErrorData(latestPendingPurchase.getDisplayContent()), payConfig.getPayExpireTime().toMinutes()); + Object[] errorData = new Object[3]; + errorData[0] = latestPendingPurchase.getPayOrderId(); + errorData[1] = latestPendingPurchase.getPaymentMethod(); + errorData[2] = latestPendingPurchase.getDisplayContent(); + throw new ServiceException(ORG_PRODUCT_PURCHASE_WAIT_PAY_ERROR, new ErrorData().setErrorData(errorData), payConfig.getPayExpireTime().toMinutes()); } // 查询组织产品的首次购买记录