优化店铺结算单、店铺流水生成规则。

优化分销申请逻辑，分销佣金不转入预存款

consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java

@@ -27,7 +27,7 @@ import org.springframework.stereotype.Service;
  */
 @Slf4j
 @Service
-public class DistributionOrderExecute implements OrderStatusChangeEvent, EveryDayExecute, AfterSaleStatusChangeEvent {
+public class DistributionOrderExecute implements OrderStatusChangeEvent, AfterSaleStatusChangeEvent {
 
     /**
      * 分销订单
@@ -35,10 +35,6 @@ public class DistributionOrderExecute implements OrderStatusChangeEvent, EveryDa
     @Autowired
     private DistributionOrderService distributionOrderService;
 
-    @Autowired
-    private SettingService settingService;
-
-
     @Override
     public void orderChange(OrderMessage orderMessage) {
 
@@ -62,21 +58,6 @@ public class DistributionOrderExecute implements OrderStatusChangeEvent, EveryDa
         }
     }
 
-    @Override
-    public void execute() {
-        log.info("分销订单定时开始执行");
-        //设置结算天数(解冻日期)
-        Setting setting = settingService.get(SettingEnum.DISTRIBUTION_SETTING.name());
-        DistributionSetting distributionSetting = JSONUtil.toBean(setting.getSettingValue(), DistributionSetting.class);
-        //解冻时间
-        DateTime dateTime = new DateTime();
-        //当前时间-结算天数=最终结算时间
-        dateTime = dateTime.offsetNew(DateField.DAY_OF_MONTH, -distributionSetting.getCashDay());
-        //分销人员订单结算
-        distributionOrderService.updateRebate(dateTime, DistributionOrderStatusEnum.WAIT_BILL.name());
-
-    }
-
     @Override
     public void afterSaleStatusChange(AfterSale afterSale) {
         if (afterSale.getServiceStatus().equals(AfterSaleStatusEnum.COMPLETE.name())) {

consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java

@@ -8,6 +8,7 @@ import cn.lili.modules.order.order.entity.dto.OrderMessage;
 import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
 import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
 import cn.lili.modules.order.order.service.OrderService;
+import cn.lili.modules.order.order.service.StoreFlowService;
 import cn.lili.modules.payment.entity.RefundLog;
 import cn.lili.modules.payment.kit.Payment;
 import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
@@ -30,6 +31,8 @@ public class PaymentExecute implements OrderStatusChangeEvent {
      */
     @Autowired
     private OrderService orderService;
+    @Autowired
+    private StoreFlowService storeFlowService;
 
     @Override
     public void orderChange(OrderMessage orderMessage) {
@@ -60,6 +63,8 @@ public class PaymentExecute implements OrderStatusChangeEvent {
                     .refundReason("订单取消")
                     .build();
             payment.refund(refundLog);
+
+
         }
     }
 }

consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java

@@ -1,60 +0,0 @@
-package cn.lili.timetask.handler.impl.bill;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.lili.modules.store.entity.dto.StoreSettlementDay;
-import cn.lili.modules.store.service.BillService;
-import cn.lili.modules.store.service.StoreDetailService;
-import cn.lili.timetask.handler.EveryDayExecute;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 店铺结算执行
- *
- * @author Bulbasaur
- * @since 2021/2/18 3:45 下午
- */
-@Component
-public class BillExecute implements EveryDayExecute {
-
-    /**
-     * 结算单
-     */
-    @Autowired
-    private BillService billService;
-    /**
-     * 店铺详情
-     */
-    @Autowired
-    private StoreDetailService storeDetailService;
-
-    /**
-     * 1.查询今日待结算的商家
-     * 2.查询商家上次结算日期，生成本次结算单
-     * 3.记录商家结算日
-     */
-    @Override
-    public void execute() {
-
-        //获取当前天数
-        int day = DateUtil.date().dayOfMonth();
-
-        //获取待结算商家列表
-        List<StoreSettlementDay> storeList = storeDetailService.getSettlementStore(day);
-
-        //获取当前时间
-        DateTime endTime = DateUtil.date();
-        //批量商家结算
-        for (StoreSettlementDay storeSettlementDay : storeList) {
-
-            //生成结算单
-            billService.createBill(storeSettlementDay.getStoreId(), storeSettlementDay.getSettlementDay(), endTime);
-
-            //修改店铺结算时间
-            storeDetailService.updateSettlementDay(storeSettlementDay.getStoreId(), endTime);
-        }
-    }
-}

consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java

@@ -18,6 +18,10 @@ import cn.lili.modules.order.order.entity.enums.OrderItemAfterSaleStatusEnum;
 import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
 import cn.lili.modules.order.order.service.OrderItemService;
 import cn.lili.modules.order.order.service.OrderService;
+import cn.lili.modules.order.order.service.StoreFlowService;
+import cn.lili.modules.store.entity.dto.StoreSettlementDay;
+import cn.lili.modules.store.service.BillService;
+import cn.lili.modules.store.service.StoreDetailService;
 import cn.lili.modules.system.entity.dos.Setting;
 import cn.lili.modules.system.entity.dto.OrderSetting;
 import cn.lili.modules.system.entity.enums.SettingEnum;
@@ -29,6 +33,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -65,6 +70,20 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute {
     @Autowired
     private DistributionOrderService distributionOrderService;
 
+    @Autowired
+    private StoreFlowService storeFlowService;
+
+    /**
+     * 结算单
+     */
+    @Autowired
+    private BillService billService;
+    /**
+     * 店铺详情
+     */
+    @Autowired
+    private StoreDetailService storeDetailService;
+
     /**
      * 执行每日任务
      */
@@ -102,6 +121,22 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute {
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
+
+        //修改分账状态
+        try {
+            storeFlowService.updateProfitSharingStatus();
+        } catch (Exception e) {
+            log.error("修改分账状态失败", e);
+        }
+
+        //生成店铺结算单
+        try {
+            createBill();
+        } catch (Exception e) {
+            log.error("生成店铺结算单", e);
+        }
+
+
     }
 
     /**
@@ -186,8 +221,6 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute {
 //        List<OrderItem> orderItems = orderItemService.waitOperationOrderItem(build);
         //关闭售后订单=未售后订单+小于订单关闭售后申请时间
         orderItemService.expiredAfterSaleStatus(receiveTime);
-        //修改对应分销订单状态
-        distributionOrderService.updateDistributionOrderStatus();
 
     }
 
@@ -225,4 +258,29 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute {
 
     }
 
+    /**
+     * 1.查询今日待结算的商家
+     * 2.查询商家上次结算日期，生成本次结算单
+     * 3.记录商家结算日
+     */
+    private void createBill() {
+        //获取当前天数
+        int day = DateUtil.date().dayOfMonth();
+
+        //获取待结算商家列表
+        List<StoreSettlementDay> storeList = storeDetailService.getSettlementStore(day);
+
+        //获取当前时间
+        DateTime endTime = DateUtil.date();
+        //批量商家结算
+        for (StoreSettlementDay storeSettlementDay : storeList) {
+
+            //生成结算单
+            billService.createBill(storeSettlementDay.getStoreId(), storeSettlementDay.getSettlementDay(), endTime);
+
+            //修改店铺结算时间
+            storeDetailService.updateSettlementDay(storeSettlementDay.getStoreId(), endTime);
+        }
+    }
+
 }