From cbc564a7088503ad8cc7af4e1d2ba417d061e615 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 11:35:05 +0800
Subject: [PATCH] 联调bug和统计完善
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
index ce8ad2e..b875415 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
@@ -4,20 +4,16 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
import com.ruoyi.shop.domain.pojo.shop.ShopStaff;
-import com.ruoyi.shop.service.shop.ShopRelUserService;
-import com.ruoyi.shop.service.shop.ShopService;
-import com.ruoyi.shop.service.shop.ShopStaffService;
-import com.ruoyi.shop.service.shop.ShopSuggestService;
+import com.ruoyi.shop.service.shop.*;
+import com.ruoyi.shop.service.task.MemberTaskService;
import com.ruoyi.shop.service.task.ShopTaskService;
import com.ruoyi.system.api.domain.dto.MgtBaseBathDto;
import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
import com.ruoyi.system.api.domain.dto.MgtShopIdByCodeDto;
+import com.ruoyi.system.api.domain.dto.ShopTotalChangeDto;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
-import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
-import com.ruoyi.system.api.domain.vo.MgtShopIdByCodeVo;
-import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
-import com.ruoyi.system.api.domain.vo.ShopRelUserVo;
+import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.model.QwH5LoginVo;
import com.ruoyi.system.api.model.QwUserDetailDto;
import com.ruoyi.system.api.service.RemoteUserService;
@@ -59,6 +55,11 @@
@Resource
private ShopTaskService shopTaskService;
+ @Resource
+ private ShopTotalService shopTotalService;
+
+ @Resource
+ private MemberTaskService memberTaskService;
/**
* 企业微信H5登录
@@ -189,4 +190,34 @@
List<Long> shopIdList = shopService.listShopIdByPlTotal(mgtBasePlatformDto);
return R.ok(shopIdList);
}
+
+
+ /**
+ * @description 更新商户统计
+ * @author jqs
+ * @date 2023/6/28 17:52
+ * @param shopTotalChangeDto
+ * @return R
+ */
+ @PostMapping("/changeShopTotal")
+ public R changeShopTotal(@RequestBody ShopTotalChangeDto shopTotalChangeDto)
+ {
+ shopTotalService.changeShopTotal(shopTotalChangeDto);
+ return R.ok();
+ }
+
+ /**
+ * @description 获取最近任务
+ * @author jqs
+ * @date 2023/6/29 18:25
+ * @param userId
+ * @return R<MemberTaskSimpleVo>
+ */
+ @PostMapping("/getLastMemberTask")
+ public R<MemberTaskSimpleVo> getLastMemberTask(@RequestBody Long userId)
+ {
+ MemberTaskSimpleVo taskSimpleVo = memberTaskService.getLastMemberTask(userId);
+ return R.ok(taskSimpleVo);
+ }
+
}
--
Gitblit v1.7.1