首次提交

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/dailyawardrecords/DailyAwardRecordsDO.java

@@ -36,6 +36,10 @@ public class DailyAwardRecordsDO extends BaseDO {
      * 是否已结算，默认为未结算
      */
     private Boolean settled;
+    /**
+     * 是否计算团队奖, 默认为未计算
+     */
+    private Boolean calcLucky;
     /**
      * 日志Id
      */

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/consumptiontopuplog/ConsumptionTopUpLogMapper.java

@@ -4,9 +4,9 @@ package cn.newfeifan.mall.module.distri.dal.mysql.consumptiontopuplog;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.framework.mybatis.core.mapper.BaseMapperX;
-import cn.newfeifan.mall.module.distri.dal.dataobject.consumptiontopuplog.ConsumptionTopUpLogDO;
+import cn.newfeifan.mall.module.distri.dal.dataobject.integraltopuplog.IntegralTopUpLogDO;
 import org.apache.ibatis.annotations.Mapper;
-import cn.newfeifan.mall.module.distri.controller.admin.consumptiontopuplog.vo.*;
+import cn.newfeifan.mall.module.distri.controller.admin.integraltopuplog.vo.*;
 
 import java.util.List;
 
@@ -16,17 +16,17 @@ import java.util.List;
  * @author 非繁人
  */
 @Mapper
-public interface ConsumptionTopUpLogMapper extends BaseMapperX<ConsumptionTopUpLogDO> {
+public interface ConsumptionTopUpLogMapper extends BaseMapperX<IntegralTopUpLogDO> {
 
-    default PageResult<ConsumptionTopUpLogDO> selectPage(ConsumptionTopUpLogPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ConsumptionTopUpLogDO>()
-                .eqIfPresent(ConsumptionTopUpLogDO::getUserId, reqVO.getUserId())
-                .eqIfPresent(ConsumptionTopUpLogDO::getAttachment, reqVO.getAttachment())
-                .eqIfPresent(ConsumptionTopUpLogDO::getConsumptionPoints, reqVO.getConsumptionPoints())
-                .eqIfPresent(ConsumptionTopUpLogDO::getPracticalConsumptionPoints, reqVO.getPracticalConsumptionPoints())
-                .betweenIfPresent(ConsumptionTopUpLogDO::getCreateTime, reqVO.getCreateTime())
-                .likeIfPresent(ConsumptionTopUpLogDO::getUserName, reqVO.getUserName())
-                .orderByDesc(ConsumptionTopUpLogDO::getId));
+    default PageResult<IntegralTopUpLogDO> selectPage(IntegralTopUpLogPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IntegralTopUpLogDO>()
+                .eqIfPresent(IntegralTopUpLogDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(IntegralTopUpLogDO::getAttachment, reqVO.getAttachment())
+                .eqIfPresent(IntegralTopUpLogDO::getIntegralPoints, reqVO.getIntegralPoints())
+                .eqIfPresent(IntegralTopUpLogDO::getPracticalIntegralPoints, reqVO.getPracticalIntegralPoints())
+                .betweenIfPresent(IntegralTopUpLogDO::getCreateTime, reqVO.getCreateTime())
+                .likeIfPresent(IntegralTopUpLogDO::getUserName, reqVO.getUserName())
+                .orderByDesc(IntegralTopUpLogDO::getId));
     }
 
     List<TopUpRespVO> ptTopUpWithUserTopUpList();

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/consumptionerrorlog/ConsumptionErrorLogServiceImpl.java

@@ -2,17 +2,17 @@ package cn.newfeifan.mall.module.distri.service.consumptionerrorlog;
 
 import cn.newfeifan.mall.module.distri.controller.admin.consumptionerroruser.vo.ConsumptionErrorUserSaveReqVO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.applicationforwithdrawal.ApplicationForWithdrawalDO;
-import cn.newfeifan.mall.module.distri.dal.dataobject.consumptionchangelog.ConsumptionChangeLogDO;
-import cn.newfeifan.mall.module.distri.dal.dataobject.consumptiontopuplog.ConsumptionTopUpLogDO;
-import cn.newfeifan.mall.module.distri.dal.dataobject.consumptiontransferlog.ConsumptionTransferLogDO;
+import cn.newfeifan.mall.module.distri.dal.dataobject.integralchangelog.IntegralChangeLogDO;
+import cn.newfeifan.mall.module.distri.dal.dataobject.integraltopuplog.IntegralTopUpLogDO;
+import cn.newfeifan.mall.module.distri.dal.dataobject.integraltransferlog.IntegralTransferLogDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.usertopupconsumptionpointsorder.UserTopUpConsumptionPointsOrderDO;
-import cn.newfeifan.mall.module.distri.enums.ConsumptionEnum;
+import cn.newfeifan.mall.module.distri.enums.IntegralEnum;
 import cn.newfeifan.mall.module.distri.service.applicationforwithdrawal.ApplicationForWithdrawalService;
-import cn.newfeifan.mall.module.distri.service.consumptionchangelog.ConsumptionChangeLogService;
+import cn.newfeifan.mall.module.distri.service.integralchangelog.IntegralChangeLogService;
 import cn.newfeifan.mall.module.distri.service.consumptionerroruser.ConsumptionErrorUserService;
-import cn.newfeifan.mall.module.distri.service.consumptiontopuplog.ConsumptionTopUpLogService;
-import cn.newfeifan.mall.module.distri.service.consumptiontransferlog.ConsumptionTransferLogService;
+import cn.newfeifan.mall.module.distri.service.integraltopuplog.IntegralTopUpLogService;
+import cn.newfeifan.mall.module.distri.service.integraltransferlog.IntegralTransferLogService;
 import cn.newfeifan.mall.module.distri.service.integral.IntegralService;
 import cn.newfeifan.mall.module.distri.service.usertopupconsumptionpointsorder.UserTopUpConsumptionPointsOrderService;
 import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
@@ -58,11 +58,11 @@ public class ConsumptionErrorLogServiceImpl implements ConsumptionErrorLogServic
     @Resource
     private ConsumptionErrorUserService consumptionErrorUserService;
     @Resource
-    private ConsumptionTopUpLogService consumptionTopUpLogService;
+    private IntegralTopUpLogService integralTopUpLogService;
     @Resource
-    private ConsumptionChangeLogService consumptionChangeLogService;
+    private IntegralChangeLogService integralChangeLogService;
     @Resource
-    private ConsumptionTransferLogService consumptionTransferLogService;
+    private IntegralTransferLogService integralTransferLogService;
     @Resource
     private ApplicationForWithdrawalService applicationForWithdrawalService;
     @Resource
@@ -125,30 +125,30 @@ public class ConsumptionErrorLogServiceImpl implements ConsumptionErrorLogServic
         List<IntegralDO> integralDOS = integralService.selectAllUser();
 
         // 每个用户的充值记录
-        Map<Long, Long> topUpLogMap = consumptionTopUpLogService.selectList().stream()
+        Map<Long, Long> topUpLogMap = integralTopUpLogService.selectList().stream()
                 .collect(Collectors.groupingBy(
-                        ConsumptionTopUpLogDO::getUserId, // 按userid分组
+                        IntegralTopUpLogDO::getUserId, // 按userid分组
                         Collectors.reducing(0L, // 初始化累加器
-                                ConsumptionTopUpLogDO::getPracticalConsumptionPoints, // 获取每个对象的consumptionPoints
+                                IntegralTopUpLogDO::getPracticalIntegralPoints, // 获取每个对象的consumptionPoints
                                 Long::sum // 累加函数
                         )
                 ));
 
         // 用户的佣金转消费分记录
-        Map<Long, Long> changLogMap = consumptionChangeLogService.selectListByStatus(ConsumptionEnum.COMMISSION_TRANSITION.getType()).stream()
-                .collect(Collectors.groupingBy(
-                        ConsumptionChangeLogDO::getUserId, // 按userid分组
-                        Collectors.reducing(0L, // 初始化累加器
-                                ConsumptionChangeLogDO::getConsumptionPoints, // 获取每个对象的consumptionPoints
-                                Long::sum // 累加函数
-                        )
-                ));
+//        Map<Long, Long> changLogMap = integralChangeLogService.selectListByStatus(IntegralEnum.COMMISSION_TRANSITION.getType()).stream()
+//                .collect(Collectors.groupingBy(
+//                        IntegralChangeLogDO::getUserId, // 按userid分组
+//                        Collectors.reducing(0L, // 初始化累加器
+//                                IntegralChangeLogDO::getIntegralPoints, // 获取每个对象的consumptionPoints
+//                                Long::sum // 累加函数
+//                        )
+//                ));
         // 用户的佣金转让记录(进账)
-        Map<Long, Long> recipientLogMap = consumptionTransferLogService.selectList().stream()
+        Map<Long, Long> recipientLogMap = integralTransferLogService.selectList().stream()
                 .collect(Collectors.groupingBy(
-                        ConsumptionTransferLogDO::getRecipientUserId, // 按userid分组
+                        IntegralTransferLogDO::getRecipientUserId, // 按userid分组
                         Collectors.reducing(0L, // 初始化累加器
-                                ConsumptionTransferLogDO::getRecipientPoints, // 获取每个对象的consumptionPoints
+                                IntegralTransferLogDO::getRecipientPoints, // 获取每个对象的consumptionPoints
                                 Long::sum // 累加函数
                         )
                 ));
@@ -181,7 +181,7 @@ public class ConsumptionErrorLogServiceImpl implements ConsumptionErrorLogServic
 
         // 遍历得到所有用户的应得消费分
         topUpLogMap.forEach((userId, topUpPoints) -> userTotalMap.merge(userId, topUpPoints, Long::sum));
-        changLogMap.forEach((userId, topUpPoints) -> userTotalMap.merge(userId, topUpPoints, Long::sum));
+//        changLogMap.forEach((userId, topUpPoints) -> userTotalMap.merge(userId, topUpPoints, Long::sum));
         recipientLogMap.forEach((userId, topUpPoints) -> userTotalMap.merge(userId, topUpPoints, Long::sum));
         withdrawalMap.forEach((userId, topUpPoints) -> userTotalMap.merge(userId, topUpPoints, Long::sum));
         topUpMap.forEach((userId, topUpPoints) -> userTotalMap.merge(userId, topUpPoints, Long::sum));
@@ -190,24 +190,24 @@ public class ConsumptionErrorLogServiceImpl implements ConsumptionErrorLogServic
         Map<Long, Long> currentMap = integralDOS.stream()
                 .collect(Collectors.toMap(
                         IntegralDO::getUserId,
-                        IntegralDO::getConsumptionPoints)
+                        IntegralDO::getRedCurrentQuota)
                 );
 
         // 用户已用(购买商品的)消费分
-        Map<Long, Long> uesdMap = consumptionChangeLogService.selectListByStatus(ConsumptionEnum.PAY_ORDER.getType()).stream()
+        Map<Long, Long> uesdMap = integralChangeLogService.selectListByStatus(IntegralEnum.PAY_ORDER.getType()).stream()
                 .collect(Collectors.groupingBy(
-                        ConsumptionChangeLogDO::getUserId, // 按userid分组
+                        IntegralChangeLogDO::getUserId, // 按userid分组
                         Collectors.reducing(0L, // 初始化累加器
-                                ConsumptionChangeLogDO::getConsumptionPoints, // 获取每个对象的consumptionPoints
+                                IntegralChangeLogDO::getIntegralPoints, // 获取每个对象的consumptionPoints
                                 Long::sum // 累加函数
                         )
                 ));
         // 扣除退款退回的
-        Map<Long, Long> refundMap = consumptionChangeLogService.selectListByStatus(ConsumptionEnum.REFUND_ORDER.getType()).stream()
+        Map<Long, Long> refundMap = integralChangeLogService.selectListByStatus(IntegralEnum.REFUND_ORDER.getType()).stream()
                 .collect(Collectors.groupingBy(
-                        ConsumptionChangeLogDO::getUserId, // 按userid分组
+                        IntegralChangeLogDO::getUserId, // 按userid分组
                         Collectors.reducing(0L, // 初始化累加器
-                                ConsumptionChangeLogDO::getConsumptionPoints, // 获取每个对象的consumptionPoints
+                                IntegralChangeLogDO::getIntegralPoints, // 获取每个对象的consumptionPoints
                                 Long::sum // 累加函数
                         )
                 ));
@@ -215,20 +215,20 @@ public class ConsumptionErrorLogServiceImpl implements ConsumptionErrorLogServic
         refundMap.forEach((k, v) -> uesdMap.put(k,  uesdMap.get(k) - v));
 
         // 扣除手动取消退回的
-        Map<Long, Long> cancelMap = consumptionChangeLogService.selectListByStatus(ConsumptionEnum.CANCEL_ORDER_BACK_CONSUMPTION_POINTS.getType()).stream()
+        Map<Long, Long> cancelMap = integralChangeLogService.selectListByStatus(IntegralEnum.CANCEL_ORDER_BACK_CONSUMPTION_POINTS.getType()).stream()
                 .collect(Collectors.groupingBy(
-                        ConsumptionChangeLogDO::getUserId, // 按userid分组
+                        IntegralChangeLogDO::getUserId, // 按userid分组
                         Collectors.reducing(0L, // 初始化累加器
-                                ConsumptionChangeLogDO::getConsumptionPoints, // 获取每个对象的consumptionPoints
+                                IntegralChangeLogDO::getIntegralPoints, // 获取每个对象的consumptionPoints
                                 Long::sum // 累加函数
                         )
                 ));
         // 扣除支付超时退回的
-        Map<Long, Long> orderOverTimeMap = consumptionChangeLogService.selectListByStatus(ConsumptionEnum.ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL.getType()).stream()
+        Map<Long, Long> orderOverTimeMap = integralChangeLogService.selectListByStatus(IntegralEnum.ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL.getType()).stream()
                 .collect(Collectors.groupingBy(
-                        ConsumptionChangeLogDO::getUserId, // 按userid分组
+                        IntegralChangeLogDO::getUserId, // 按userid分组
                         Collectors.reducing(0L, // 初始化累加器
-                                ConsumptionChangeLogDO::getConsumptionPoints, // 获取每个对象的consumptionPoints
+                                IntegralChangeLogDO::getIntegralPoints, // 获取每个对象的consumptionPoints
                                 Long::sum // 累加函数
                         )
                 ));
@@ -236,11 +236,11 @@ public class ConsumptionErrorLogServiceImpl implements ConsumptionErrorLogServic
         orderOverTimeMap.forEach((k, v) -> uesdMap.put(k,  uesdMap.get(k) - v));
 
         // 用户转让的消费分(出账)
-        Map<Long, Long> transferLogMap = consumptionTransferLogService.selectList().stream()
+        Map<Long, Long> transferLogMap = integralTransferLogService.selectList().stream()
                 .collect(Collectors.groupingBy(
-                        ConsumptionTransferLogDO::getTransferUserId, // 按userid分组
+                        IntegralTransferLogDO::getTransferUserId, // 按userid分组
                         Collectors.reducing(0L, // 初始化累加器
-                                ConsumptionTransferLogDO::getConsumptionPoints, // 获取每个对象的consumptionPoints
+                                IntegralTransferLogDO::getConsumptionPoints, // 获取每个对象的consumptionPoints
                                 Long::sum // 累加函数
                         )
                 ));

feifan-module-distri/feifan-module-distri-biz/src/main/resources/mapper/consumptiontopuplog/ConsumptionTopUpLogMapper.xml

@@ -10,20 +10,15 @@
      -->
 
     <select id="ptTopUpWithUserTopUpList"
-            resultType="cn.newfeifan.mall.module.distri.controller.admin.consumptiontopuplog.vo.TopUpRespVO">
+            resultType="cn.newfeifan.mall.module.distri.controller.admin.integraltopuplog.vo.TopUpRespVO">
         SELECT
             DATE(combined.date) AS date,
             SUM(combined.conut) AS consumptionPoints
         FROM (
             SELECT
             DATE(create_time) AS date,
-            sum(consumption_points) AS conut
-            FROM distri_consumption_top_up_log where deleted = 0 GROUP BY date(create_time)
-            UNION ALL
-            SELECT
-            DATE(create_time) AS create_time,
-            sum(top_up_consumption_points) AS conut
-            FROM distri_user_top_up_consumption_points_order where deleted = 0 and pay_status = 1 GROUP BY date(create_time)
+            sum(integral_points) AS conut
+            FROM distri_integral_top_up_log where deleted = 0 GROUP BY date(create_time)
             ) AS combined
         GROUP BY DATE(combined.date)
         HAVING SUM(combined.conut) > 0
@@ -32,16 +27,8 @@
     </select>
     <select id="getTotalConsumptionPoints" resultType="java.lang.Long">
         SELECT
-            SUM(consumption_points) total
+            SUM(integral_points) total
         FROM
-            (SELECT
-                 consumption_points
-             FROM
-                 distri_consumption_top_up_log where deleted = 0
-             UNION ALL
-             SELECT
-                 top_up_consumption_points AS consumption_points
-             FROM
-                 distri_user_top_up_consumption_points_order where deleted = 0 and pay_status = 1) AS combined;
+                 distri_integral_top_up_log where deleted = 0
     </select>
 </mapper>

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/item/AppTradeOrderItemRespVO.java

@@ -45,7 +45,7 @@ public class AppTradeOrderItemRespVO {
     private Integer price;
 
     @Schema(description = "应付金额（总），单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "50")
-    private Integer payPrice;
+    private Long payIntegral;
 
     // ========== 营销基本信息 ==========
 
@@ -59,7 +59,4 @@ public class AppTradeOrderItemRespVO {
     @Schema(description = "售后状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer afterSaleStatus;
 
-    @Schema(description = "高精度价格", example = "29564")
-    private BigDecimal highPrecisionPrice;
-
 }

feifan-module-mall/feifan-module-trade-biz/src/main/resources/mapper/order/BrokerageUserMapper.xml

@@ -13,7 +13,6 @@
         <result column="merchantId" property="merchantId"/>
         <result column="orderId" property="orderId"/>
         <result column="name" property="name"/>
-        <result column="nickName" property="nickName"/>
         <result column="count" property="count"/>
 
 
@@ -30,13 +29,10 @@
                tor.user_id as userId,
                ps.merchant_id as merchantId,
                ps.shop_id as shopId,
-               mu.`name` as name,
-               mu.nickname as nickname,
+               mu.`username` as name,
                toi.count as `count`,
                toi.id as orderItemId,
-               toi.increase_integral AS increaseIntegral,
-               toi.ancestor_increase_integral AS ancestorIncreaseIntegral,
-               toi.freeze_high_quota AS freezeHighQuota
+               toi.ancestor_increase_integral AS ancestorIncreaseIntegral
         from trade_order tor
                  LEFT JOIN member_user mu
                            ON tor.user_id = mu.id
@@ -65,11 +61,9 @@
                tor.user_id as userId,
                ps.merchant_id as merchantId,
                ps.shop_id as shopId,
-               mu.`name` as name,
-               mu.nickname as nickname,
+               mu.`username` as name,
                toi.count as `count`,
                toi.id as orderItemId,
-               toi.increase_integral AS increaseIntegral,
                toi.ancestor_increase_integral AS ancestorIncreaseIntegral
         from trade_order tor
                  LEFT JOIN member_user mu
@@ -89,7 +83,7 @@
             resultType="cn.newfeifan.mall.module.trade.service.order.TradeOrderCountWithMoney">
         SELECT
             DATE(o.create_time) `date`,
-            SUM(o.pay_rmb) + (SUM(o.pay_integral) / 10000) + (SUM(o.pay_consumption_points) / 10000) money,
+            SUM(o.pay_integral) / 10000 money,
             count(*) count
         FROM
             trade_order o

feifan-server/src/main/resources/application-local.yaml

@@ -1,5 +1,5 @@
 server:
-  port: 8002
+  port: 8012
 
 --- #################### 数据库相关配置 ####################
 
@@ -47,12 +47,12 @@ spring:
       primary: master
       datasource:
         master:
-          name: mall-feifan
+          name: new-feifan
           url: jdbc:mysql://10.0.5.229:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           username: wendao9t
           password: PA55W0RD
         slave: # 模拟从库，可根据自己需要修改
-          name: mall-feifan
+          name: new-feifan
           lazy: true # 开启懒加载，保证启动速度
           url: jdbc:mysql://10.0.5.229:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           username: wendao9t

feifan-server/src/main/resources/application-prod.yaml

@@ -1,5 +1,5 @@
 server:
-  port: 8002
+  port: 8012
 
 --- #################### 数据库相关配置 ####################
 
@@ -47,12 +47,12 @@ spring:
       primary: master
       datasource:
         master:
-          name: mall-letcgo
+          name: new-letcgo
           url: jdbc:mysql://120.78.5.233:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           username: root
           password: PA55W0RD
         slave: # 模拟从库，可根据自己需要修改
-          name: mall-letcgo
+          name: new-letcgo
           lazy: true # 开启懒加载，保证启动速度
           url: jdbc:mysql://120.78.5.233:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           username: root