From 210828d1a6947596fe00ab30fcd8725c6714dde4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 02 一月 2025 21:04:16 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 334 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 317 insertions(+), 17 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 a5f04a0..368c8ae 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
@@ -2,30 +2,43 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.feignClient.AppUserShopClient;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.AppUserShop;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.service.TokenService;
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.enums.ShopStatus;
+import com.ruoyi.other.mapper.ShopMapper;
import com.ruoyi.other.service.ShopScoreService;
import com.ruoyi.other.service.ShopService;
-import com.ruoyi.other.service.TechnicianService;
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.feignClient.UserShopClient;
import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.api.model.UserShop;
import io.swagger.annotations.Api;
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;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* <p>
@@ -37,10 +50,8 @@
*/
@RestController
@RequestMapping("/shop")
-@Api(tags = "门店")
+@Api("门店")
public class ShopController extends BaseController {
- @Resource
- private TechnicianService technicianService;
@Resource
private ShopService shopService;
@Resource
@@ -49,13 +60,262 @@
private ShopScoreService shopScoreService;
@Resource
private TokenService tokenService;
+ @Resource
+ private SysUserClient sysUserClient;
+ @Resource
+ private ShopMapper shopMapper;
+ @Resource
+ private UserShopClient userShopClient;
+ @Resource
+ private AppUserShopClient appUserShopClient;
- @PostMapping("/getDetailById")
- public R<Shop> getDetailById(@RequestParam("id") Long id){
+ @PostMapping
+ @ApiOperation(value = "新增门店", tags = {"管理后台-门店管理"})
+ @Transactional(rollbackFor = Exception.class)
+ public R<Void> add(@RequestBody Shop shop){
+ String phone = shop.getPhone();
+ if (!shopService.cheUserByPhone(phone)) {
+ return R.fail("该手机号未注册");
+ }
+ AppUser appUser = appUserClient.getAppUserByPhone1(phone).getData();
+ shop.setShopAllPoint(0);
+ shop.setLowerLevelSharePoint(0);
+ shop.setSharePoint(0);
+ shop.setServerPoint(0);
+ shop.setUsePoint(0);
+ shop.setGiveawayAllMoney(BigDecimal.ZERO);
+ shop.setGiveawayMoney(BigDecimal.ZERO);
+ shop.setLowerLevelGiveawayMoney(BigDecimal.ZERO);
+ shop.setServerGiveawayMoney(BigDecimal.ZERO);
+ shop.setCanWithdrawMoney(BigDecimal.ZERO);
+ shop.setWithdrawMoney(BigDecimal.ZERO);
+ shop.setOrderNumber(0);
+ shop.setServerOrderNumber(0);
+ shop.setCustomOrderNumber(0);
+ shop.setAppUserId(appUser.getId());
+ shopService.save(shop);
+
+ AppUserShop appUserShop = new AppUserShop();
+ 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("添加失败");
+ }
+ //添加门店后台账号和门店关系数据
+ SysUser sysUser = sysUserClient.queryUserByUserName(phone).getData();
+ if(null != sysUser){
+ UserShop userShop = new UserShop();
+ userShop.setUserId(sysUser.getUserId());
+ userShop.setShopId(shop.getId());
+ userShop.setRoleType(1);
+ List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ if(null == data || data.size() == 0){
+ userShop = new UserShop();
+ userShop.setUserId(sysUser.getUserId());
+ userShop.setShopId(shop.getId());
+ userShop.setRoleType(1);
+ userShopClient.saveUserShop(userShop);
+ }
+ }else{
+ //添加管理后台账号
+ SysUser user = new SysUser();
+ user.setDeptId(1L);
+ user.setUserName(appUser.getPhone());
+ user.setNickName(appUser.getName());
+ user.setPhonenumber(appUser.getPhone());
+ user.setAvatar(appUser.getAvatar());
+ user.setStatus("0");
+ user.setDelFlag("0");
+ user.setRoleType(2);
+ user.setObjectId(shop.getId());
+ user.setAppUserId(appUser.getId());
+ user.setPassword(phone.substring(5));
+ user.setCreateTime(new Date());
+ Long userId = sysUserClient.saveShopUser(user).getData();
+
+ UserShop userShop = new UserShop();
+ userShop.setUserId(userId);
+ userShop.setShopId(shop.getId());
+ userShop.setRoleType(1);
+ userShopClient.saveUserShop(userShop);
+ }
+ return R.ok();
+ }
+
+
+ @GetMapping("/getDetailById")
+ @ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"})
+ public R<Shop> getDetailById(@RequestParam("id") Integer id){
Shop byId = shopService.getById(id);
return R.ok(byId);
+ }
+
+ @DeleteMapping("/deleteShop")
+ @ApiOperation(value = "删除门店", tags = {"管理后台-门店管理"})
+ public R<Void> deleteShop(@ApiParam("门店id") @RequestParam("id") Integer id){
+ Shop shop = shopService.getById(id);
+ shop.setDelFlag(1);
+ shopService.updateById(shop);
+ //获取门店的员工数据
+ UserShop userShop = new UserShop();
+ userShop.setShopId(shop.getId());
+ List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ List<Integer> collect = data.stream().map(UserShop::getUserId).collect(Collectors.toList()).stream().map(Long::intValue).collect(Collectors.toList());
+ List<SysUser> sysUserList = sysUserClient.getUserList(collect).getData();
+ //删除门店下的所有员工
+ sysUserClient.delShopUser(shop.getId(), 2);
+ //修改小程序用户类型和门店数据
+ for (SysUser sysUser : sysUserList) {
+ String userName = sysUser.getUserName();
+ //通过电话号码查询小程序用户和门店关系数据
+ AppUser appUser = appUserClient.getAppUserByPhone1(userName).getData();
+ //需要先判断用户是否没有关联任何门店
+ List<AppUserShop> userShops = appUserShopClient.getAppUserShop(appUser.getId()).getData();
+ if(userShops.size() == 1 && userShops.get(0).getShopId().equals(shop.getId())){
+ appUser.setUserType(1);
+ appUserClient.editAppUserById(appUser);
+ }
+
+ }
+ return R.ok();
+ }
+
+ @PutMapping("/editShop")
+ @ApiOperation(value = "门店管理-编辑门店", tags = {"管理后台-门店管理"})
+ public R<Void> editShop(@RequestBody Shop shop){
+ String phone = shop.getPhone();
+ if (!shopService.cheUserByPhone(phone)) {
+ return R.fail("该手机号未注册");
+ }
+ Shop old_shop = shopService.getById(shop.getId());
+ shopService.updateById(shop);
+ //修改管理员
+ if(!phone.equals(old_shop.getPhone())){
+ AppUser appUser = appUserClient.getAppUserById(old_shop.getAppUserId());
+ //需要先判断用户是否没有关联任何门店
+ List<AppUserShop> userShops = appUserShopClient.getAppUserShop(appUser.getId()).getData();
+ if(userShops.size() == 1 && userShops.get(0).getShopId().equals(shop.getId())){
+ appUser.setUserType(1);
+ appUserClient.editAppUserById(appUser);
+ }
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShop.setShopId(shop.getId());
+ appUserShopClient.delAppUserShop(appUserShop);
+
+ //添加新管理员
+ appUser = appUserClient.getAppUserByPhone1(phone).getData();
+ appUserShop = new AppUserShop();
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShop.setShopId(shop.getId());
+ appUserClient.addAppUserShop(appUserShop);
+
+ //修改管理员
+ shop.setAppUserId(appUser.getId());
+ shopService.updateById(shop);
+
+ //添加门店后台账号和门店关系数据
+ SysUser sysUser = sysUserClient.queryUserByUserName(phone).getData();
+ if(null != sysUser){
+ UserShop userShop = new UserShop();
+ userShop.setUserId(sysUser.getUserId());
+ userShop.setShopId(shop.getId());
+ userShop.setRoleType(1);
+ List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ if(null == data || data.size() == 0){
+ userShop = new UserShop();
+ userShop.setUserId(sysUser.getUserId());
+ userShop.setShopId(shop.getId());
+ userShop.setRoleType(1);
+ userShopClient.saveUserShop(userShop);
+ }
+ }else{
+ //添加管理后台账号
+ SysUser user = new SysUser();
+ user.setDeptId(1L);
+ user.setUserName(appUser.getPhone());
+ user.setNickName(appUser.getName());
+ user.setPhonenumber(appUser.getPhone());
+ user.setAvatar(appUser.getAvatar());
+ user.setStatus("0");
+ user.setDelFlag("0");
+ user.setRoleType(2);
+ user.setObjectId(shop.getId());
+ user.setAppUserId(appUser.getId());
+ user.setPassword(phone.substring(5));
+ user.setCreateTime(new Date());
+ Long userId = sysUserClient.saveShopUser(user).getData();
+
+ UserShop userShop = new UserShop();
+ userShop.setUserId(userId);
+ userShop.setShopId(shop.getId());
+ userShop.setRoleType(1);
+ userShopClient.saveUserShop(userShop);
+ }
+ }
+ return R.ok();
+ }
+
+ @GetMapping("/list")
+ @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);
+ }
+
+ /**
+ * 通过手机号校验店长
+ */
+ @PostMapping("/cheUserByPhone")
+ @ApiOperation(value = "通过手机号校验店长", tags = {"管理后台-门店管理"})
+ public R<Boolean> cheUserByPhone(@RequestParam("phone") String phone) {
+ return R.ok(shopService.cheUserByPhone(phone));
+ }
+
+ /**
+ * 重置密码
+ */
+ @GetMapping ("/resetPassword")
+ @ApiOperation(value = "重置密码", tags = {"管理后台-门店管理"})
+ public R<Void> resetPassword(@RequestParam(value = "ids") String ids) {
+ String[] idsArr = ids.split(",");
+ for (String id : idsArr) {
+ Shop shop = shopService.getById(Integer.valueOf(id));
+ UserShop userShop = new UserShop();
+ userShop.setShopId(shop.getId());
+ userShop.setRoleType(1);
+ List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ SysUser userData = sysUserClient.getSysUser(data.get(0).getUserId()).getData();
+ userData.setPassword(userData.getPhonenumber().substring(5));
+ sysUserClient.resetPassword(userData);
+ }
+ return R.ok();
+ }
+
+ /**
+ * 获取手机号的后六位。
+ *
+ * @param phoneNumber 以字符串形式提供的手机号
+ * @return 手机号的后六位
+ * @throws IllegalArgumentException 如果手机号长度不足六位
+ */
+ public String getLastSixDigits(String phoneNumber) {
+ if (phoneNumber == null || phoneNumber.length() < 6) {
+ throw new IllegalArgumentException("手机号长度不足六位");
+ }
+ // 取字符串的最后六位
+ return phoneNumber.substring(phoneNumber.length() - 6);
}
@@ -63,7 +323,7 @@
* 附近门店列表
*/
@GetMapping("/nearbyShopList")
- @ApiOperation(value = "附近门店列表", tags = {"小程序-首页-附近门店列表"})
+ @ApiOperation(value = "附近门店列表", tags = {"小程序-首页"})
public R<List<NearbyShopVO>> nearbyShopList(@ApiParam("经度") @RequestParam BigDecimal longitude,
@ApiParam("纬度") @RequestParam BigDecimal latitude) {
return R.ok(shopService.nearbyShopList(longitude, latitude));
@@ -71,7 +331,7 @@
@GetMapping("/shopDetail")
- @ApiOperation(value = "门店详情", tags = {"小程序-首页-门店详情"})
+ @ApiOperation(value = "门店详情", tags = {"小程序-首页"})
public R<ShopDetailVO> shopDetail(@ApiParam("门店id") @RequestParam Integer shopId,
@ApiParam("经度") @RequestParam BigDecimal longitude,
@ApiParam("纬度") @RequestParam BigDecimal latitude) {
@@ -82,20 +342,27 @@
* 查询当前店长所属门店
*/
@GetMapping("/shopByUser")
- @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心-首页"}, notes = "可绑定的门店列表")
+ @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心"}, notes = "可绑定的门店列表")
public R<List<Shop>> shopByUser() {
- List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>()
- .eq(Shop::getAppUserId, SecurityUtils.getUserId())
- .eq(Shop::getStatus, ShopStatus.SHOP_STATUS_NORMAL.getCode()));
- return R.ok(list);
+ 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);
+ }
+ return R.ok(new ArrayList<>());
}
/**
* 绑定门店
*/
@GetMapping("/bindShop")
- @ApiOperation(value = "绑定门店", tags = {"小程序-个人中心-绑定门店"})
- public R<Void> bindShop(@ApiParam("门店id") @RequestParam Long shopId) {
+ @ApiOperation(value = "绑定门店", tags = {"小程序-个人中心"})
+ public R<Void> bindShop(@ApiParam("门店id") @RequestParam Integer shopId) {
AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
appUser.setShopId(shopId);
return appUserClient.editAppUserById(appUser);
@@ -106,7 +373,7 @@
* @return
*/
@PostMapping("/shopScore")
- @ApiOperation(value = "门店打分", tags = {"小程序-个人中心-门店打分"})
+ @ApiOperation(value = "门店打分", tags = {"小程序-个人中心"})
public R<Void> shopScore(@RequestBody ShopScore shopScore) {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
shopScore.setAppUserId(loginUserApplet.getUserid());
@@ -128,6 +395,13 @@
Shop shop = shopService.getById(id);
return R.ok(shop);
}
+
+ @ResponseBody
+ @PostMapping("/getShopByUserId")
+ public R<List<Shop>> getShopByUserId(@RequestParam("id") Long id){
+ List<Shop> list = shopService.lambdaQuery().eq(Shop::getAppUserId, id).list();
+ return R.ok(list);
+ }
/**
@@ -148,5 +422,31 @@
return R.ok(list);
}
+ @GetMapping("/getShopIdByName")
+ R<Set<Integer>> getShopIdByName(@RequestParam String shopName){
+ List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>()
+ .like(Shop::getName, shopName));
+ return R.ok(list.stream().map(Shop::getId).collect(Collectors.toSet()));
+ }
+
+ /**
+ * 门店统计
+ */
+ @GetMapping("/shopStatistics")
+ @ApiOperation(value = "门店统计", tags = {"管理后台-首页统计"})
+ public R<ShopStatistics> shopStatistics(@ApiParam("门店id") Integer shopId) {
+ ShopStatistics shopStatistics = shopMapper.getShopStatistics(shopId);
+ return R.ok(shopStatistics);
+ }
+
+
+ /**
+ * 编辑门店
+ * @param shop
+ */
+ @PostMapping("/updateShop")
+ public void updateShop(@RequestBody Shop shop){
+ shopService.updateById(shop);
+ }
}
--
Gitblit v1.7.1