From 0ffc55f78dfb3cc561540af2d033e64c2f4f2e68 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 29 八月 2023 09:57:08 +0800
Subject: [PATCH] 新增商家管理模块
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java
index 9f570f2..0bcbbc4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java
@@ -6,6 +6,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerCreditsExchangeVO;
import com.panzhihua.common.model.vos.community.VolunteerIntegralMerchantVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.VolunteerIntegralMerchant;
import com.panzhihua.service_community.service.VolunteerCreditsExchangeService;
@@ -22,6 +23,9 @@
{
@Resource
private VolunteerIntegralMerchantService merchantService;
+
+ @Resource
+ private UserService userService;
/**
* 获取单个详情
@@ -195,7 +199,7 @@
* @param
* @return
*/
- @GetMapping("order/getList")
+ @GetMapping("/order/getList")
public R getList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
@RequestParam(value = "goodsId", required = false) String goodsId,
@@ -215,7 +219,7 @@
* @param id
* @return
*/
- @GetMapping("order/getData")
+ @GetMapping("/order/getData")
public R getData(@RequestParam("id") String id)
{
if(StringUtils.isEmpty(id))
@@ -239,8 +243,10 @@
item.setCommunityId(userInfoVO.getCommunityId()+"");
}
+ R<LoginUserInfoVO> loginUserInfoVOR=userService.getUserInfoByUserId(userInfoVO.getUserId()+"");
+
item.setUserId(userInfoVO.getUserId()+"");
- item.setNeedScore(userInfoVO.getLoveIntegral());
+ item.setNeedScore(loginUserInfoVOR.getData().getLoveIntegral());
return vceService.insertData(item);
}
--
Gitblit v1.7.1