diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseService.java index 35f8dc71a..e82bbeef8 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseService.java @@ -125,7 +125,7 @@ public interface PurchaseService { List getOrgProductDetailList(Long organId, Long productId); /** - * 作废历史组织产品购买记录 + * 更新历史组织产品购买记录为待支付 * * @param organId * @param purchaseRecordId diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java index 78a171516..052b5a7ab 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java @@ -350,7 +350,7 @@ public class PurchaseServiceImpl implements PurchaseService { purchaseRecordMapper.update(new LambdaUpdateWrapper() .eq(PurchaseRecordDO::getOrganId, organId) .eq(PurchaseRecordDO::getId, purchaseRecordId) - .eq(PurchaseRecordDO::getStatus, PurchaseRecordStatusEnum.PENDING.getStatus()) + .in(PurchaseRecordDO::getStatus, PurchaseRecordStatusEnum.ACTIVE.getStatus(), PurchaseRecordStatusEnum.PENDING.getStatus()) .eq(PurchaseRecordDO::getDeleted, false) .set(PurchaseRecordDO::getStatus, PurchaseRecordStatusEnum.INACTIVE.getStatus())); } 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 6cda0b639..ec57698d7 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 @@ -262,8 +262,8 @@ public class PayOrderServiceImpl implements PayOrderService { // 历史的购买记录更新为等待支付,需要第三方支付回调后作废前序 purchaseService.pendingHistoryOrganProductPurchaseRecord(organId, previousId); } else { - // 作废历史的购买记录更新为等待支付 - purchaseService.pendingHistoryOrganProductPurchaseRecord(organId, previousId); + // 作废历史的购买记录 + purchaseService.invalidHistoryOrganProductPurchaseRecord(organId, previousId); } } }