Преглед изворни кода

feat(assessment): S-cfc-370 assessment.order.pay 支付成功生成测评额度(红转绿)

- AssessmentOrderService 注入 AssessmentQuotaService,paySuccess/payOrder 落 paid 后发放额度(非阻断,失败仅日志)

- paySuccess 增 paid 幂等守卫,防重复回调二次佣金结算/重复发额度(SC-P-34 边界)

- AssessmentQuotaService 新增 AssessmentOrder 入参 grantQuota 重载(默认 1 次/365 天,validity_end 有效期),与 ProductOrder 重载共用 insertQuota

- 验证:mvn -Dtest=AssessmentOrderPayContractTest test → 8/8 通过(原 3 红)
Agnes Agent пре 3 дана
родитељ
комит
a72b1945e9

+ 28 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/AssessmentOrderService.java

@@ -37,6 +37,9 @@ public class AssessmentOrderService extends ServiceImpl<AssessmentOrderMapper, A
     @Resource
     private ProfitPoolService profitPoolService;
 
+    @Resource
+    private AssessmentQuotaService assessmentQuotaService;
+
     @Resource
     private UserMapper userMapper;
 
@@ -73,6 +76,11 @@ public class AssessmentOrderService extends ServiceImpl<AssessmentOrderMapper, A
         SortUtil.applySort(wrapper);
         AssessmentOrder order = this.getOne(wrapper);
         if (order == null) return false;
+        // 幂等:已 paid 直接返回,防重复回调二次佣金结算 / 重复发放额度(SC-P-34 边界)
+        if ("paid".equals(order.getStatus())) {
+            log.info("支付成功回调重复通知,订单已支付: orderNo={}", orderNo);
+            return true;
+        }
         order.setStatus("paid");
         order.setPayTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
         order.setPayType(payType);
@@ -92,10 +100,25 @@ public class AssessmentOrderService extends ServiceImpl<AssessmentOrderMapper, A
             } catch (Exception e) {
                 log.error("团队分润池核算失败: orderId={}, type=assessment, error={}", order.getId(), e.getMessage());
             }
+            // 支付成功生成测评额度(SC-P-34/SC-P-35:额度过期不可用于预约)
+            grantQuotaForPaidOrder(order);
         }
         return updated;
     }
 
+    /**
+     * 支付成功后生成测评额度(默认 1 次 / 365 天有效)。
+     * 失败仅记录日志,不阻断支付主链路(与商城测评商品发额度一致)。
+     */
+    private void grantQuotaForPaidOrder(AssessmentOrder order) {
+        try {
+            assessmentQuotaService.grantQuota(order);
+            log.info("测评订单支付成功生成额度: orderNo={}, orderId={}", order.getOrderNo(), order.getId());
+        } catch (Exception e) {
+            log.error("测评订单额度发放失败: orderNo={}, error={}", order.getOrderNo(), e.getMessage());
+        }
+    }
+
     public boolean cancelOrder(String orderNo) {
         LambdaQueryWrapper<AssessmentOrder> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(AssessmentOrder::getOrderNo, orderNo);
@@ -185,6 +208,11 @@ public class AssessmentOrderService extends ServiceImpl<AssessmentOrderMapper, A
         order.setUpdatedAt(new Date());
         boolean updated = this.updateById(order);
 
+        // 支付成功后生成测评额度(SC-P-34/SC-P-35)
+        if (updated) {
+            grantQuotaForPaidOrder(order);
+        }
+
         // 支付成功后自动确认关联预约
         if (updated && order.getAppointmentId() != null) {
             try {

+ 43 - 7
cfc-backend/src/main/java/com/etotem/cfc/service/AssessmentQuotaService.java

@@ -1,6 +1,7 @@
 package com.etotem.cfc.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.etotem.cfc.entity.AssessmentOrder;
 import com.etotem.cfc.entity.AssessmentQuota;
 import com.etotem.cfc.entity.ProductOrder;
 import com.etotem.cfc.mapper.AssessmentQuotaMapper;
@@ -26,13 +27,49 @@ public class AssessmentQuotaService {
 
     @Transactional
     public void grantQuota(ProductOrder order, Integer totalSessions, Integer validityDays) {
+        AssessmentQuota quota = insertQuota(order.getFamilyId(), null, order.getId(),
+                order.getProductId(), order.getProductName(), totalSessions, validityDays);
+        log.info("已为订单{}发放测评额度: quotaNo={}, familyId={}, 次数={}",
+                order.getOrderNo(), quota.getQuotaNo(), quota.getFamilyId(), quota.getTotalSessions());
+    }
+
+    /**
+     * 测评订单(assessment_orders)支付成功发放额度。
+     *
+     * <p>SC-P-34/SC-P-35:支付成功(pending→paid)后生成一条额度,含有效期(validity_end)。
+     * 额度来源订单 ID 复用 {@code product_order_id} 列(预约创建时按
+     * {@code quota.getProductOrderId()} 回填执行记录的 assessmentOrderId)。</p>
+     *
+     * @param totalSessions 总次数,null 默认 1
+     * @param validityDays  有效天数,null 默认 365
+     */
+    @Transactional
+    public void grantQuota(AssessmentOrder order, Integer totalSessions, Integer validityDays) {
+        AssessmentQuota quota = insertQuota(order.getFamilyId(), order.getMemberId(), order.getId(),
+                order.getPackageId() != null ? order.getPackageId() : 0L,
+                order.getPackageName() != null ? order.getPackageName() : "测评套餐",
+                totalSessions, validityDays);
+        log.info("测评订单{}支付成功,已发放测评额度: quotaNo={}, familyId={}, memberId={}, 次数={}",
+                order.getOrderNo(), quota.getQuotaNo(), quota.getFamilyId(), quota.getMemberId(),
+                quota.getTotalSessions());
+    }
+
+    /** 测评订单支付成功发放额度(默认 1 次 / 365 天有效) */
+    @Transactional
+    public void grantQuota(AssessmentOrder order) {
+        grantQuota(order, null, null);
+    }
+
+    private AssessmentQuota insertQuota(Long familyId, Long memberId, Long sourceOrderId,
+                                        Long productId, String productName,
+                                        Integer totalSessions, Integer validityDays) {
         AssessmentQuota quota = new AssessmentQuota();
         quota.setQuotaNo(generateQuotaNo());
-        quota.setFamilyId(order.getFamilyId() != null ? order.getFamilyId() : 0L);
-        quota.setMemberId(null); // 不绑定具体家庭成员
-        quota.setProductOrderId(order.getId());
-        quota.setProductId(order.getProductId());
-        quota.setProductName(order.getProductName());
+        quota.setFamilyId(familyId != null ? familyId : 0L);
+        quota.setMemberId(memberId);
+        quota.setProductOrderId(sourceOrderId);
+        quota.setProductId(productId);
+        quota.setProductName(productName);
         quota.setTotalSessions(totalSessions != null ? totalSessions : 1);
         quota.setRemainingSessions(totalSessions != null ? totalSessions : 1);
         Date now = new Date();
@@ -43,8 +80,7 @@ public class AssessmentQuotaService {
         quota.setCreatedAt(now);
         quota.setUpdatedAt(now);
         mapper.insert(quota);
-        log.info("已为订单{}发放测评额度: quotaNo={}, familyId={}, 次数={}",
-                order.getOrderNo(), quota.getQuotaNo(), quota.getFamilyId(), quota.getTotalSessions());
+        return quota;
     }
 
     @Transactional