Ver Fonte

fix(cf): 送会员商品P点扣除会员成本价(迁移469)+管理端会员成本价配置

- membership_levels 新增 cost_price(分),迁移469 幂等建列,FAMILY 默认回填 99900 分(¥999)
- CfCommissionService.calcOrderPpoints: 单商品/多商品订单若商品配置「送会员规则」(product_gift_rules 启用),
  P点 = 实付 − 商品成本 − 赠送等级会员成本价(负数记0,亏本不发)
- AdminController.updateMembershipLevel 透传 costPrice;cfc-web MembershipCenter 等级配置加成本价列+编辑项
- 单测: 单商品/多商品两条分支各加送会员扣成本用例(51400=181300-30000-99900),52 相关测试全绿
Xiaogang Liao há 2 dias atrás
pai
commit
8b48bd4548

+ 28 - 1
cfc-backend/src/main/java/com/etotem/cfc/config/DatabaseInitializer.java

@@ -3507,6 +3507,10 @@ insertSysConfigSeed("gift_membership_pay_price", "198000", "送会员商品达
 
         // 迁移468(FamilyWorkbench 2026-11-13): tasks 加 (family_id, created_at) 索引(工作台按家庭聚合与逐日趋势分桶)
         addTasksFamilyCreatedIndex();
+
+        // 迁移469: membership_levels 加会员成本价列 cost_price(F-3a 送会员商品P点口径:
+        // 配置了「送会员」规则的商品订单,P 点 = 实付 − 商品成本 − 赠送等级会员成本价)
+        addMembershipCostPriceColumn();
     }
 
     /** 迁移468(FamilyWorkbench): tasks 加家庭+时间复合索引,支撑工作台按家庭聚合计数与近 30 天逐日趋势。 */
@@ -15815,4 +15819,27 @@ log.info("迁移298: 已为无 openid 的 child 账号补齐 family_members 记
             return null;
         }
     }
-}
+
+    /**
+     * 迁移469: membership_levels.cost_price 会员成本价(分)。
+     * 幂等:ensureColumn 忽略「列已存在」;仅有默认值 UPDATE,不覆盖管理端已设值。
+     */
+    private void addMembershipCostPriceColumn() {
+        try {
+            ensureColumn("membership_levels", "cost_price",
+                    "INT NOT NULL DEFAULT 0 COMMENT '会员成本价(分):送会员商品计算P点时扣除的商品外成本'");
+            // FAMILY 等级初始成本价 99900 分(¥999)——仅当该等级成本价为 0/默认时回填,不覆盖已设置值
+            Integer cnt = jdbcTemplate.queryForObject(
+                    "SELECT COUNT(*) FROM membership_levels WHERE level_code = 'FAMILY' AND (cost_price IS NULL OR cost_price = 0)",
+                    Integer.class);
+            if (cnt != null && cnt > 0) {
+                jdbcTemplate.update("UPDATE membership_levels SET cost_price = 99900 WHERE level_code = 'FAMILY'");
+                log.info("迁移469: 已回填 FAMILY 会员成本价 = 99900 分");
+            } else {
+                log.info("迁移469: 已存在,跳过(membership_levels.cost_price)");
+            }
+        } catch (Exception e) {
+            log.warn("迁移469: membership_levels.cost_price 失败(忽略): {}", e.getMessage());
+        }
+    }
+}

+ 1 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminController.java

@@ -1610,6 +1610,7 @@ public class AdminController {
         if (level.getMaxTasksPerDay() != null) existing.setMaxTasksPerDay(level.getMaxTasksPerDay());
         if (level.getAiReviewEnabled() != null) existing.setAiReviewEnabled(level.getAiReviewEnabled());
         if (level.getPrioritySupport() != null) existing.setPrioritySupport(level.getPrioritySupport());
+        if (level.getCostPrice() != null) existing.setCostPrice(level.getCostPrice());
         int rows = membershipLevelMapper.updateById(existing);
         if (rows > 0) {
             return Result.success("更新成功");

+ 2 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/MembershipLevel.java

@@ -49,6 +49,8 @@ public class MembershipLevel implements Serializable {
 
     private Integer levelOrder;  // 级别数字(越大级别越高): FREE=1 BASIC=2 FAMILY=3 PREMIUM=4 LIFETIME=5; PROVIDER=1(非会员,服务商独立角色)
 
+    private Integer costPrice;  // 会员成本价(分):送会员商品计算P点时扣除的商品外成本
+
     private Date createdAt;
 
     private Date updatedAt;

+ 38 - 3
cfc-backend/src/main/java/com/etotem/cfc/service/CfCommissionService.java

@@ -13,11 +13,15 @@ import com.etotem.cfc.entity.OctopusEffectRecord;
 import com.etotem.cfc.entity.OctopusKeyPerson;
 import com.etotem.cfc.entity.PpointConsumptionLog;
 import com.etotem.cfc.entity.OrderItem;
+import com.etotem.cfc.entity.MembershipLevel;
 import com.etotem.cfc.entity.Product;
+import com.etotem.cfc.entity.ProductGiftRule;
 import com.etotem.cfc.entity.ProductOrder;
 import com.etotem.cfc.entity.ReferralTree;
 import com.etotem.cfc.entity.User;
 import com.etotem.cfc.mapper.FamilyMemberMapper;
+import com.etotem.cfc.mapper.MembershipLevelMapper;
+import com.etotem.cfc.mapper.ProductGiftRuleMapper;
 import com.etotem.cfc.mapper.OctopusEffectKeyPersonMapper;
 import com.etotem.cfc.mapper.OctopusEffectRecordMapper;
 import com.etotem.cfc.mapper.OctopusKeyPersonMapper;
@@ -100,6 +104,10 @@ public class CfCommissionService {
     @Resource
     private ProductOrderMapper productOrderMapper;
     @Resource
+    private ProductGiftRuleMapper productGiftRuleMapper;
+    @Resource
+    private MembershipLevelMapper membershipLevelMapper;
+    @Resource
     private OctopusKeyPersonMapper octopusKeyPersonMapper;
     @Resource
     private OctopusEffectRecordMapper octopusEffectRecordMapper;
@@ -369,20 +377,22 @@ public class CfCommissionService {
                             Product p = productMapper.selectById(it.getProductId());
                             int costPerUnit = (p != null && p.getPurchasePrice() != null) ? p.getPurchasePrice() : 0;
                             long lineCost = (long) costPerUnit * qty;
-                            long linePpoint = allocPaid - lineCost;
+                            long memberCost = giftMembershipCost(it.getProductId());
+                            long linePpoint = allocPaid - lineCost - memberCost;
                             if (linePpoint > 0) total += (int) linePpoint;
                         }
                         return total;
                     }
                 }
 
-                // 单商品订单:实付 − 成本 × 数量
+                // 单商品订单:实付 − 成本 × 数量 − 赠送会员成本价
                 if (productId == null) return 0;
                 Product p = productMapper.selectById(productId);
                 if (p == null) return 0;
                 int costPerUnit = p.getPurchasePrice() != null ? p.getPurchasePrice() : 0;
                 int qty = order.getQuantity() != null ? order.getQuantity() : 1;
-                int ppoints = paid - costPerUnit * qty;
+                int memberCost = giftMembershipCost(productId);
+                int ppoints = paid - costPerUnit * qty - memberCost;
                 return ppoints > 0 ? ppoints : 0;
             } catch (Exception e) {
                 log.warn("计算本单 P 点失败: orderId={}, err={}", orderId, e.getMessage());
@@ -395,6 +405,31 @@ public class CfCommissionService {
         return amountYuan * serviceRateBps / 10000;
     }
 
+
+    /**
+     * 赠送会员成本价(分):商品若配置了「送会员规则」(product_gift_rules 启用),
+     * 返回其赠送等级的 membership_levels.cost_price;未配置或等级无成本价返回 0。
+     */
+    private int giftMembershipCost(Long productId) {
+        if (productId == null) return 0;
+        try {
+            ProductGiftRule rule = productGiftRuleMapper.selectOne(
+                    new LambdaQueryWrapper<ProductGiftRule>()
+                            .eq(ProductGiftRule::getProductId, productId)
+                            .eq(ProductGiftRule::getStatus, 1)
+                            .last("LIMIT 1"));
+            if (rule == null || rule.getLevelCode() == null) return 0;
+            MembershipLevel level = membershipLevelMapper.selectOne(
+                    new LambdaQueryWrapper<MembershipLevel>()
+                            .eq(MembershipLevel::getLevelCode, rule.getLevelCode())
+                            .last("LIMIT 1"));
+            return (level == null || level.getCostPrice() == null) ? 0 : level.getCostPrice();
+        } catch (Exception e) {
+            log.warn("查询赠送会员成本价失败: productId={}, err={}", productId, e.getMessage());
+            return 0;
+        }
+    }
+
     /** 落 P 点消费日志(唯一键 order_type+order_id,重复触发忽略) */
     private void recordPpointConsumption(Long orderId, String orderType, Long buyerUserId, Long buyerFamilyId,
                                          Integer amountCent, Long productId, int ppoints) {

+ 78 - 0
cfc-backend/src/test/java/com/etotem/cfc/service/CfCommissionServiceSettleTest.java

@@ -22,7 +22,11 @@ import com.etotem.cfc.mapper.FamilyMemberMapper;
 import com.etotem.cfc.mapper.OctopusEffectKeyPersonMapper;
 import com.etotem.cfc.mapper.OctopusEffectRecordMapper;
 import com.etotem.cfc.mapper.OctopusKeyPersonMapper;
+import com.etotem.cfc.entity.MembershipLevel;
+import com.etotem.cfc.entity.ProductGiftRule;
+import com.etotem.cfc.mapper.MembershipLevelMapper;
 import com.etotem.cfc.mapper.OrderItemMapper;
+import com.etotem.cfc.mapper.ProductGiftRuleMapper;
 import com.etotem.cfc.mapper.PpointConsumptionLogMapper;
 import com.etotem.cfc.mapper.ProductMapper;
 import com.etotem.cfc.mapper.ProductOrderMapper;
@@ -103,6 +107,10 @@ class CfCommissionServiceSettleTest {
     @Mock
     private PpointConsumptionLogMapper ppointConsumptionLogMapper;
     @Mock
+    private ProductGiftRuleMapper productGiftRuleMapper;
+    @Mock
+    private MembershipLevelMapper membershipLevelMapper;
+    @Mock
     private ConfigService configService;
     @Spy
     private ObjectMapper objectMapper = new ObjectMapper();
@@ -493,4 +501,74 @@ class CfCommissionServiceSettleTest {
         verify(cfBalanceService, never()).earnByRule(anyLong(), anyString(), anyLong(), any());
         verify(cfEarnDispatchService).earnConsumeCf(eq(BUYER_ID), eq("product"), eq(ORDER_ID), eq(10000));
     }
+
+    @Test
+    void settle_songhuiyuan_shangpin_Pdian_jichu_kouchu_huiyuanchengben() {
+        mockReferralChain(ref(10L, 1));
+        when(userMapper.selectById(10L)).thenReturn(user(10L, 200L));
+        when(cfReferralService.getTeamAnnualPpoints(10L, 8)).thenReturn(100);
+        when(cfReferralService.matchDirectSalesTier(100)).thenReturn(directTier("xinxin", 100, 10));
+        when(cfBalanceService.earnByRule(eq(memberIdOf(10L)), eq("F03a"), eq(ORDER_ID), any()))
+                .thenReturn(earnResult(5140, false));
+
+        // Product: purchase price 30000 fen; gift rule -> FAMILY membership
+        when(productMapper.selectById(PRODUCT_ID)).thenReturn(product(30000));
+        ProductGiftRule giftRule = new ProductGiftRule();
+        giftRule.setProductId(PRODUCT_ID);
+        giftRule.setLevelCode("FAMILY");
+        giftRule.setStatus(1);
+        when(productGiftRuleMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(giftRule);
+        MembershipLevel fam = new MembershipLevel();
+        fam.setLevelCode("FAMILY");
+        fam.setCostPrice(99900);
+        when(membershipLevelMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(fam);
+
+        cfCommissionService.settle(ORDER_ID, "product", BUYER_ID, BUYER_FAMILY, 181300, PRODUCT_ID);
+
+        // P points = paid 181300 - product cost 30000 - membership cost 99900 = 51400
+        ArgumentCaptor<Map<String, Object>> captor = ArgumentCaptor.forClass(Map.class);
+        verify(cfBalanceService).earnByRule(eq(memberIdOf(10L)), eq("F03a"), eq(ORDER_ID), captor.capture());
+        assertEquals(51400, captor.getValue().get("base_ppoints"));
+        assertEquals(10, captor.getValue().get("rate_percent"));
+    }
+
+    @Test
+    void settle_duo_shangpin_dan_Pdian_jichu_kouchu_huiyuanchengben() {
+        mockReferralChain(ref(10L, 1));
+        when(userMapper.selectById(10L)).thenReturn(user(10L, 200L));
+        when(cfReferralService.getTeamAnnualPpoints(10L, 8)).thenReturn(100);
+        when(cfReferralService.matchDirectSalesTier(100)).thenReturn(directTier("xinxin", 100, 10));
+        when(cfBalanceService.earnByRule(eq(memberIdOf(10L)), eq("F03a"), eq(ORDER_ID), any()))
+                .thenReturn(earnResult(5140, false));
+
+        // Multi-item order: order 21 has order_items detail (one line, product 3)
+        ProductOrder po = new ProductOrder();
+        po.setId(ORDER_ID);
+        po.setQuantity(1);
+        when(productOrderMapper.selectById(ORDER_ID)).thenReturn(po);
+        OrderItem item = new OrderItem();
+        item.setOrderId(ORDER_ID);
+        item.setProductId(PRODUCT_ID);
+        item.setQuantity(1);
+        item.setPrice(java.math.BigDecimal.valueOf(181300));
+        when(orderItemMapper.findByOrderId(ORDER_ID)).thenReturn(java.util.Collections.singletonList(item));
+
+        when(productMapper.selectById(PRODUCT_ID)).thenReturn(product(30000));
+        ProductGiftRule giftRule = new ProductGiftRule();
+        giftRule.setProductId(PRODUCT_ID);
+        giftRule.setLevelCode("FAMILY");
+        giftRule.setStatus(1);
+        when(productGiftRuleMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(giftRule);
+        MembershipLevel fam = new MembershipLevel();
+        fam.setLevelCode("FAMILY");
+        fam.setCostPrice(99900);
+        when(membershipLevelMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(fam);
+
+        cfCommissionService.settle(ORDER_ID, "product", BUYER_ID, BUYER_FAMILY, 181300, PRODUCT_ID);
+
+        // P = 181300 - 30000 - 99900 = 51400
+        ArgumentCaptor<Map<String, Object>> captor = ArgumentCaptor.forClass(Map.class);
+        verify(cfBalanceService).earnByRule(eq(memberIdOf(10L)), eq("F03a"), eq(ORDER_ID), captor.capture());
+        assertEquals(51400, captor.getValue().get("base_ppoints"));
+    }
 }

+ 9 - 0
cfc-web/src/views/admin/MembershipCenter.vue

@@ -37,6 +37,9 @@
               <el-table-column label="年费" width="80">
                 <template slot-scope="{ row }">{{ formatPrice(row.priceYearly) }}</template>
               </el-table-column>
+              <el-table-column label="会员成本价" width="100">
+                <template slot-scope="{ row }">{{ formatPrice(row.costPrice) }}</template>
+              </el-table-column>
               <el-table-column label="原价月费" width="90">
                 <template slot-scope="{ row }">{{ formatPrice(row.originalPriceMonthly) }}</template>
               </el-table-column>
@@ -258,6 +261,10 @@
         <el-form-item label="年费(元)">
           <el-input-number v-model="editForm.priceYearly" :min="0" :step="100" :precision="0" class="w-160" />
         </el-form-item>
+        <el-form-item label="会员成本价(元)">
+          <el-input-number v-model="editForm.costPrice" :min="0" :step="100" :precision="0" class="w-160" />
+          <span class="mv-hint">送会员商品计算P点时扣除的成本(商品成本价之外)</span>
+        </el-form-item>
         <el-form-item label="月原价(元)">
           <el-input-number v-model="editForm.originalPriceMonthly" :min="0" :step="100" :precision="0" class="w-160" />
           <span class="mv-hint">留空/0 表示无折扣</span>
@@ -352,6 +359,7 @@ export default {
         priceMonthly: 0,
         priceQuarterly: 0,
         priceYearly: 0,
+        costPrice: 0,
         originalPriceMonthly: 0,
         originalPriceQuarterly: 0,
         originalPriceYearly: 0,
@@ -471,6 +479,7 @@ export default {
         priceMonthly: row.priceMonthly,
         priceQuarterly: row.priceQuarterly,
         priceYearly: row.priceYearly,
+        costPrice: row.costPrice || 0,
         originalPriceMonthly: row.originalPriceMonthly,
         originalPriceQuarterly: row.originalPriceQuarterly,
         originalPriceYearly: row.originalPriceYearly,