统计充值金额

cash-api/account-server/src/main/java/com/czg/controller/TestController.java

@@ -1,39 +0,0 @@
-package com.czg.controller;
-
-import com.czg.account.entity.ShopUser;
-import com.czg.account.service.ShopInfoService;
-import com.czg.account.service.ShopUserFlowService;
-import com.czg.account.service.ShopUserService;
-import com.czg.account.service.TestService;
-import jakarta.annotation.Resource;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author GYJoker
- */
-@RestController
-@RequestMapping("/notify/test")
-public class TestController {
-    @Resource
-    private ShopUserFlowService shopUserFlowService;
-    @Resource
-    private ShopInfoService shopInfoService;
-    @Resource
-    private ShopUserService shopUserService;
-    @Resource
-    private TestService testService;
-
-    @RequestMapping("/hello")
-    public String hello() {
-        shopUserFlowService.list().forEach(item -> {
-            ShopUser shopUserInfo = shopUserService.getShopUserInfo(item.getShopId(), item.getUserId());
-            if (shopUserInfo != null) {
-                item.setShopUserId(shopUserInfo.getId());
-                shopUserFlowService.updateById(item);
-            }
-        });
-//        return testService.insertData();
-        return "";
-    }
-}

cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java

@@ -13,6 +13,7 @@ import com.czg.market.vo.InviteUserVO;
 import com.czg.market.vo.MkDistributionConfigVO;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
+import com.czg.task.DistributionTask;
 import com.czg.utils.AssertUtil;
 import com.mybatisflex.core.paginate.Page;
 import jakarta.annotation.Resource;
@@ -37,6 +38,22 @@ public class UDistributionController {
     private MkDistributionWithdrawFlowService withdrawFlowService;
     @Resource
     private MkDistributionFlowService distributionFlowService;
+    @Resource
+    private DistributionTask distributionTask;
+
+    /**
+     * 分销员中心-获取配置
+     */
+    @GetMapping("/task")
+    public CzgResult<String> task(@RequestParam Long shopId) {
+        try {
+            distributionTask.deliver(shopId);
+        } catch (Exception e) {
+            return CzgResult.failure(e.getMessage());
+        }
+        return CzgResult.success("任务执行成功");
+    }
+
 
     /**
      * 分销员中心-获取配置

cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java

@@ -50,6 +50,8 @@ public class NotifyController {
     @Resource
     private MkShopConsumeDiscountRecordService consumeDiscountRecordService;
 
+
+    //新客立减清除数据 测试用
     @RequestMapping("clear")
     public String clear(@RequestParam Integer shopId) {
         consumeDiscountRecordService.remove(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getShopId, shopId));

cash-api/order-server/src/main/java/com/czg/controller/StatisticTaskController.java

@@ -21,7 +21,7 @@ public class StatisticTaskController {
     private StatisticTask statisticTask;
 
     /**
-     * 基础统计
+     * 基础统计 预留重置统计
      *
      * @param date 日期yyyy-MM-dd
      */

cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java

@@ -39,7 +39,7 @@ public class OTimeTask {
     @Resource
     private CashierCartService cartService;
     @Resource
-    private OrderPaymentService orderPaymentService;
+    private OrderPaymentService paymentService;
     @Resource
     private GbOrderService gbOrderService;
     @Resource
@@ -117,7 +117,7 @@ public class OTimeTask {
 
         LocalDateTime tenMinutesAgo = LocalDateTime.now().minusMinutes(10);
         LocalDateTime thirdDayAgo = LocalDateTime.now().minusDays(3);
-        List<OrderPayment> list = orderPaymentService.list(QueryWrapper.create()
+        List<OrderPayment> list = paymentService.list(QueryWrapper.create()
                 .gt(OrderPayment::getUpdateTime, thirdDayAgo)
                 .lt(OrderPayment::getUpdateTime, tenMinutesAgo)
                 .in(OrderPayment::getSourceType, ware)

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DistributionPayServiceImpl.java

@@ -36,7 +36,7 @@ public class DistributionPayServiceImpl implements DistributionPayService {
     private final BigDecimal MONEY_RATE = new BigDecimal("100");
 
     @Resource
-    private OrderPaymentService orderPaymentService;
+    private OrderPaymentService paymentService;
     @Resource
     private MkDistributionConfigService configService;
     @Resource
@@ -74,7 +74,7 @@ public class DistributionPayServiceImpl implements DistributionPayService {
                 .setPayType(PayTypeConstants.PayType.PAY)
                 .setOrderNo(payParam.getPlatformType() + IdUtil.getSnowflakeNextId())
                 .setAmount(isRecharge ? payParam.getAmount() : detail.getPayAmount());
-        orderPaymentService.save(orderPayment);
+        paymentService.save(orderPayment);
 
         InitInfo initInfo = new InitInfo().setConfig(detail);
         if (isRecharge) {

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPaymentServiceImpl.java

@@ -22,10 +22,10 @@ public class OrderPaymentServiceImpl extends ServiceImpl<OrderPaymentMapper, Ord
     @Override
     public BigDecimal countMemberInAmount(Long shopId, Long shopUserId) {
         return getOneAs(QueryWrapper.create().select("IFNULL(sum(amount), 0) as total_amount")
-                .eq(OrderPayment::getShopId, 143)
+                .eq(OrderPayment::getShopId, shopId)
                 .eq(OrderPayment::getSourceType, PayTypeConstants.SourceType.MEMBER_IN)
                 .eq(OrderPayment::getPayType, PayTypeConstants.PayType.PAY)
-                .eq(OrderPayment::getSourceId, 127452)
+                .eq(OrderPayment::getSourceId, shopUserId)
                 .eq(OrderPayment::getPayStatus, PayTypeConstants.PayStatus.SUCCESS), BigDecimal.class);
     }
 }