From 56d62d9edb0dda9ae678dcea2323144db5d11c22 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 28 十二月 2024 18:06:58 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index 607cb6c..617ff88 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -12,10 +12,12 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.domain.ShopScore;
+import com.ruoyi.other.mapper.ShopMapper;
import com.ruoyi.other.service.ShopScoreService;
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.vo.NearbyShopVO;
import com.ruoyi.other.vo.ShopDetailVO;
+import com.ruoyi.other.vo.ShopStatistics;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
@@ -23,6 +25,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -55,7 +58,8 @@
private TokenService tokenService;
@Resource
private SysUserClient sysUserClient;
-
+ @Resource
+ private ShopMapper shopMapper;
@@ -67,11 +71,11 @@
if (!shopService.cheUserByPhone(phone)) {
return R.fail("该手机号未注册");
}
+ AppUser appUser = appUserClient.getAppUserByPhone1(phone).getData();
shop.setShopAllPoint(0);
- shop.setShopPoint(0);
+ shop.setLowerLevelSharePoint(0);
shop.setSharePoint(0);
shop.setServerPoint(0);
- shop.setLowerLevelRebatePoints(0);
shop.setUsePoint(0);
shop.setGiveawayAllMoney(BigDecimal.ZERO);
shop.setGiveawayMoney(BigDecimal.ZERO);
@@ -82,14 +86,20 @@
shop.setOrderNumber(0);
shop.setServerOrderNumber(0);
shop.setCustomOrderNumber(0);
+ shop.setAppUserId(appUser.getId());
shopService.save(shop);
- LoginUser loginUserApplet = tokenService.getLoginUser();
+
AppUserShop appUserShop = new AppUserShop();
- appUserShop.setAppUserId(loginUserApplet.getUserid());
+ appUserShop.setAppUserId(appUser.getId());
appUserShop.setShopId(shop.getId());
R<Void> r = appUserClient.addAppUserShop(appUserShop);
if (R.isError(r)){
+ throw new RuntimeException("添加失败");
+ }
+ appUser.setUserType(2);
+ R<Void> editAppUserR = appUserClient.editAppUserById(appUser);
+ if (R.isError(editAppUserR)){
throw new RuntimeException("添加失败");
}
return R.ok();
@@ -98,7 +108,7 @@
@GetMapping("/getDetailById")
@ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"})
- public R<Shop> getDetailById(@RequestParam("id") Long id){
+ public R<Shop> getDetailById(@RequestParam("id") Integer id){
Shop byId = shopService.getById(id);
return R.ok(byId);
}
@@ -113,6 +123,10 @@
@PutMapping("/editShop")
@ApiOperation(value = "门店管理-编辑门店", tags = {"管理后台-门店管理"})
public R<Void> editShop(@RequestBody Shop shop){
+ String phone = shop.getPhone();
+ if (!shopService.cheUserByPhone(phone)) {
+ return R.fail("该手机号未注册");
+ }
shopService.updateById(shop);
return R.ok();
}
@@ -121,6 +135,9 @@
@ApiOperation(value = "门店列表", tags = {"管理后台-门店管理"})
public R<IPage<Shop>> list(@ApiParam("页码") @RequestParam Integer pageNum,@ApiParam("每一页数据大小") Integer pageSize,Shop shop){
IPage<Shop> shopIPage = shopService.getShopList(pageNum, pageSize, shop);
+ for (Shop record : shopIPage.getRecords()) {
+ record.setLaveUsePoint(record.getLavePoint());
+ }
return R.ok(shopIPage);
}
@@ -194,6 +211,9 @@
R<List<AppUserShop>> r = appUserClient.getAppUserShop(SecurityUtils.getUserId());
if (R.isSuccess(r)){
List<AppUserShop> appUserShopList = r.getData();
+ if (CollectionUtils.isEmpty(appUserShopList)){
+ return R.ok(new ArrayList<>());
+ }
List<Integer> shopIds = appUserShopList.stream().map(AppUserShop::getShopId).collect(Collectors.toList());
List<Shop> shopList = shopService.listByIds(shopIds);
return R.ok(shopList);
@@ -206,7 +226,7 @@
*/
@GetMapping("/bindShop")
@ApiOperation(value = "绑定门店", tags = {"小程序-个人中心"})
- public R<Void> bindShop(@ApiParam("门店id") @RequestParam Long shopId) {
+ public R<Void> bindShop(@ApiParam("门店id") @RequestParam Integer shopId) {
AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
appUser.setShopId(shopId);
return appUserClient.editAppUserById(appUser);
@@ -242,7 +262,7 @@
@ResponseBody
@PostMapping("/getShopByUserId")
- public R<List<Shop>> getShopByUserId(@RequestParam("id") Integer id){
+ public R<List<Shop>> getShopByUserId(@RequestParam("id") Long id){
List<Shop> list = shopService.lambdaQuery().eq(Shop::getAppUserId, id).list();
return R.ok(list);
}
@@ -273,5 +293,24 @@
return R.ok(list.stream().map(Shop::getId).collect(Collectors.toSet()));
}
+ /**
+ * 门店统计
+ */
+ @GetMapping("/shopStatistics")
+ @ApiOperation(value = "门店统计", tags = {"管理后台-首页统计"})
+ public R<ShopStatistics> shopStatistics(@ApiParam("门店名称") String shopName) {
+ ShopStatistics shopStatistics = shopMapper.getShopStatistics(shopName);
+ return R.ok(shopStatistics);
+ }
+
+
+ /**
+ * 编辑门店
+ * @param shop
+ */
+ @PostMapping("/updateShop")
+ public void updateShop(@RequestBody Shop shop){
+ shopService.updateById(shop);
+ }
}
--
Gitblit v1.7.1