首次提交

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/applicationforwithdrawal/ApplicationForWithdrawalController.java

@@ -82,17 +82,6 @@ public class ApplicationForWithdrawalController {
     public CommonResult<PageResult<ApplicationForWithdrawalRespVO>> getApplicationForWithdrawalPage(@Valid ApplicationForWithdrawalPageReqVO pageReqVO) {
         PageResult<ApplicationForWithdrawalDO> pageResult = applicationForWithdrawalService.getApplicationForWithdrawalPage(pageReqVO);
         PageResult<ApplicationForWithdrawalRespVO> bean = BeanUtils.toBean(pageResult, ApplicationForWithdrawalRespVO.class);
-
-        for (ApplicationForWithdrawalRespVO applicationForWithdrawalRespVO : bean.getList()) {
-            MemberUserDO user = memberUserService.getUser(applicationForWithdrawalRespVO.getUserId());
-
-            if(applicationForWithdrawalRespVO.getWithdrawalType().equals(WithdrawalChannelTypeEnum.ALIPAY.getType())){
-                applicationForWithdrawalRespVO.setAccountName(user.getAlipayName());
-            }else if(applicationForWithdrawalRespVO.getWithdrawalType().equals(WithdrawalChannelTypeEnum.BANK.getType())){
-                applicationForWithdrawalRespVO.setAccountName(user.getAccountName());
-            }
-        }
-
         return success(bean);
     }
 

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

@@ -19,6 +19,9 @@ public class DailyAwardRecordsPageReqVO extends PageParam {
     @Schema(description = "是否已结算，默认为未结算")
     private Boolean settled;
 
+    @Schema(description = "是否计算团队奖, 默认为未计算")
+    private Boolean calcLucky;
+
     @Schema(description = "日志Id", example = "16092")
     private Long logId;
 }

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

@@ -26,6 +26,9 @@ public class DailyAwardRecordsRespVO {
     @ExcelProperty("是否已结算，默认为未结算")
     private Boolean settled;
 
+    @Schema(description = "是否计算团队奖, 默认为未计算")
+    private Boolean calcLucky;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/dailybill/excelvo/DailyBillExcelRespVO.java

@@ -15,18 +15,6 @@ public class DailyBillExcelRespVO {
     @ExcelProperty("账单编号")
     private Long id;
 
-    @Schema(description = "金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "30486")
-    @ExcelProperty("金额")
-    private Double price;
-
-    @Schema(description = "确收金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "29815")
-    @ExcelProperty("确收金额")
-    private Double receivedPrice;
-
-    @Schema(description = "退款金额, 单位: 分", requiredMode = Schema.RequiredMode.REQUIRED, example = "11962")
-    @ExcelProperty("退款金额")
-    private Double refundPrice;
-
     @Schema(description = "积分", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("积分")
     private Double integral;
@@ -39,18 +27,6 @@ public class DailyBillExcelRespVO {
     @ExcelProperty("退款积分")
     private Double refundIntegral;
 
-    @Schema(description = "消费分", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("消费分")
-    private Double consumptionPoints;
-
-    @Schema(description = "确收消费分", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("确收消费分")
-    private Double receivedConsumptionPoints;
-
-    @Schema(description = "退款消费分", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("退款消费分")
-    private Double refundConsumptionPoints;
-
     @Schema(description = "订单数，默认为0", requiredMode = Schema.RequiredMode.REQUIRED, example = "27164")
     @ExcelProperty("订单数")
     private Long orderCount;

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

@@ -16,14 +16,6 @@ public class DailyBillRespVO {
     @ExcelProperty("账单编号")
     private Long id;
 
-    @Schema(description = "金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "30486")
-    @ExcelProperty("金额，单位：分")
-    private Long price;
-
-    @Schema(description = "确收金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "29815")
-    @ExcelProperty("确收金额，单位：分")
-    private Long receivedPrice;
-
     @Schema(description = "订单数，默认为0", requiredMode = Schema.RequiredMode.REQUIRED, example = "27164")
     @ExcelProperty("订单数，默认为0")
     private Long orderCount;
@@ -52,10 +44,6 @@ public class DailyBillRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "退款金额, 单位: 分", requiredMode = Schema.RequiredMode.REQUIRED, example = "11962")
-    @ExcelProperty("退款金额, 单位: 分")
-    private Long refundPrice;
-
     @Schema(description = "积分", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("积分")
     private Long integral;
@@ -76,18 +64,6 @@ public class DailyBillRespVO {
     @ExcelProperty("平台每日账单表id")
     private Long ptDailyBillId;
 
-    @Schema(description = "消费分", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("消费分")
-    private Long consumptionPoints;
-
-    @Schema(description = "确收消费分", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("确收消费分")
-    private Long receivedConsumptionPoints;
-
-    @Schema(description = "退款消费分", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("退款消费分")
-    private Long refundConsumptionPoints;
-
     public String getOrderCalcTime() {
         return orderCalcTime.toString();
     }

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

@@ -13,14 +13,6 @@ public class DailyBillSaveReqVO {
     @Schema(description = "账单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "27497")
     private Long id;
 
-    @Schema(description = "金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "30486")
-    @NotNull(message = "金额，单位：分不能为空")
-    private Long price;
-
-    @Schema(description = "确收金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "29815")
-    @NotNull(message = "确收金额，单位：分不能为空")
-    private Long receivedPrice;
-
     @Schema(description = "订单数，默认为0", requiredMode = Schema.RequiredMode.REQUIRED, example = "27164")
     @NotNull(message = "订单数，默认为0不能为空")
     private Long orderCount;
@@ -35,10 +27,6 @@ public class DailyBillSaveReqVO {
     @NotEmpty(message = "订单ID列表，文本类型不能为空")
     private String orderIds;
 
-    @Schema(description = "退款金额, 单位: 分", requiredMode = Schema.RequiredMode.REQUIRED, example = "11962")
-    @NotNull(message = "退款金额, 单位: 分不能为空")
-    private Long refundPrice;
-
     @Schema(description = "积分", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "积分不能为空")
     private Long integral;
@@ -59,16 +47,4 @@ public class DailyBillSaveReqVO {
     @NotNull(message = "平台每日账单表id不能为空")
     private Long ptDailyBillId;
 
-    @Schema(description = "消费分", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "消费分不能为空")
-    private Long consumptionPoints;
-
-    @Schema(description = "确收消费分", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "确收消费分不能为空")
-    private Long receivedConsumptionPoints;
-
-    @Schema(description = "退款消费分", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "退款消费分不能为空")
-    private Long refundConsumptionPoints;
-
 }

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

@@ -2,7 +2,9 @@ package cn.newfeifan.mall.module.distri.controller.admin.duser.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
 import java.time.LocalDateTime;
+
 import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 推荐用户 Response VO")
@@ -60,31 +62,36 @@ public class DuserRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "用户名称", example = "张三")
-    @ExcelProperty("用户名称")
-    private String nickName;
-
-    @Schema(description = "推荐人姓名", example = "张三")
-    private String ancNickName;
-
     @Schema(description = "直推人总数")
     private Long descendantCount;
 
-    @Schema(description = "后代总数")
-    private Long childrenCount;
+    @Schema(description = "左区总数")
+    private Long leftCount;
+
+    @Schema(description = "右区总数")
+    private Long rightCount;
 
     @Schema(description = "用户头像")
     private String avatar;
 
-    @Schema(description = "用户积分")
-    private Long integral;
+    @Schema(description = "当前红积分")
+    private Long redCurrentQuota;
+
+    @Schema(description = "当前黄积分")
+    private Long yellowCurrentQuota;
+
+    @Schema(description = "当前绿积分")
+    private Long greenCurrentQuota;
 
     @Schema(description = "用户名")
     private String username;
 
-    @Schema(description = "冻结积分")
-    private Long freezeIntegral;
-
     @Schema(description = "推荐人用户名")
     private String ancUsername;
+
+    @Schema(description = "左区用户id")
+    private Long leftChildId;
+
+    @Schema(description = "右区用户id")
+    private Long rightChildId;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/convert/dailybill/DailyBillConvert.java

@@ -16,15 +16,9 @@ public interface DailyBillConvert {
     default List<DailyBillExcelRespVO> convertList(List<DailyBillRespVO> list) {
         List<DailyBillExcelRespVO> respVOList = BeanUtils.toBean(list, DailyBillExcelRespVO.class);
         for (DailyBillExcelRespVO respVO : respVOList) {
-            respVO.setPrice(respVO.getPrice() / ONE_HUNDRED);
-            respVO.setReceivedPrice(respVO.getReceivedPrice() / ONE_HUNDRED);
-            respVO.setRefundPrice(respVO.getRefundPrice() / ONE_HUNDRED);
             respVO.setIntegral(respVO.getIntegral() / MILLION);
             respVO.setReceivedIntegral(respVO.getReceivedIntegral() / MILLION);
             respVO.setRefundIntegral(respVO.getRefundIntegral() / MILLION);
-            respVO.setConsumptionPoints(respVO.getConsumptionPoints() / MILLION);
-            respVO.setReceivedConsumptionPoints(respVO.getReceivedConsumptionPoints() / MILLION);
-            respVO.setRefundConsumptionPoints(respVO.getRefundConsumptionPoints() / MILLION);
         }
 
         return respVOList;

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/dailybill/DailyBillDO.java

@@ -26,14 +26,6 @@ public class DailyBillDO extends BaseDO {
      */
     @TableId
     private Long id;
-    /**
-     * 金额，单位：分
-     */
-    private Long price;
-    /**
-     * 确收金额，单位：分
-     */
-    private Long receivedPrice;
     /**
      * 订单数，默认为0
      */
@@ -50,10 +42,6 @@ public class DailyBillDO extends BaseDO {
      * 订单ID列表，文本类型
      */
     private String orderIds;
-    /**
-     * 退款金额, 单位: 分
-     */
-    private Long refundPrice;
     /**
      * 积分
      */
@@ -75,17 +63,4 @@ public class DailyBillDO extends BaseDO {
      */
     private Long ptDailyBillId;
 
-    /**
-     * 消费分
-     */
-    private Long consumptionPoints;
-    /**
-     * 确收消费分
-     */
-    private Long receivedConsumptionPoints;
-    /**
-     * 退款消费分
-     */
-    private Long refundConsumptionPoints;
-
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/duser/DuserDO.java

@@ -28,10 +28,6 @@ public class DuserDO extends BaseDO {
      * 团队人员ID
      */
     private Long userId;
-    /**
-     * 团队人员姓名
-     */
-    private String name;
     /**
      * 团队人员手机号码
      */
@@ -59,8 +55,8 @@ public class DuserDO extends BaseDO {
     /**
      * 用户类型
      */
-    private Long categoryId;
+    private Integer categoryId;
 
-    private String nickName;
+    private String userName;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/mq/message/order/DistriOrderMessage.java

@@ -41,10 +41,6 @@ public class DistriOrderMessage {
      */
     private String name;
 
-    /**
-     * 用户昵称
-     */
-    private String nickName;
     /**
      * 订单编号
      */
@@ -74,11 +70,6 @@ public class DistriOrderMessage {
      */
     private Long orderItemId;
 
-    /**
-     * 用户自得积分
-     */
-    private Long increaseIntegral;
-
     /**
      * 推荐用户获得积分
      */

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/applicationforwithdrawal/ApplicationForWithdrawalServiceImpl.java

@@ -103,12 +103,6 @@ public class ApplicationForWithdrawalServiceImpl implements ApplicationForWithdr
                     .mark("提现日期: " + formatter.format(withdrawalDO.getCreateTime()))
                     .build();
 
-            if(withdrawalDO.getWithdrawalType().equals(WithdrawalChannelTypeEnum.ALIPAY.getType())){
-                build.setName(user.getAlipayName());
-            }else if(withdrawalDO.getWithdrawalType().equals(WithdrawalChannelTypeEnum.BANK.getType())){
-                build.setName(user.getAccountName());
-            }
-
             list.add(build);
         }
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/dailyawardrecords/DailyAwardRecordsServiceImpl.java

@@ -1,12 +1,25 @@
 package cn.newfeifan.mall.module.distri.service.dailyawardrecords;
 
 import cn.newfeifan.mall.module.distri.controller.admin.integral.vo.IntegralSaveReqVO;
+import cn.newfeifan.mall.module.distri.controller.admin.integralchangelog.vo.IntegralChangeLogSaveReqVO;
+import cn.newfeifan.mall.module.distri.controller.admin.ptprofit.vo.PtProfitSaveReqVO;
 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.enums.CaclEnum;
+import cn.newfeifan.mall.module.distri.dal.dataobject.orderpercentage.OrderPercentageDO;
+import cn.newfeifan.mall.module.distri.dal.dataobject.ptprofit.PtProfitDO;
+import cn.newfeifan.mall.module.distri.dal.dataobject.sharepath.SharePathDO;
+import cn.newfeifan.mall.module.distri.enums.IntegralEnum;
+import cn.newfeifan.mall.module.distri.enums.IntegralTypeEnum;
+import cn.newfeifan.mall.module.distri.enums.ProfitTypeEnum;
 import cn.newfeifan.mall.module.distri.service.integral.IntegralService;
+import cn.newfeifan.mall.module.distri.service.integralchangelog.IntegralChangeLogService;
+import cn.newfeifan.mall.module.distri.service.orderpercentage.OrderPercentageService;
+import cn.newfeifan.mall.module.distri.service.ptprofit.PtProfitService;
 import cn.newfeifan.mall.module.distri.service.ptprofitlog.PtProfitLogService;
+import cn.newfeifan.mall.module.distri.service.sharepath.SharePathService;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -20,10 +33,12 @@ import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 
 import cn.newfeifan.mall.module.distri.dal.mysql.dailyawardrecords.DailyAwardRecordsMapper;
 
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.newfeifan.mall.module.distri.enums.ErrorCodeConstants.*;
+import static cn.newfeifan.mall.module.distri.enums.IntegralEnum.LUCKY_BONUS;
 
 /**
  * 每日用户获得合赢奖记录 Service 实现类
@@ -32,6 +47,7 @@ import static cn.newfeifan.mall.module.distri.enums.ErrorCodeConstants.*;
  */
 @Service
 @Validated
+@Slf4j
 public class DailyAwardRecordsServiceImpl implements DailyAwardRecordsService {
 
     @Resource
@@ -40,6 +56,16 @@ public class DailyAwardRecordsServiceImpl implements DailyAwardRecordsService {
     @Resource
     private IntegralService integralService;
 
+    @Resource
+    private IntegralChangeLogService integralChangeLogService;
+
+    @Resource
+    private OrderPercentageService orderPercentageService;
+
+    @Resource
+    private SharePathService sharePathService;
+    @Resource
+    private PtProfitService ptProfitService;
     @Resource
     private PtProfitLogService ptProfitLogService;
 
@@ -105,40 +131,179 @@ public class DailyAwardRecordsServiceImpl implements DailyAwardRecordsService {
         //获取到当前7天前未结算的记录
         LambdaQueryWrapper<DailyAwardRecordsDO> wrapper = new LambdaQueryWrapper<DailyAwardRecordsDO>()
                 .eq(DailyAwardRecordsDO::getSettled, false);
-                //时间条件暂时关闭,因为现在的计算程序改为即算即用.后续如若改回,打开注释即可
+        //时间条件暂时关闭,因为现在的计算程序改为即算即用.后续如若改回,打开注释即可
 //                .apply("date(create_time) <= DATE_SUB(now(), INTERVAL 7 DAY)");
 //                .apply("date(create_time) <= DATE_SUB('2024-06-21', INTERVAL 7 DAY)");
 
         List<DailyAwardRecordsDO> dailyAwardRecordsSaveReqVOS = dailyAwardRecordsMapper.selectList(wrapper);
 
+        OrderPercentageDO orderPercentageDO = orderPercentageService.queryStatus();
+        // 黄积分比例
+        Double bonusYellowIntegral = Double.valueOf(orderPercentageDO.getBonusYellowIntegral());
+        // 绿积分比例
+        Double bonusGreenIntegral = Double.valueOf(orderPercentageDO.getBonusGreenIntegral());
+
         dailyAwardRecordsSaveReqVOS.forEach(dailyAwardRecordsDO -> {
             //获取用户钱包
             IntegralDO integralDO = integralService.getIntegralByUserId(dailyAwardRecordsDO.getUserId());
             //减去待确权
             integralDO.setFreezeQuota(integralDO.getFreezeQuota() - dailyAwardRecordsDO.getAmount());
             //加入可用
-            integralDO.setCurrentQuota(integralDO.getCurrentQuota() + dailyAwardRecordsDO.getAmount());
-            integralService.updateIntegral(IntegralSaveReqVO.builder()
-                    .id(integralDO.getId())
-                    .freezeQuota(integralDO.getFreezeQuota())
-                    .currentQuota(integralDO.getCurrentQuota())
-                    .build());
-
-            PtProfitLogSaveReqVO winWinLog = PtProfitLogSaveReqVO.builder()
-                    .profitStatus(CaclEnum.SMALL_QUOTA_CRASH_SETTLE.getType())
-                    .userId(dailyAwardRecordsDO.getUserId())
-                    .amount(dailyAwardRecordsDO.getAmount())
-                    .afterAmount(integralDO.getCurrentQuota())
-                    .freezeAmount(-dailyAwardRecordsDO.getAmount())
-                    .afterFreezeAmount(integralDO.getFreezeQuota())
-                    .generateUserId(dailyAwardRecordsDO.getGenerateUserId())
+            long yellowIntegral = (long) (dailyAwardRecordsDO.getAmount() * bonusYellowIntegral);
+            integralDO.setYellowCurrentQuota(integralDO.getYellowCurrentQuota() + yellowIntegral);
+            long greenIntegral = (long) (dailyAwardRecordsDO.getAmount() * bonusGreenIntegral);
+            integralDO.setGreenCurrentQuota(integralDO.getGreenCurrentQuota() + greenIntegral);
+            integralService.updateIntegral(BeanUtils.toBean(integralDO, IntegralSaveReqVO.class));
+
+            IntegralChangeLogSaveReqVO yellowLog = IntegralChangeLogSaveReqVO.builder()
+                    .userId(integralDO.getUserId())
+                    .integralPoints(yellowIntegral)
+                    .practicalIntegralPoints(yellowIntegral)
+                    .afterIntegralPoints(integralDO.getYellowCurrentQuota())
+                    .maxAvailablePointsAmount(-dailyAwardRecordsDO.getAmount())
+                    .afterMaxAvailablePointsAmount(integralDO.getHighQuota())
                     .accumulatedQuotaAmount(dailyAwardRecordsDO.getAccumulatedQuotaAmount())
+                    .integralStatus(IntegralEnum.TEAM_BONUS.getType())
+                    .integralType(IntegralTypeEnum.YELLOW_INTEGRAL.getType())
+                    .build();
+
+            IntegralChangeLogSaveReqVO greenLog = IntegralChangeLogSaveReqVO.builder()
+                    .userId(integralDO.getUserId())
+                    .integralPoints(greenIntegral)
+                    .practicalIntegralPoints(greenIntegral)
+                    .afterIntegralPoints(integralDO.getGreenCurrentQuota())
+                    .integralStatus(IntegralEnum.TEAM_BONUS.getType())
+                    .integralType(IntegralTypeEnum.GREEN_INTEGRAL.getType())
                     .build();
-            ptProfitLogService.createPtProfitLog(winWinLog);
+            integralChangeLogService.saveBatch(Arrays.asList(yellowLog, greenLog));
 
             dailyAwardRecordsDO.setSettled(true);
             dailyAwardRecordsMapper.updateById(dailyAwardRecordsDO);
         });
     }
 
+    @Override
+    public void calcLucky() {
+        List<DailyAwardRecordsDO> VOS = dailyAwardRecordsMapper.selectList(new LambdaQueryWrapper<DailyAwardRecordsDO>()
+                .eq(DailyAwardRecordsDO::getCalcLucky, false));
+
+        OrderPercentageDO orderPercentageDO = orderPercentageService.queryStatus();
+        // 黄积分比例
+        Double bonusYellowIntegral = Double.valueOf(orderPercentageDO.getBonusYellowIntegral());
+        // 绿积分比例
+        Double bonusGreenIntegral = Double.valueOf(orderPercentageDO.getBonusGreenIntegral());
+        // 幸运奖比例
+        Double grossProfitLuckyQuotaPerc = Double.valueOf(orderPercentageDO.getGrossProfitLuckyQuotaPerc());
+
+        // 获取所有用户
+        List<SharePathDO> sharePathDOS = sharePathService.selectList();
+        // 获取平台钱包
+        PtProfitDO ptProfit = ptProfitService.getPtProfit();
+
+        List<IntegralChangeLogSaveReqVO> changeLogList = new ArrayList<>();
+        List<PtProfitLogSaveReqVO> ptProfitLogList = new ArrayList<>();
+        List<IntegralDO> integralList = new ArrayList<>();
+
+        for (SharePathDO user : sharePathDOS) {// 获取用户推荐了多少个用户
+            Integer peopleNumber = sharePathService.getReferrerNumber(user.getUserId());
+
+            // 没有推荐人数不计算
+            if (peopleNumber == 0) {
+                continue;
+            } else if (peopleNumber >= 20) {
+                peopleNumber = 20;
+            }
+
+            // 获取到当前用户的所有下层用户
+            List<Long> userIds = sharePathService.getUserIds(user.getUserId(), user.getDepth() + peopleNumber);
+
+            Long amount = 0L;
+            List<DailyAwardRecordsDO> DOS = VOS.stream()
+                    .filter(record -> userIds.contains(record.getUserId()))
+                    .collect(Collectors.toList());
+            if (DOS.isEmpty()) continue;     // 没有获得团队奖用户不计算
+
+            for (DailyAwardRecordsDO dailyAwardRecordsDO : DOS) {
+                amount += dailyAwardRecordsDO.getAmount();
+            }
+
+            if (amount == 0) continue;
+            // 幸运奖只获取到团队奖的5%(可调)
+            amount = (long) (amount * grossProfitLuckyQuotaPerc);
+            // 获取用户钱包
+            IntegralDO integral = integralService.getIntegral(user.getUserId());
+            // 用户峰值
+            Long highQuota = integral.getHighQuota();
+            // 超出幸运奖
+            Long exceedAmount = 0L;
+
+            if (highQuota < amount) {
+                exceedAmount = highQuota;
+                amount = highQuota;
+            }
+
+            Long yellowIntegral = (long) (amount * bonusYellowIntegral);
+            Long greenIntegral = (long) (amount * bonusGreenIntegral);
+
+            log.info("{}-用户获得了幸运奖{}层 :￥{}", integral.getUserName(), user.getDepth(),amount);
+
+            // 增加用户积分
+            integral.setHighQuota(integral.getHighQuota() - amount);
+            integral.setYellowCurrentQuota(integral.getYellowCurrentQuota() + yellowIntegral);
+            integral.setGreenCurrentQuota(integral.getGreenCurrentQuota() + greenIntegral);
+            integral.setLuckyQuota(integral.getLuckyQuota() + amount);
+
+            integralList.add(integral);
+
+            IntegralChangeLogSaveReqVO yellowLog = IntegralChangeLogSaveReqVO.builder()
+                    .userId(user.getUserId())
+                    .integralPoints(yellowIntegral)
+                    .practicalIntegralPoints(yellowIntegral)
+                    .afterIntegralPoints(integral.getYellowCurrentQuota())
+                    .maxAvailablePointsAmount(-amount)
+                    .afterMaxAvailablePointsAmount(integral.getHighQuota())
+                    .luckyQuotaAmount(exceedAmount)
+                    .integralStatus(LUCKY_BONUS.getType())
+                    .integralType(IntegralTypeEnum.YELLOW_INTEGRAL.getType())
+                    .build();
+
+            IntegralChangeLogSaveReqVO greenLog = IntegralChangeLogSaveReqVO.builder()
+                    .userId(user.getUserId())
+                    .integralPoints(greenIntegral)
+                    .practicalIntegralPoints(greenIntegral)
+                    .afterIntegralPoints(integral.getGreenCurrentQuota())
+                    .integralStatus(LUCKY_BONUS.getType())
+                    .integralType(IntegralTypeEnum.GREEN_INTEGRAL.getType())
+                    .build();
+            changeLogList.add(yellowLog);
+            changeLogList.add(greenLog);
+
+            // 扣减平台钱包
+            ptProfit.setPtGrossAdd(ptProfit.getPtGrossAdd() - amount);
+            ptProfit.setPtTotalAdd(ptProfit.getPtTotalAdd() - amount);
+
+            PtProfitLogSaveReqVO log = PtProfitLogSaveReqVO.builder()
+                    .generateUserId(user.getUserId())
+                    .amount(-amount)
+                    .afterAmount(ptProfit.getPtGrossAdd())
+                    .percentTemplate(JSON.toJSONString(orderPercentageDO))
+                    .profitType(ProfitTypeEnum.PT_PROFIT.getType())
+                    .profitStatus(LUCKY_BONUS.getType())
+                    .build();
+            ptProfitLogList.add(log);
+        }
+        // 修改pt钱包
+        ptProfitService.updatePtProfit(BeanUtils.toBean(ptProfit, PtProfitSaveReqVO.class));
+
+        integralService.updateBatch(BeanUtils.toBean(integralList, IntegralSaveReqVO.class));
+
+        // 记录日志
+        ptProfitLogService.saveBatch(ptProfitLogList);
+        integralChangeLogService.saveBatch(changeLogList);
+
+        // 将信息保存为已计算幸运奖
+        VOS.forEach(v -> v.setCalcLucky(true));
+        dailyAwardRecordsMapper.updateBatch(VOS);
+    }
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/resources/mapper/dailybill/DailyBillMapper.xml

@@ -28,8 +28,7 @@
     </select>
     <select id="getOrderDetails"
             resultType="cn.newfeifan.mall.module.distri.service.dailybill.dto.OrderDTO">
-        select o.id,o.no,o.product_count,o.delivery_price,o.pay_price,o.refund_status,o.refund_price,o.pay_integral,o.refund_integral,o.shop_id,o.merchant_id,
-               o.pay_rmb,o.create_time,o.pay_consumption_points,o.refund_consumption from trade_order o
+        select o.id,o.no,o.product_count,o.delivery_price,o.refund_status,o.pay_integral,o.refund_integral,o.shop_id,o.merchant_id,o.create_time from trade_order o
                join trade_order_item item on item.order_id = o.id
         where pay_status = 1 and date(o.create_time) &lt; date(now()) and item.computation_bill = 0
     </select>

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java

@@ -1,100 +0,0 @@
-package cn.newfeifan.mall.module.product.controller.app.spu.vo;
-
-import cn.newfeifan.mall.module.product.controller.app.property.vo.value.AppProductPropertyValueDetailRespVO;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.List;
-
-@Schema(description = "用户 App - 商品 SPU 明细 Response VO")
-@Data
-public class AppProductSpuDetailRespVO {
-
-    @Schema(description = "商品 SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Long id;
-
-    // ========== 基本信息 =========
-
-    @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "非繁")
-    private String name;
-
-    @Schema(description = "商品简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是一个快乐简介")
-    private String introduction;
-
-    @Schema(description = "商品详情", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是商品描述")
-    private String description;
-
-    @Schema(description = "商品分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Long categoryId;
-
-    @Schema(description = "商品封面图", requiredMode = Schema.RequiredMode.REQUIRED)
-    private String picUrl;
-
-    @Schema(description = "商品轮播图", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List<String> sliderPicUrls;
-
-    // ========== 营销相关字段 =========
-
-    // ========== SKU 相关字段 =========
-
-    @Schema(description = "规格类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
-    private Boolean specType;
-
-    @Schema(description = "商品价格，单位使用：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Integer price;
-
-    @Schema(description = "市场价，单位使用：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Integer marketPrice;
-
-    @Schema(description = "VIP 价格，单位使用：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "968") // 通过会员等级，计算出折扣后价格
-    private Integer vipPrice;
-
-    @Schema(description = "库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
-    private Integer stock;
-
-    /**
-     * SKU 数组
-     */
-    private List<Sku> skus;
-
-    // ========== 统计相关字段 =========
-
-    @Schema(description = "商品销量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Integer salesCount;
-
-    @Schema(description = "用户 App - 商品 SPU 明细的 SKU 信息")
-    @Data
-    public static class Sku {
-
-        @Schema(description = "商品 SKU 编号", example = "1")
-        private Long id;
-
-        /**
-         * 商品属性数组
-         */
-        private List<AppProductPropertyValueDetailRespVO> properties;
-
-        @Schema(description = "销售价格，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-        private Integer price;
-
-        @Schema(description = "市场价，单位使用：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-        private Integer marketPrice;
-
-        @Schema(description = "VIP 价格，单位使用：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "968") // 通过会员等级，计算出折扣后价格
-        private Integer vipPrice;
-
-        @Schema(description = "图片地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.zhongxing.cn/xx.png")
-        private String picUrl;
-
-        @Schema(description = "库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-        private Integer stock;
-
-        @Schema(description = "商品重量", example = "1") // 单位：kg 千克
-        private Double weight;
-
-        @Schema(description = "商品体积", example = "1024") // 单位：m^3 平米
-        private Double volume;
-
-    }
-
-}

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/app/spu/vo/AppProductSpuRespVO.java

@@ -1,54 +0,0 @@
-package cn.newfeifan.mall.module.product.controller.app.spu.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.List;
-
-@Schema(description = "用户 App - 商品 SPU Response VO")
-@Data
-public class AppProductSpuRespVO {
-
-    @Schema(description = "商品 SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Long id;
-
-    @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "非繁")
-    private String name;
-
-    @Schema(description = "商品简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "清凉小短袖简介")
-    private String introduction;
-
-    @Schema(description = "分类编号", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Long categoryId;
-
-    @Schema(description = "商品封面图", requiredMode = Schema.RequiredMode.REQUIRED)
-    private String picUrl;
-
-    @Schema(description = "商品轮播图", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List<String> sliderPicUrls;
-
-    // ========== SKU 相关字段 =========
-
-    @Schema(description = "规格类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
-    private Boolean specType;
-
-    @Schema(description = "商品价格，单位使用：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Integer price;
-
-    @Schema(description = "市场价，单位使用：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Integer marketPrice;
-
-    @Schema(description = "VIP 价格，单位使用：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "968") // 通过会员等级，计算出折扣后价格
-    private Integer vipPrice;
-
-    @Schema(description = "库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
-    private Integer stock;
-
-    // ========== 营销相关字段 =========
-
-    // ========== 统计相关字段 =========
-
-    @Schema(description = "商品销量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Integer salesCount;
-
-}

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

@@ -48,35 +48,18 @@ public class AppTradeOrderDetailRespVO {
     @Schema(description = "是否已支付", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
     private Boolean payStatus;
 
-    @Schema(description = "支付订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Long payOrderId;
-
     @Schema(description = "付款时间")
     private LocalDateTime payTime;
 
     @Schema(description = "付款超时时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime payExpireTime;
 
-    @Schema(description = "支付渠道", example = "wx_lite_pay")
-    private String payChannelCode;
-    @Schema(description = "支付渠道名", example = "微信小程序支付")
-    private String payChannelName;
-
     @Schema(description = "商品原价（总）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
     private Integer totalPrice;
 
-    @Schema(description = "订单优惠（总）", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
-    private Integer discountPrice;
-
     @Schema(description = "运费金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
     private Integer deliveryPrice;
 
-    @Schema(description = "订单调价（总）", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
-    private Integer adjustPrice;
-
-    @Schema(description = "应付金额（总）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
-    private Integer payPrice;
-
     // ========== 收件 + 物流基本信息 ==========
 
     @Schema(description = "配送方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@@ -112,31 +95,13 @@ public class AppTradeOrderDetailRespVO {
     @Schema(description = "收件人详细地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "中关村大街 1 号")
     private String receiverDetailAddress;
 
-    @Schema(description = "自提门店编号", example = "1088")
-    private Long pickUpStoreId;
-
-    @Schema(description = "自提核销码", example = "40964096")
-    private String pickUpVerifyCode;
-
     // ========== 售后基本信息 ==========
 
     @Schema(description = "售后状态", example = "0")
     private Integer refundStatus;
 
-    @Schema(description = "退款金额，单位：分", example = "100")
-    private Integer refundPrice;
-
     // ========== 营销基本信息 ==========
 
-    @Schema(description = "优惠劵编号", example = "1024")
-    private Long couponId;
-
-    @Schema(description = "优惠劵减免金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
-    private Integer couponPrice;
-
-    @Schema(description = "积分抵扣的金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
-    private Integer pointPrice;
-
     /**
      * 订单项数组
      */
@@ -147,6 +112,4 @@ public class AppTradeOrderDetailRespVO {
 
     @Schema(description = "支付积分", example = "10000")
     private Long payIntegral;
-    @Schema(description = "本订单使用消费分", example = "36")
-    private Long payConsumptionPoints;
 }