From d10302001c4a6776a190cf97a403dab3816ed4f9 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 04 七月 2023 21:59:30 +0800
Subject: [PATCH] 用户端活动商品
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 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 7efb9b5..e75e7ca 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
@@ -5,14 +5,15 @@
import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
import com.ruoyi.shop.domain.pojo.shop.ShopStaff;
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.*;
+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;
@@ -57,6 +58,8 @@
@Resource
private ShopTotalService shopTotalService;
+ @Resource
+ private MemberTaskService memberTaskService;
/**
* 企业微信H5登录
@@ -202,4 +205,33 @@
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);
+ }
+
+ /**
+ * @description 获取商户下属代理商
+ * @author jqs
+ * @date 2023/7/3 17:26
+ * @return R<List<Long>>
+ */
+ @PostMapping("/listShopIdByShopId")
+ public R<List<Long>> listShopIdByShopId(@RequestBody Long shopId)
+ {
+ List<Long> shopIdList = shopService.listShopIdByShopId(shopId);
+ return R.ok(shopIdList);
+ }
+
+
}
--
Gitblit v1.7.1