修改退款推峰值

feifan-module-distri/feifan-module-distri-api/src/main/java/cn/newfeifan/mall/module/distri/enums/CaclEnum.java

@@ -23,16 +23,18 @@ public enum CaclEnum {
     ORDER_CANCEL_BY_USER_REFUND_INTEGRAL(16,"手动取消支付返回","取消订单，退回积分"),
     ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL(17,"支付超时返回","订单超时未支付，退回积分"),
     ORDER_PAY_INTEGRAL_ANCESTER(18, "直推奖获得","直推人购物,推荐人获得冻结积分"),//购物 上级直推人 获得积分
-    ORDER_REFUND_INTEGRAL_CONSUMER(19,"订单退款","订单退款，收回消费者获得的冻结积分"),
-    ORDER_REFUND_INTEGRAL_ANCESTER(20,"订单退款","订单退款，收回消费者的推荐人，获得的冻结积分"),
+    ORDER_REFUND_INTEGRAL_CONSUMER(19,"订单退款-撤回购物获得","订单退款，收回消费者获得的冻结积分"),
+    ORDER_REFUND_INTEGRAL_ANCESTER(20,"订单退款-撤回直推奖","订单退款，收回消费者的推荐人，获得的冻结积分"),
     ORDER_PAY_INTEGRAL_CONSUMER(21, "购物获得","消费者购物,获得冻结积分"),//购物者本人 获得积分
+    SMALL_QUOTA_CRASH_SETTLE(22, "合赢奖结算获得","每天计算的合赢奖7天后结算"),
+    ORDER_PAY_FREEZE_HIGH_QUOTA(23, "购物获得","消费者购物,获得冻结峰值"),
+    ORDER_REFUND_ORDER_PAY_FREEZE_HIGH_QUOTA(24, "订单退款-撤回峰值奖","消费者购物,获得冻结峰值")
     ;
 
 //    ORDER_GET_FREEZE_INTEGRAL(12,"购物返积分"),//购物获得冻结积分
 //    ORDER_CANCEL_BY_USER_REFUND_INTEGRAL(13,"取消订单，退回积分"),//用户手动取消未支付订单，退回购物使用的积分
 //    ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL(14,"订单超时未支付，退回积分"),//订单超时未支付，退回购物使用的积分
 //    ORDER_REFUND_CANCEL_INTEGRAL(15,"订单退款，减少冻结积分"),//订单已支付，用户退款申请通过，则减少之前给用户的冻结积分
-    ;
 
     /**
      * 来源

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/ptprofitlog/vo/PtProfitLogSaveReqVO.java

@@ -46,5 +46,11 @@ public class PtProfitLogSaveReqVO {
 
     @Schema(description = "计算百分比模板")
     private String percentTemplate;
+    @Schema(description = "变动的冻结最大可用额度")
+    private Long freezeHighQuota;
+
+    @Schema(description = "变动后的冻结最大可用额度")
+    private Long afterFreezeHighQuota;
+
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/integral/IntegralDO.java

@@ -46,4 +46,9 @@ public class IntegralDO extends BaseDO {
     private String name;
 
     private String nickName;
+    /**
+     * 冻结的最高可获取积分
+     */
+    private Long freezeHighQuota;
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/ptprofitlog/PtProfitLogDO.java

@@ -1,5 +1,4 @@
 package cn.newfeifan.mall.module.distri.dal.dataobject.ptprofitlog;
-import cn.newfeifan.mall.module.distri.dal.dataobject.ptprofitlog.PtProfitLogDO;
 
 import lombok.*;
 import com.baomidou.mybatisplus.annotation.*;
@@ -71,5 +70,13 @@ public class PtProfitLogDO extends BaseDO {
      */
     private String percentTemplate;
 
+    /**
+     * 变动的冻结最大可用额度
+     */
+    private Long freezeHighQuota;
+    /**
+     * 变动后的冻结最大可用额度
+     */
+    private Long afterFreezeHighQuota;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/integral/IntegralService.java

@@ -80,4 +80,15 @@ public interface IntegralService {
 //     */
 //    String updateUserSocialStatus(Long userId, SocialStatusUpdateEnum socialStatusUpdateEnum, Integer socialStatusPoint,
 //                                   Long ObjectId);
+
+    /**
+     * 修改用户身价
+     * @param generateUserId 导致产生积分变动的用户ID
+     * @param userId 身价变动类别
+     * @param caclEnum 变化类型
+     * @param totalFreezeHighQuota 冻结峰值
+     * @param tradeOrderId 订单ID
+     * @param orderNum 订单号
+     */
+    void updateIntegralFreezeHighQuota(Long generateUserId, Long userId, CaclEnum caclEnum, Long totalFreezeHighQuota, Long tradeOrderId, String orderNum);
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/integral/IntegralServiceImpl.java

@@ -1,5 +1,8 @@
 package cn.newfeifan.mall.module.distri.service.integral;
 
+import cn.newfeifan.mall.module.distri.controller.admin.ptprofitlog.vo.PtProfitLogSaveReqVO;
+import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
+import cn.newfeifan.mall.module.distri.dal.integral.IntegralMapper;
 import cn.newfeifan.mall.module.distri.dal.ptprofit.PtProfitMapper;
 import cn.newfeifan.mall.module.distri.enums.CaclEnum;
 import cn.newfeifan.mall.module.distri.service.ptprofitlog.PtProfitLogService;
@@ -27,6 +30,9 @@ public class IntegralServiceImpl implements IntegralService {
     @Resource
     private PtProfitMapper ptProfitMapper;
 
+    @Resource
+    private IntegralMapper integralMapper;
+
     @Resource
     private PtProfitLogService ptProfitLogService;
 
@@ -132,6 +138,25 @@ public class IntegralServiceImpl implements IntegralService {
         return success;
     }
 
+    @Override
+    public void updateIntegralFreezeHighQuota(Long generateUserId, Long userId, CaclEnum caclEnum, Long totalFreezeHighQuota, Long tradeOrderId, String orderNum) {
+        IntegralDO integralDO = integralMapper.selectById(userId);
+        integralDO.setFreezeHighQuota(integralDO.getFreezeHighQuota() - totalFreezeHighQuota);
+        integralMapper.updateById(integralDO);
+
+        //记录用户的积分变动日志
+        PtProfitLogSaveReqVO profitLogSaveReqVO = PtProfitLogSaveReqVO.builder()
+                .freezeHighQuota(-totalFreezeHighQuota)
+                .afterFreezeHighQuota(integralDO.getFreezeHighQuota())
+                .userId(userId)
+                .generateUserId(generateUserId)
+                .profitStatus(caclEnum.getType())
+                .orderId(tradeOrderId)
+                .orderNo(orderNum)
+                .build();
+        ptProfitLogService.createPtProfitLog(profitLogSaveReqVO);
+    }
+
 //
 //    /**
 //     * 修改用户身价

feifan-module-mall/feifan-module-trade-api/src/main/java/cn/newfeifan/mall/module/trade/enums/ErrorCodeConstants.java

@@ -99,6 +99,7 @@ public interface ErrorCodeConstants {
     ErrorCode ORDER_CALLBACK_LOGS_NOT_EXISTS = new ErrorCode(1_011_008_007, "回调日志不存在");
     ErrorCode CREATE_TRADE_ORDER_LOGS_ERROR = new ErrorCode(1_011_008_008, "创建第三方日志异常");
     ErrorCode MESSAGE_LOG_NOT_EXISTS = new ErrorCode(1_011_008_009, "微信模板消息日志不存在");
+    ErrorCode DAILY_BILL_NOT_EXISTS = new ErrorCode(1_011_008_010, "每日账单详细不存在");
 
 
 }

feifan-module-mall/feifan-module-trade-api/src/main/java/cn/newfeifan/mall/module/trade/enums/wxmessage/WcChatMessageTemplateIdEnum.java

@@ -9,10 +9,16 @@ import lombok.RequiredArgsConstructor;
 @Getter
 @RequiredArgsConstructor
 public enum WcChatMessageTemplateIdEnum {
-    ORDER_DELIVERY2("1","订单发货通知"),
-    AFTER_SALE_CHECK2("2","售后订单审核通知"),
-    AFTER_SALE_NO_CHECK2("3","售后订单待审核通知"),
-    ORDER_NO_DELIVERY2("4","订单出货提醒");
+
+    ORDER_DELIVERY("1","订单发货通知"),
+    AFTER_SALE_CHECK("2","售后订单审核通知"),
+    AFTER_SALE_NO_CHECK("3","售后订单待审核通知"),
+    ORDER_NO_DELIVERY("4","订单出货提醒"),
+    //下面是常来此购的
+    ORDER_DELIVERY2("5","订单发货通知"),
+    AFTER_SALE_CHECK2("6","售后订单审核通知"),
+    AFTER_SALE_NO_CHECK2("7","售后订单待审核通知"),
+    ORDER_NO_DELIVERY2("8","订单出货提醒");
 
     private final String templateId;
     private final String name;

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/order/TradeOrderItemDO.java

@@ -47,21 +47,22 @@ public class TradeOrderItemDO extends BaseDO {
      * 直推人用户付款后，推荐人用户获得积分
      */
     private Long ancestorIncreaseIntegral;
+    /**
+     * 用户获得冻结最大可用额度
+     */
+    private Long freezeHighQuota;
     /**
      * 用户编号
-     *
      * 关联 MemberUserDO 的 id 编号
      */
     private Long userId;
     /**
      * 订单编号
-     *
      * 关联 {@link TradeOrderDO#getId()}
      */
     private Long orderId;
     /**
      * 购物车项编号
-     *
      * 关联 {@link CartDO#getId()}
      */
     private Long cartId;
@@ -69,25 +70,21 @@ public class TradeOrderItemDO extends BaseDO {
     // ========== 商品基本信息; 冗余较多字段，减少关联查询 ==========
     /**
      * 商品 SPU 编号
-     *
      * 关联 ProductSkuDO 的 spuId 编号
      */
     private Long spuId;
     /**
      * 商品 SPU 名称
-     *
      * 冗余 ProductSkuDO 的 spuName 编号
      */
     private String spuName;
     /**
      * 商品 SKU 编号
-     *
      * 关联 ProductSkuDO 的 id 编号
      */
     private Long skuId;
     /**
      * 属性数组，JSON 格式
-     *
      * 冗余 ProductSkuDO 的 properties 字段
      */
     @TableField(typeHandler = PropertyTypeHandler.class)
@@ -102,7 +99,6 @@ public class TradeOrderItemDO extends BaseDO {
     private Integer count;
     /**
      * 是否评价
-     *
      * true - 已评价
      * false - 未评价
      */
@@ -112,14 +108,12 @@ public class TradeOrderItemDO extends BaseDO {
 
     /**
      * 商品原价（单），单位：分
-     *
      * 对应 ProductSkuDO 的 price 字段
      * 对应 taobao 的 order.price 字段
      */
     private Integer price;
     /**
      * 优惠金额（总），单位：分
-     *
      * 对应 taobao 的 order.discount_fee 字段
      */
     private Integer discountPrice;
@@ -129,13 +123,11 @@ public class TradeOrderItemDO extends BaseDO {
     private Integer deliveryPrice;
     /**
      * 订单调价（总），单位：分
-     *
      * 正数，加价；负数，减价
      */
     private Integer adjustPrice;
     /**
      * 应付金额（总），单位：分
-     *
      * = {@link #price} * {@link #count}
      * - {@link #couponPrice}
      * - {@link #pointPrice}
@@ -150,25 +142,21 @@ public class TradeOrderItemDO extends BaseDO {
 
     /**
      * 优惠劵减免金额，单位：分
-     *
      * 对应 taobao 的 trade.coupon_fee 字段
      */
     private Integer couponPrice;
     /**
      * 积分抵扣的金额，单位：分
-     *
      * 对应 taobao 的 trade.point_fee 字段
      */
     private Integer pointPrice;
     /**
      * 使用的积分
-     *
      * 目的：用于后续取消或者售后订单时，需要归还赠送
      */
     private Integer usePoint;
     /**
      * 赠送的积分
-     *
      * 目的：用于后续取消或者售后订单时，需要扣减赠送
      */
     private Integer givePoint;
@@ -181,13 +169,11 @@ public class TradeOrderItemDO extends BaseDO {
 
     /**
      * 售后单编号
-     *
      * 关联 {@link AfterSaleDO#getId()} 字段
      */
     private Long afterSaleId;
     /**
      * 售后状态
-     *
      * 枚举 {@link TradeOrderItemAfterSaleStatusEnum}
      */
     private Integer afterSaleStatus;
@@ -204,26 +190,22 @@ public class TradeOrderItemDO extends BaseDO {
 
         /**
          * 属性编号
-         *
          * 关联 ProductPropertyDO 的 id 编号
          */
         private Long propertyId;
         /**
          * 属性名字
-         *
          * 关联 ProductPropertyDO 的 name 字段
          */
         private String propertyName;
 
         /**
          * 属性值编号
-         *
          * 关联 ProductPropertyValueDO 的 id 编号
          */
         private Long valueId;
         /**
          * 属性值名字
-         *
          * 关联 ProductPropertyValueDO 的 name 字段
          */
         private String valueName;

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/aftersale/AfterSaleServiceImpl.java

@@ -415,6 +415,7 @@ public class AfterSaleServiceImpl implements AfterSaleService {
         //2. 减少退货物品对应的冻结积分
         Long increaseIntegral = tradeOrderItemDO.getIncreaseIntegral();//消费者自得冻结积分
         Long ancestorIncreaseIntegral = tradeOrderItemDO.getAncestorIncreaseIntegral();//消费者推荐人得冻结积分
+        Long freezeHighQuota = tradeOrderItemDO.getFreezeHighQuota();
 
 
         //订单退款，收回消费者获得的冻结积分
@@ -425,6 +426,9 @@ public class AfterSaleServiceImpl implements AfterSaleService {
         //订单退款，收回消费者推荐人获得的冻结积分
         integralService.updateUserIntegral(orderUserId,ancesterUserId, CaclEnum.ORDER_REFUND_INTEGRAL_ANCESTER, 0L,ancestorIncreaseIntegral*(-1),tradeOrderId,tradeOrderNum);
 
+        //订单退款,收回消费者获得的冻结峰值
+        integralService.updateIntegralFreezeHighQuota(orderUserId,orderUserId, CaclEnum.ORDER_REFUND_ORDER_PAY_FREEZE_HIGH_QUOTA, freezeHighQuota,tradeOrderId,tradeOrderNum);
+
         // 发起退款单。注意，需要在事务提交后，再进行发起，避免重复发起
         createPayRefund(userIp, afterSale);
 

feifan-module-mall/feifan-module-trade-biz/src/test/java/cn/newfeifan/mall/module/trade/service/ordercallbacklogs/OrderCallbackLogsServiceImplTest.java

@@ -1,139 +0,0 @@
-package cn.newfeifan.mall.module.trade.service.ordercallbacklogs;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import javax.annotation.Resource;
-
-import cn.newfeifan.mall.framework.test.core.ut.BaseDbUnitTest;
-
-import cn.newfeifan.mall.module.trade.controller.admin.ordercallbacklogs.vo.*;
-import cn.newfeifan.mall.module.trade.dal.dataobject.ordercallbacklogs.OrderCallbackLogsDO;
-import cn.newfeifan.mall.module.trade.dal.mysql.ordercallbacklogs.OrderCallbackLogsMapper;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-
-import org.springframework.context.annotation.Import;
-
-import static cn.newfeifan.mall.module.trade.enums.ErrorCodeConstants.*;
-import static cn.newfeifan.mall.framework.test.core.util.AssertUtils.*;
-import static cn.newfeifan.mall.framework.test.core.util.RandomUtils.*;
-import static cn.newfeifan.mall.framework.common.util.date.LocalDateTimeUtils.*;
-import static cn.newfeifan.mall.framework.common.util.object.ObjectUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * {@link OrderCallbackLogsServiceImpl} 的单元测试类
- *
- * @author 非繁人
- */
-@Import(OrderCallbackLogsServiceImpl.class)
-public class OrderCallbackLogsServiceImplTest extends BaseDbUnitTest {
-
-    @Resource
-    private OrderCallbackLogsServiceImpl orderCallbackLogsService;
-
-    @Resource
-    private OrderCallbackLogsMapper orderCallbackLogsMapper;
-
-    @Test
-    public void testCreateOrderCallbackLogs_success() {
-        // 准备参数
-        OrderCallbackLogsSaveReqVO createReqVO = randomPojo(OrderCallbackLogsSaveReqVO.class).setId(null);
-
-        // 调用
-        Long orderCallbackLogsId = orderCallbackLogsService.createOrderCallbackLogs(createReqVO);
-        // 断言
-        assertNotNull(orderCallbackLogsId);
-        // 校验记录的属性是否正确
-        OrderCallbackLogsDO orderCallbackLogs = orderCallbackLogsMapper.selectById(orderCallbackLogsId);
-        assertPojoEquals(createReqVO, orderCallbackLogs, "id");
-    }
-
-    @Test
-    public void testUpdateOrderCallbackLogs_success() {
-        // mock 数据
-        OrderCallbackLogsDO dbOrderCallbackLogs = randomPojo(OrderCallbackLogsDO.class);
-        orderCallbackLogsMapper.insert(dbOrderCallbackLogs);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        OrderCallbackLogsSaveReqVO updateReqVO = randomPojo(OrderCallbackLogsSaveReqVO.class, o -> {
-            o.setId(dbOrderCallbackLogs.getId()); // 设置更新的 ID
-        });
-
-        // 调用
-        orderCallbackLogsService.updateOrderCallbackLogs(updateReqVO);
-        // 校验是否更新正确
-        OrderCallbackLogsDO orderCallbackLogs = orderCallbackLogsMapper.selectById(updateReqVO.getId()); // 获取最新的
-        assertPojoEquals(updateReqVO, orderCallbackLogs);
-    }
-
-    @Test
-    public void testUpdateOrderCallbackLogs_notExists() {
-        // 准备参数
-        OrderCallbackLogsSaveReqVO updateReqVO = randomPojo(OrderCallbackLogsSaveReqVO.class);
-
-        // 调用, 并断言异常
-        assertServiceException(() -> orderCallbackLogsService.updateOrderCallbackLogs(updateReqVO), ORDER_CALLBACK_LOGS_NOT_EXISTS);
-    }
-
-    @Test
-    public void testDeleteOrderCallbackLogs_success() {
-        // mock 数据
-        OrderCallbackLogsDO dbOrderCallbackLogs = randomPojo(OrderCallbackLogsDO.class);
-        orderCallbackLogsMapper.insert(dbOrderCallbackLogs);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        Long id = dbOrderCallbackLogs.getId();
-
-        // 调用
-        orderCallbackLogsService.deleteOrderCallbackLogs(id);
-       // 校验数据不存在了
-       assertNull(orderCallbackLogsMapper.selectById(id));
-    }
-
-    @Test
-    public void testDeleteOrderCallbackLogs_notExists() {
-        // 准备参数
-        Long id = randomLongId();
-
-        // 调用, 并断言异常
-        assertServiceException(() -> orderCallbackLogsService.deleteOrderCallbackLogs(id), ORDER_CALLBACK_LOGS_NOT_EXISTS);
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetOrderCallbackLogsPage() {
-       // mock 数据
-       OrderCallbackLogsDO dbOrderCallbackLogs = randomPojo(OrderCallbackLogsDO.class, o -> { // 等会查询到
-           o.setOrderId(null);
-           o.setRequestParam(null);
-           o.setCreateTime(null);
-           o.setResponseBody(null);
-           o.setStatus(null);
-       });
-       orderCallbackLogsMapper.insert(dbOrderCallbackLogs);
-       // 测试 orderId 不匹配
-       orderCallbackLogsMapper.insert(cloneIgnoreId(dbOrderCallbackLogs, o -> o.setOrderId(null)));
-       // 测试 requestParam 不匹配
-       orderCallbackLogsMapper.insert(cloneIgnoreId(dbOrderCallbackLogs, o -> o.setRequestParam(null)));
-       // 测试 createTime 不匹配
-       orderCallbackLogsMapper.insert(cloneIgnoreId(dbOrderCallbackLogs, o -> o.setCreateTime(null)));
-       // 测试 responseBody 不匹配
-       orderCallbackLogsMapper.insert(cloneIgnoreId(dbOrderCallbackLogs, o -> o.setResponseBody(null)));
-       // 测试 status 不匹配
-       orderCallbackLogsMapper.insert(cloneIgnoreId(dbOrderCallbackLogs, o -> o.setStatus(null)));
-       // 准备参数
-       OrderCallbackLogsPageReqVO reqVO = new OrderCallbackLogsPageReqVO();
-       reqVO.setOrderId(null);
-       reqVO.setRequestParam(null);
-       reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
-       reqVO.setResponseBody(null);
-       reqVO.setStatus(null);
-
-       // 调用
-       PageResult<OrderCallbackLogsDO> pageResult = orderCallbackLogsService.getOrderCallbackLogsPage(reqVO);
-       // 断言
-       assertEquals(1, pageResult.getTotal());
-       assertEquals(1, pageResult.getList().size());
-       assertPojoEquals(dbOrderCallbackLogs, pageResult.getList().get(0));
-    }
-
-}