Merge remote-tracking branch 'origin/master'

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

@@ -1,5 +1,6 @@
 package cn.newfeifan.mall.module.distri.controller.admin.ptprofitdailystatisticslog.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -18,6 +19,7 @@ public class PtProfitDailyStatisticsLogRespVO {
 
     @Schema(description = "时间(每日)", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("时间(每日)")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate everyday;
 
     @Schema(description = "平台对碰支出", requiredMode = Schema.RequiredMode.REQUIRED)

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/sharepath/SharePathController.java

@@ -1,6 +1,7 @@
 package cn.newfeifan.mall.module.distri.controller.admin.sharepath;
 
 import cn.newfeifan.mall.module.distri.dal.dataobject.duser.DuserDO;
+import cn.newfeifan.mall.module.member.controller.admin.user.vo.MemberUserRespVO;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -87,6 +88,14 @@ public class SharePathController {
         return success(BeanUtils.toBean(sharePath, SharePathRespVO.class));
     }
 
+    @GetMapping("/getMemberUser")
+    @Operation(summary = "获得会员用户")
+    @Parameter(name = "id", description = "用户编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('member:user:query')")
+    public CommonResult<MemberUserRespVO> getUser(@RequestParam("id") Long userId) {
+        return success(sharePathService.getMemberUser(userId));
+    }
+
     @GetMapping("/getDescendants")
     @Operation(summary = "通过推荐人获得直推人")
     @PreAuthorize("@ss.hasPermission('distri:duser:query')")

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/mq/consumer/order/OrderConsumer.java

@@ -24,7 +24,7 @@ public class OrderConsumer {
     public void onMessage(CalcMessage calcMessage) {
         log.info("[onMessage][消息内容({})]", calcMessage);
         // todo 计算数据
-        orderCalcService.calc(calcMessage.getDistriOrderMessages());
+        orderCalcService.calc(calcMessage.getOrderCalcMessages());
 
     }
 

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

@@ -6,10 +6,14 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.List;
+
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class CalcMessage {
     List<DistriOrderMessage> distriOrderMessages;
+    List<OrderCalcMessage> orderCalcMessages;
+
+
 }

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

@@ -21,29 +21,31 @@ public class DistriOrderMessage {
      * 单价
      */
     private Long price;
-
     /**
      * 购买数量
      */
     private Integer productCount;
-
-    private String name;
-    private String nickName;
-
-
     /**
      * 成本价
      */
     private Long costPrice;
 
+    /**
+     * 用户名称
+     */
+    private String name;
 
+    /**
+     * 用户昵称
+     */
+    private String nickName;
     /**
      * 订单编号
      */
     private String no;
 
     /**
-     * 下单用户
+     * 下单用户Id
      */
     private Long userId;
 

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

@@ -0,0 +1,52 @@
+package cn.newfeifan.mall.module.distri.mq.message.order;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderCalcMessage {
+
+
+    List<OrderItemMessage> orderItemMessages;
+
+    /**
+     * 用户名称
+     */
+    private String name;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+    /**
+     * 订单编号
+     */
+    private String no;
+
+    /**
+     * 下单用户Id
+     */
+    private Long userId;
+
+    /**
+     * 店铺ID
+     */
+    private Long shopId;
+
+    /**
+     * 商户ID
+     */
+    private Long merchantId;
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+
+}

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

@@ -0,0 +1,36 @@
+package cn.newfeifan.mall.module.distri.mq.message.order;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderItemMessage {
+
+    /**
+     * 总价
+     */
+    private Long totalPrice;
+    /**
+     * 单价
+     */
+    private Long price;
+    /**
+     * 购买数量
+     */
+    private Integer productCount;
+    /**
+     * 成本价
+     */
+    private Long costPrice;
+
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+
+}

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

@@ -5,7 +5,6 @@ import javax.validation.*;
 import cn.newfeifan.mall.module.distri.controller.admin.integral.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
 
 /**
  * 推荐用户积分 Service 接口
@@ -80,5 +79,6 @@ public interface IntegralService {
 
     List<IntegralDO> selectAllUser();
 
+    IntegralDO getIntegralByUserId(Long userId);
 
 }

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

@@ -1,7 +1,6 @@
 package cn.newfeifan.mall.module.distri.service.integral;
 
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.newfeifan.mall.module.distri.dal.dataobject.ptprofitlog.PtProfitLogDO;
 import cn.newfeifan.mall.module.distri.service.sharepath.SharePathService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.stereotype.Service;
@@ -9,14 +8,12 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
 import cn.newfeifan.mall.module.distri.controller.admin.integral.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 
 import cn.newfeifan.mall.module.distri.dal.mysql.integral.IntegralMapper;
@@ -115,8 +112,15 @@ public class IntegralServiceImpl implements IntegralService {
     @Override
     public List<IntegralDO> selectAllUser() {
 
-        return    integralMapper.selectList();
+        return integralMapper.selectList();
 
     }
 
+    @Override
+    public IntegralDO getIntegralByUserId(Long userId) {
+        return integralMapper.selectOne(new LambdaQueryWrapper<IntegralDO>()
+                .eq(IntegralDO::getUserId, userId)
+        );
+    }
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ordercalc/OrderCalcService.java

@@ -8,6 +8,7 @@ import cn.newfeifan.mall.module.distri.controller.admin.ordercalc.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.ordercalc.OrderCalcDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.module.distri.mq.message.order.DistriOrderMessage;
+import cn.newfeifan.mall.module.distri.mq.message.order.OrderCalcMessage;
 
 /**
  * 订单产生数据计算 Service 接口
@@ -58,7 +59,7 @@ public interface OrderCalcService {
      * 计算订单信息
      * @param tradeOrderDO
      */
-    void calc(List<DistriOrderMessage> tradeOrderDO);
+    void calc(List<OrderCalcMessage> tradeOrderDO);
 
 
     List<OrderCalcDO> queryTodayCalcByUserIds(LocalDateTime todayStart, LocalDateTime todayEnd,List<Long> userList);

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ordercalc/OrderCalcServiceImpl.java

@@ -12,6 +12,8 @@ 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.CaclEnum;
 import cn.newfeifan.mall.module.distri.mq.message.order.DistriOrderMessage;
+import cn.newfeifan.mall.module.distri.mq.message.order.OrderCalcMessage;
+import cn.newfeifan.mall.module.distri.mq.message.order.OrderItemMessage;
 import cn.newfeifan.mall.module.distri.service.duser.DuserService;
 import cn.newfeifan.mall.module.distri.service.integral.IntegralService;
 import cn.newfeifan.mall.module.distri.service.orderpercentage.OrderPercentageService;
@@ -34,6 +36,8 @@ import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.LongStream;
 
 import cn.newfeifan.mall.module.distri.controller.admin.ordercalc.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.ordercalc.OrderCalcDO;
@@ -129,10 +133,10 @@ public class OrderCalcServiceImpl implements OrderCalcService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void calc(List<DistriOrderMessage> tradeOrderDO) {
+    public void calc(List<OrderCalcMessage> tradeOrderDO) {
 
         // 获取到当前订单的所有人
-        List<Long> userId = tradeOrderDO.stream().map(DistriOrderMessage::getUserId).collect(Collectors.toList());
+        List<Long> userId = tradeOrderDO.stream().map(OrderCalcMessage::getUserId).collect(Collectors.toList());
         // 判断当前下单的人员是否有进入营销模块用户表, 如果没有的话, 需要初始化
         duserService.hasUserAndCreat(userId);
         // 判断当前下单人是否有有上级, 如果没有, 创建直推人关系
@@ -159,7 +163,7 @@ public class OrderCalcServiceImpl implements OrderCalcService {
                 .in(OrderCalcDO::getUserId, userList));
     }
 
-    private void calc(List<DistriOrderMessage> tradeOrderDO, OrderPercentageDO orderPercentageDO, String percentTemplate) {
+    private void calc(List<OrderCalcMessage> tradeOrderDO, OrderPercentageDO orderPercentageDO, String percentTemplate) {
 
         List<PtProfitSaveReqVO> savePFitMap = new ArrayList<>();
         // 每个订单收益
@@ -186,9 +190,16 @@ public class OrderCalcServiceImpl implements OrderCalcService {
         PtProfitDO finalPtProfitDO = ptProfitDO;
         tradeOrderDO.forEach(k -> {
 
-            BigDecimal price = new BigDecimal(String.valueOf(k.getPrice()));
-            BigDecimal costPrice = new BigDecimal(String.valueOf(k.getCostPrice()));
-            BigDecimal productCount = new BigDecimal(String.valueOf(k.getProductCount()));
+            // 计算单个订单的总单价
+            LongStream priceStream = k.getOrderItemMessages().stream().mapToLong(OrderItemMessage::getPrice);
+            // 计算单个订单的总成本
+            LongStream longStream = k.getOrderItemMessages().stream().mapToLong(OrderItemMessage::getCostPrice);
+            // 计算当个订单的总数量
+            IntStream intStream = k.getOrderItemMessages().stream().mapToInt(OrderItemMessage::getProductCount);
+
+            BigDecimal price = new BigDecimal(String.valueOf(priceStream));
+            BigDecimal costPrice = new BigDecimal(String.valueOf(longStream));
+            BigDecimal productCount = new BigDecimal(String.valueOf(intStream));
 
             // 计算
             // 计算利润: (价格 - 成本价格) * 产品数量
@@ -242,9 +253,9 @@ public class OrderCalcServiceImpl implements OrderCalcService {
                     .userId(k.getUserId())
                     .orderNo(k.getNo())
                     .orderId(k.getOrderId())
-                    .cost(k.getCostPrice())
-                    .price(k.getPrice())
-                    .productCount(k.getProductCount())
+                    .cost(costPrice.longValue())
+                    .price(price.longValue())
+                    .productCount(productCount.intValue())
                     .nickName(k.getNickName())
                     .name(k.getName())
                     .grossProfit(grossProfitInt)
@@ -252,7 +263,8 @@ public class OrderCalcServiceImpl implements OrderCalcService {
                     .grossProfitAncestorQuota(ancestorQuotaInt)
                     .grossProfitPlatformQuota(platformQuotaInt)
                     .percentTemplate(percentTemplate).build();
-            saveList.add(orderCalcSaveReqVO);            // ========== 修改用户钱包 =================
+            saveList.add(orderCalcSaveReqVO);
+            // ========== 修改用户钱包 =================
             changeUserWallet(integralSaveReqVOS, integralDO, integralDOAncestor, ptIntegral, ancestorQuotaInt, descendantQuotaInt, highQuotaInt, grossProfitAfterBonusInt, platformQuotaInt);
             // ========== 修改平台信息 =================
             // 每个订单计算的过程

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharepath/SharePathService.java

@@ -8,6 +8,7 @@ import cn.newfeifan.mall.module.distri.dal.dataobject.duser.DuserDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.ordercalc.OrderCalcDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.sharepath.SharePathDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.module.member.controller.admin.user.vo.MemberUserRespVO;
 
 /**
  * 分销用户关系 Service 接口
@@ -102,4 +103,6 @@ public interface SharePathService {
     TreeNode getTree(Long userId,  Integer maxDepth);
 
     TreeNode getTreeByNameOrMobile(SharePathTreeReqVO sharePathTreeReqVO);
+
+    MemberUserRespVO getMemberUser(Long userId);
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharepath/SharePathServiceImpl.java

@@ -2,12 +2,17 @@ package cn.newfeifan.mall.module.distri.service.sharepath;
 
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.module.distri.dal.dataobject.duser.DuserDO;
+import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.ordercalc.OrderCalcDO;
 import cn.newfeifan.mall.module.distri.service.duser.DuserService;
+import cn.newfeifan.mall.module.distri.service.integral.IntegralService;
 import cn.newfeifan.mall.module.distri.service.ordercalc.OrderCalcService;
+import cn.newfeifan.mall.module.member.controller.admin.user.vo.MemberUserRespVO;
+import cn.newfeifan.mall.module.member.convert.user.MemberUserConvert;
 import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
 import cn.newfeifan.mall.module.member.service.user.MemberUserService;
 import com.alibaba.druid.util.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
@@ -20,7 +25,6 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import cn.newfeifan.mall.module.distri.controller.admin.sharepath.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.sharepath.SharePathDO;
@@ -53,6 +57,10 @@ public class SharePathServiceImpl implements SharePathService {
     @Resource
     private OrderCalcService orderCalcService;
 
+    @Resource
+    @Lazy
+    private IntegralService integralService;
+
     @Override
     public Long createSharePath(SharePathSaveReqVO createReqVO) {
         // 插入
@@ -203,6 +211,23 @@ public class SharePathServiceImpl implements SharePathService {
         return getTree(ancestor, sharePathTreeReqVO.getMaxDepth());
     }
 
+    @Override
+    public MemberUserRespVO getMemberUser(Long userId) {
+        MemberUserDO user = memberUserService.getUser(userId);
+        MemberUserRespVO memberUserRespVO = MemberUserConvert.INSTANCE.convert03(user);
+
+        SharePathDO sharePathDO = sharePathMapper.selectOne(new LambdaQueryWrapper<SharePathDO>()
+                .eq(SharePathDO::getDescendant, userId)
+                .eq(SharePathDO::getDepth, 1)
+        );
+        if(sharePathDO != null) memberUserRespVO.setAncNickName(sharePathDO.getAncName());
+
+        IntegralDO integral = integralService.getIntegralByUserId(userId);
+        if(integral != null) memberUserRespVO.setCurrentQuota(integral.getCurrentQuota());
+
+        return memberUserRespVO;
+    }
+
     private Long getUserIdByNameOrMobile(String name, String mobile) {
         if (!StringUtils.isEmpty(name)) {
             List<DuserDO> duserDOS = duserService.getDuserByName(name);

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/job/order/TradeOrderAutoCalcJob.java

@@ -4,12 +4,17 @@ import cn.newfeifan.mall.framework.quartz.core.handler.JobHandler;
 import cn.newfeifan.mall.framework.tenant.core.job.TenantJob;
 import cn.newfeifan.mall.module.distri.mq.message.order.CalcMessage;
 import cn.newfeifan.mall.module.distri.mq.message.order.DistriOrderMessage;
+import cn.newfeifan.mall.module.distri.mq.message.order.OrderCalcMessage;
+import cn.newfeifan.mall.module.distri.mq.message.order.OrderItemMessage;
 import cn.newfeifan.mall.module.trade.mq.producer.order.DistriOrderProducer;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderQueryService;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 交易订单自动计算 Job
@@ -29,7 +34,30 @@ public class TradeOrderAutoCalcJob implements JobHandler {
     @TenantJob
     public String execute(String param) {
         List<DistriOrderMessage> appTradeOrderDetailRespVos = tradeOrderQueryService.queryAllOrder();
-        CalcMessage calcMessage = CalcMessage.builder().distriOrderMessages(appTradeOrderDetailRespVos).build();
+
+        Map<Long, List<OrderItemMessage>> orderItemMessageGroupBy = appTradeOrderDetailRespVos.stream()
+                .map(k -> OrderItemMessage.builder().price(k.getPrice())
+                        .productCount(k.getProductCount())
+                        .costPrice(k.getCostPrice())
+                        .totalPrice(k.getTotalPrice()).build())
+                .collect(Collectors.groupingBy(OrderItemMessage::getOrderId));
+
+        List<OrderCalcMessage> orderCalcMessages = appTradeOrderDetailRespVos.stream().map(k -> {
+            OrderCalcMessage orderCalcMessage = OrderCalcMessage.builder()
+                    .orderId(k.getOrderId())
+                    .name(k.getName())
+                    .nickName(k.getNickName())
+                    .no(k.getNo())
+                    .merchantId(k.getMerchantId())
+                    .shopId(k.getShopId())
+                    .userId(k.getUserId()).build();
+            List<OrderItemMessage> orderItemMessages = orderItemMessageGroupBy.get(k.getOrderId());
+            orderCalcMessage.setOrderItemMessages(orderItemMessages);
+            return orderCalcMessage;
+        }).collect(Collectors.toList());
+
+
+        CalcMessage calcMessage = CalcMessage.builder().orderCalcMessages(orderCalcMessages).distriOrderMessages(appTradeOrderDetailRespVos).build();
         distriOrderProducer.sendDistriOrderMessage(calcMessage);
         return String.format("计算订单信息结束");
 

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

@@ -30,7 +30,7 @@
                ps.shop_id        as shopId,
                ps.shop_id        as shopId,
                mu.`name`         as name,
-               mu.nickname        as nickname
+               mu.nickname       as nickname
         from trade_order tor
                  LEFT JOIN member_user mu
                            ON tor.user_id = mu.id
@@ -38,7 +38,11 @@
                            on tor.id = toi.order_id
                  LEFT JOIN product_sku ps
                            on toi.sku_id = ps.id
-        where  tor.update_time BETWEEN #{start} AND #{end}
+        where toi.after_sale_status < 10
+           or toi.after_sale_status > 50
+            and tor.update_time BETWEEN #{start} AND #{end}
+
+
     </select>
     <select id="queryAllOrderByOrderIds"
             resultMap="BaseResultMap">

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/user/vo/MemberUserRespVO.java

@@ -88,4 +88,10 @@ public class MemberUserRespVO extends MemberUserBaseVO {
 
     @Schema(description = "累计消费金额（只算人民币，单位为分）")
     private Long cumulativeSpending;
+
+    @Schema(description = "推荐人名称")
+    private String ancNickName;
+
+    @Schema(description = "当前可用积分")
+    private Long currentQuota;
 }