diff --git a/cash-api/account-server/src/main/java/com/czg/controller/TestController.java b/cash-api/account-server/src/main/java/com/czg/controller/TestController.java deleted file mode 100644 index e524d798d..000000000 --- a/cash-api/account-server/src/main/java/com/czg/controller/TestController.java +++ /dev/null @@ -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 ""; - } -} diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java index e24682984..53eb72b9b 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java +++ b/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 task(@RequestParam Long shopId) { + try { + distributionTask.deliver(shopId); + } catch (Exception e) { + return CzgResult.failure(e.getMessage()); + } + return CzgResult.success("任务执行成功"); + } + /** * 分销员中心-获取配置 diff --git a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java index 4cd61bfdf..af97cc9c7 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java +++ b/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)); diff --git a/cash-api/order-server/src/main/java/com/czg/controller/StatisticTaskController.java b/cash-api/order-server/src/main/java/com/czg/controller/StatisticTaskController.java index 1490a2e56..b9c3976ca 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/StatisticTaskController.java +++ b/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 */