修改计算的方式

feifan-module-distri/feifan-module-distri-biz/pom.xml

@@ -56,11 +56,6 @@
             <version>${revision}</version>
         </dependency>
 
-        <dependency>
-            <groupId>cn.newfeifan.zx</groupId>
-            <artifactId>feifan-module-trade-biz</artifactId>
-            <version>${revision}</version>
-        </dependency>
 
         <!-- 业务组件 -->
         <dependency>

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

@@ -1,8 +1,8 @@
 package cn.newfeifan.mall.module.distri.mq.consumer.order;
 
-import cn.newfeifan.mall.framework.common.mq.message.order.DistriOrderMessage;
+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.service.ordercalc.OrderCalcService;
-import cn.newfeifan.mall.module.system.mq.message.login.LoginSendMessage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
@@ -21,10 +21,10 @@ public class OrderConsumer {
 
     @EventListener
     @Async // Spring Event 默认在 Producer 发送的线程，通过 @Async 实现异步
-    public void onMessage(List<DistriOrderMessage> tradeOrderDO) {
-        log.info("[onMessage][消息内容({})]", tradeOrderDO);
+    public void onMessage(CalcMessage calcMessage) {
+        log.info("[onMessage][消息内容({})]", calcMessage);
         // todo 计算数据
-        orderCalcService.calc(tradeOrderDO);
+        orderCalcService.calc(calcMessage.getDistriOrderMessages());
 
     }
 

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

@@ -0,0 +1,15 @@
+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 CalcMessage {
+    List<DistriOrderMessage> distriOrderMessages;
+}

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

@@ -1,12 +1,10 @@
-package cn.newfeifan.mall.framework.common.mq.message.order;
+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

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

@@ -62,4 +62,11 @@ public interface IntegralService {
 
     void saveBatch(List<IntegralSaveReqVO> integralSaveReqVOS);
 
+    /**
+     * 批量修改以用户积分
+     * @param integralSaveReqVOS
+     */
+    void updateBatch(List<IntegralSaveReqVO> integralSaveReqVOS);
+
+
 }

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

@@ -87,4 +87,17 @@ public class IntegralServiceImpl implements IntegralService {
         integralMapper.insertBatch(integralDOS);
     }
 
+    @Override
+    public void updateBatch(List<IntegralSaveReqVO> integralSaveReqVOS) {
+
+        integralSaveReqVOS.forEach(k->{
+            // 校验存在
+            validateIntegralExists(k.getId());
+            // 更新
+            IntegralDO updateObj = BeanUtils.toBean(k, IntegralDO.class);
+            integralMapper.updateById(updateObj);
+        });
+
+    }
+
 }

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

@@ -3,11 +3,10 @@ package cn.newfeifan.mall.module.distri.service.ordercalc;
 import java.util.*;
 import javax.validation.*;
 
-import cn.newfeifan.mall.framework.common.mq.message.order.DistriOrderMessage;
 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.framework.common.pojo.PageParam;
+import cn.newfeifan.mall.module.distri.mq.message.order.DistriOrderMessage;
 
 /**
  * 订单产生数据计算 Service 接口

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

@@ -1,17 +1,16 @@
 package cn.newfeifan.mall.module.distri.service.ordercalc;
 
-import cn.newfeifan.mall.framework.common.mq.message.order.DistriOrderMessage;
 import cn.newfeifan.mall.framework.common.util.json.JsonUtils;
 import cn.newfeifan.mall.module.distri.controller.admin.duser.vo.DuserSaveReqVO;
 import cn.newfeifan.mall.module.distri.controller.admin.integral.vo.IntegralSaveReqVO;
 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.controller.admin.sharepath.vo.SharePathSaveReqVO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
 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.CaclEnum;
+import cn.newfeifan.mall.module.distri.mq.message.order.DistriOrderMessage;
 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;
@@ -22,6 +21,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.*;
@@ -113,6 +113,7 @@ public class OrderCalcServiceImpl implements OrderCalcService {
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void calc(List<DistriOrderMessage> tradeOrderDO) {
 
         // 获取到当前订单的所有人
@@ -151,7 +152,7 @@ public class OrderCalcServiceImpl implements OrderCalcService {
             SharePathDO sharePath = getSharePath(k.getUserId());
             // 如果sharePath为空, 则说明没有直推人关系
             IntegralDO integralDOAncestor = integralService.selectByUser(sharePath.getAncestor());
-            IntegralDO integralDO =  integralService.selectByUser(sharePath.getDescendant());
+            IntegralDO integralDO = integralService.selectByUser(sharePath.getDescendant());
 
             // 计算利润: (价格 - 成本价格) * 产品数量
             Integer profit = (k.getPrice() - k.getCostPrice()) * k.getProductCount();
@@ -262,7 +263,7 @@ public class OrderCalcServiceImpl implements OrderCalcService {
         orderCalcMapper.insertBatch(BeanUtils.toBean(saveList, OrderCalcDO.class));
         ptProfitService.saveBatch(ptProfitSaveReqVOS);
         ptProfitLogService.saveBatch(ptProfitLogSaveReqVOS);
-        integralService.saveBatch(integralSaveReqVOS);
+        integralService.updateBatch(integralSaveReqVOS);
     }
 
     private static void addCaclDo(String percentTemplate, List<OrderCalcSaveReqVO> saveList, DistriOrderMessage k, Integer grossProfit, Integer ancestorQuota, Integer descendantQuota, Integer bonusQuota, Integer platformQuota) {

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/orderpercentage/handle/OrderPercentCheckHandler.java

@@ -1,14 +0,0 @@
-package cn.newfeifan.mall.module.distri.service.orderpercentage.handle;
-
-import org.springframework.stereotype.Component;
-
-/**
- * 订单百分比校验
- *
- * @author HUIHUI
- */
-@Component
-public class OrderPercentCheckHandler  implements OrderPercentHandler{
-
-
-}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/orderpercentage/handle/OrderPercentHandler.java

@@ -1,24 +0,0 @@
-package cn.newfeifan.mall.module.distri.service.orderpercentage.handle;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
-import cn.newfeifan.mall.module.promotion.api.bargain.BargainActivityApi;
-import cn.newfeifan.mall.module.promotion.api.bargain.BargainRecordApi;
-import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderDO;
-import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderItemDO;
-import cn.newfeifan.mall.module.trade.enums.order.TradeOrderTypeEnum;
-import cn.newfeifan.mall.module.trade.service.order.handler.TradeOrderHandler;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 订单百分比
- *
- * @author HUIHUI
- */
-public interface OrderPercentHandler {
-
-
-}

feifan-module-mall/feifan-module-trade-biz/pom.xml

@@ -63,6 +63,10 @@
             <groupId>cn.newfeifan.zx</groupId>
             <artifactId>feifan-spring-boot-starter-biz-ip</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.newfeifan.zx</groupId>
+            <artifactId>feifan-spring-boot-starter-mq</artifactId>
+        </dependency>
 
         <!-- Web 相关 -->
         <dependency>
@@ -113,6 +117,12 @@
             <artifactId>feifan-module-system-biz</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>cn.newfeifan.zx</groupId>
+            <artifactId>feifan-module-distri-biz</artifactId>
+            <version>2.0.0-jdk8-snapshot</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderController.java

@@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.newfeifan.mall.framework.common.pojo.CommonResult;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
+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.member.api.user.MemberUserApi;
 import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
 import cn.newfeifan.mall.module.pay.controller.admin.order.vo.PayOrderPageItemRespVO;
@@ -20,9 +22,8 @@ import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderDO;
 import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderItemDO;
 import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderLogDO;
 import cn.newfeifan.mall.module.trade.enums.order.TradeOrderStatusEnum;
-import cn.newfeifan.mall.module.trade.framework.order.config.TradeOrderProperties;
+import cn.newfeifan.mall.module.trade.mq.producer.order.DistriOrderProducer;
 import cn.newfeifan.mall.module.trade.service.aftersale.AfterSaleService;
-import cn.newfeifan.mall.module.trade.service.delivery.DeliveryExpressService;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderLogService;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderQueryService;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderUpdateService;
@@ -61,7 +62,8 @@ public class TradeOrderController {
     @Resource
     private AfterSaleService afterSaleService;
 
-
+    @Resource
+    private DistriOrderProducer distriOrderProducer;
     @Resource
     private PayOrderService orderService;
     @Resource
@@ -213,6 +215,15 @@ public class TradeOrderController {
         return success(orderCount);
     }
 
+    @GetMapping("/startCalc")
+    @Operation(summary = "计算启动")
+    public CommonResult<String> startCalc() {
+        List<DistriOrderMessage> appTradeOrderDetailRespVos = tradeOrderQueryService.queryAllOrder();
+        CalcMessage calcMessage = CalcMessage.builder().distriOrderMessages(appTradeOrderDetailRespVos).build();
+        distriOrderProducer.sendDistriOrderMessage(calcMessage);
+        return success("success");
+    }
+
 
     @GetMapping("/pay/page")
     @Operation(summary = "获得支付订单分页")

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/mysql/order/TradeOrderMapper.java

@@ -1,10 +1,10 @@
 package cn.newfeifan.mall.module.trade.dal.mysql.order;
 
-import cn.newfeifan.mall.framework.common.mq.message.order.DistriOrderMessage;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.framework.mybatis.core.mapper.BaseMapperX;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.framework.mybatis.core.query.MPJLambdaWrapperX;
+import cn.newfeifan.mall.module.distri.mq.message.order.DistriOrderMessage;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderPageReqVO;
 import cn.newfeifan.mall.module.trade.controller.app.order.vo.AppTradeOrderPageReqVO;
 import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderDO;
@@ -148,6 +148,6 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
                 .eqIfPresent(TradeOrderDO::getMerchantId, key))));
     }
 
-    List<DistriOrderMessage> queryAllOrder(@Param("start") LocalDateTime start,@Param("end") LocalDateTime end);
+    List<DistriOrderMessage> queryAllOrder(@Param("start") LocalDateTime start, @Param("end") LocalDateTime end);
 
 }

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

@@ -1,16 +1,14 @@
 package cn.newfeifan.mall.module.trade.job.order;
 
-import cn.newfeifan.mall.framework.common.mq.message.order.DistriOrderMessage;
 import cn.newfeifan.mall.framework.quartz.core.handler.JobHandler;
 import cn.newfeifan.mall.framework.tenant.core.job.TenantJob;
-import cn.newfeifan.mall.module.trade.controller.app.order.vo.AppTradeOrderDetailRespVO;
+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.trade.mq.producer.order.DistriOrderProducer;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderQueryService;
-import cn.newfeifan.mall.module.trade.service.order.TradeOrderUpdateService;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -31,7 +29,8 @@ public class TradeOrderAutoCalcJob implements JobHandler {
     @TenantJob
     public String execute(String param) {
         List<DistriOrderMessage> appTradeOrderDetailRespVos = tradeOrderQueryService.queryAllOrder();
-        distriOrderProducer.sendDistriOrderMessage(appTradeOrderDetailRespVos);
+        CalcMessage calcMessage = CalcMessage.builder().distriOrderMessages(appTradeOrderDetailRespVos).build();
+        distriOrderProducer.sendDistriOrderMessage(calcMessage);
         return String.format("执行成功");
     }
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/mq/producer/order/DistriOrderProducer.java

@@ -1,15 +1,13 @@
 package cn.newfeifan.mall.module.trade.mq.producer.order;
 
-import cn.newfeifan.mall.framework.common.mq.message.order.DistriOrderMessage;
+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.system.mq.message.mail.MailSendMessage;
-import cn.newfeifan.mall.module.trade.controller.app.order.vo.AppTradeOrderDetailRespVO;
-import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderDO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -24,8 +22,8 @@ public class DistriOrderProducer {
      *
      * @param tradeOrderDO 当前订单信息
      */
-    public void sendDistriOrderMessage(List<DistriOrderMessage> tradeOrderDO) {
-        applicationContext.publishEvent(tradeOrderDO);
+    public void sendDistriOrderMessage(CalcMessage calcMessage) {
+        applicationContext.publishEvent(calcMessage);
     }
 
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderQueryService.java

@@ -1,7 +1,7 @@
 package cn.newfeifan.mall.module.trade.service.order;
 
-import cn.newfeifan.mall.framework.common.mq.message.order.DistriOrderMessage;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.module.distri.mq.message.order.DistriOrderMessage;
 import cn.newfeifan.mall.module.pay.controller.admin.order.vo.PayOrderPageItemRespVO;
 import cn.newfeifan.mall.module.trade.controller.admin.delivery.vo.expresstemplate.ShopBO;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderPageReqVO;
@@ -12,7 +12,6 @@ import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderDO;
 import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderItemDO;
 import cn.newfeifan.mall.module.trade.framework.delivery.core.client.dto.ExpressTrackRespDTO;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderQueryServiceImpl.java

@@ -5,8 +5,8 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import cn.newfeifan.mall.framework.common.mq.message.order.DistriOrderMessage;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.module.distri.mq.message.order.DistriOrderMessage;
 import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
 import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
 import cn.newfeifan.mall.module.pay.controller.admin.order.vo.PayOrderPageItemRespVO;
@@ -42,6 +42,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.*;
@@ -245,7 +246,21 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
         // 获取7天之前的订单
         LocalDateTime start = LocalDateTime.now().minusDays(1).minusDays(7).with(LocalTime.of(3, 0, 0));
         LocalDateTime end = LocalDateTime.now().minusDays(7).with(LocalTime.of(2, 59, 59));
-        return tradeOrderMapper.queryAllOrder(start, end);
+
+        // 23年 - 24年
+        // 获取当前日期
+        LocalDate now = LocalDate.now();
+
+        // 获取去年的第一天
+        LocalDate firstDayLastYear = LocalDate.of(now.getYear() - 1, 1, 1);
+        LocalDateTime firstDayLastYearStart = firstDayLastYear.atStartOfDay();
+
+        // 获取今年的最后一天
+        LocalDate lastDayThisYear = LocalDate.of(now.getYear(), 12, 31);
+        LocalDateTime lastDayThisYearEnd = lastDayThisYear.atTime(23, 59, 59);
+
+
+        return tradeOrderMapper.queryAllOrder(firstDayLastYearStart, lastDayThisYearEnd);
 
     }
 

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.newfeifan.mall.module.trade.dal.mysql.order.TradeOrderMapper">
 
-    <resultMap id="BaseResultMap" type="cn.newfeifan.mall.framework.common.mq.message.order.DistriOrderMessage">
+    <resultMap id="BaseResultMap" type="cn.newfeifan.mall.module.distri.mq.message.order.DistriOrderMessage">
         <id column="totalPrice" property="totalPrice"/>
         <result column="price" property="price"/>
         <result column="productCount" property="productCount"/>
@@ -21,6 +21,7 @@
                tor.product_count as productCount,
                tor.`no`          as `no`,
                tor.id            as orderId,
+               tor.user_id       as userId,
                ps.merchant_id    as merchantId,
                ps.shop_id        as shopId
         from trade_order tor