From 34f741f39e22bf48df33321230380b40c23110c3 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 18 四月 2025 21:34:13 +0800
Subject: [PATCH] 店铺、积分、订单
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 316 +++++++++++-----------------------------------------
1 files changed, 69 insertions(+), 247 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 0c8d8c1..847621e 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
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.feignClient.AppUserShopClient;
import com.ruoyi.account.api.model.AppUser;
@@ -41,6 +42,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.models.auth.In;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -96,6 +98,8 @@
private ReceiverBankChannelService receiverBankChannelService;
@Resource
private ShopScoreService shopScoreService;
+ @Autowired
+ private PhoneService phoneService;
/**
@@ -155,106 +159,33 @@
}
@PostMapping
- @ApiOperation(value = "新增门店", tags = {"管理后台-门店管理"})
+ @ApiOperation(value = "新增门店", tags = {"后台-门店管理"})
@Transactional(rollbackFor = Exception.class)
public R<Void> add(@RequestBody Shop shop){
- /*String phone = shop.getPhone();
+ String phone = shop.getPhone();
AppUser appUser = appUserClient.getAppUserByPhone1(phone).getData();
if (appUser == null){
return R.fail("该手机号未注册");
}
- *//* 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.setCreateTime(LocalDateTime.now());
shop.setAppUserId(appUser.getId());
- String city = TencentMapUtil.inverseGeographicalAnalysis(shop.getLongitude(), shop.getLatitude(), false);
- if(!StringUtils.hasLength(city)){
- city = "510100";
- }
- *//*shop.setProvinceCode(city.substring(0, 2) + "0000");
- shop.setCityCode(city.substring(0, 4) + "00");
- shop.setDistrictCode(city);*//*
+ //添加门店
shopService.save(shop);
-
- Integer shopId = shop.getId();
-
- appUser.setUserType(2);
- R<Void> editAppUserR = appUserClient.editAppUserById(appUser);
- if (R.isError(editAppUserR)){
- throw new RuntimeException("添加失败");
+ //添加shopuser
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShop.setShopId(shop.getId());
+ R appUserShopR = appUserShopClient.insert(appUserShop);
+ if (appUserShopR.getCode()!=200){
+ throw new RuntimeException("添加用户门店关系失败");
}
- //添加门店后台账号和门店关系数据
- SysUser sysUser = sysUserClient.queryUserByUserNameAndRoleType(phone, 2).getData();
- if(null != sysUser){
- sysUser.setAppUserId(appUser.getId());
- sysUserClient.updateUser(sysUser);
-
- UserShop userShop = new UserShop();
- userShop.setUserId(sysUser.getUserId());
- userShop.setShopId(shopId);
- 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(shopId);
- userShop.setRoleType(1);
- userShop.setRoleId(2L);
- userShop.setNickName(sysUser.getNickName());
- userShop.setCreateTime(LocalDateTime.now());
- 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(shopId);
- user.setAppUserId(appUser.getId());
- String s = MD5Generator.generateMD5(phone.substring(5));
- user.setPassword(s);
- user.setCreateTime(new Date());
- Long userId = sysUserClient.saveShopUser(user).getData();
-
- UserShop userShop = new UserShop();
- userShop.setUserId(userId);
- userShop.setShopId(shopId);
- userShop.setRoleType(1);
- List<UserShop> data = userShopClient.getUserShop(userShop).getData();
- if(null == data || data.size() == 0){
- userShop = new UserShop();
- userShop.setUserId(userId);
- userShop.setShopId(shopId);
- userShop.setRoleType(1);
- userShop.setRoleId(2L);
- userShop.setNickName(user.getNickName());
- userShop.setCreateTime(LocalDateTime.now());
- userShopClient.saveUserShop(userShop);
- }
- }
-
- // 更换下级会员绑定门店
- R<List<AppUser>> lowerShopR = appUserClient.setLowerUserShop(appUser.getId(), shopId);
- if (R.isError(lowerShopR)){
- throw new RuntimeException("更换下级会员绑定门店失败");
- }*/
+ //添加客服phone
+ Phone phone1 = new Phone();
+ phone1.setType(2);//门店
+ phone1.setPhoneOne(shop.getServiceTel());
+ phone1.setShopId(shop.getId());
+ phoneService.save(phone1);
return R.ok();
}
@@ -263,14 +194,13 @@
@ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"})
public R<Shop> getDetailById(@RequestParam("id") Integer id){
Shop shop = shopService.getById(id);
-
return R.ok(shop);
}
@DeleteMapping("/deleteShop")
@ApiOperation(value = "删除门店", tags = {"管理后台-门店管理"})
public R<Void> deleteShop(@ApiParam("门店id") @RequestParam("id") Integer id){
- /*List<Goods> list1 = goodsService.list(new LambdaQueryWrapper<Goods>().eq(Goods::getDelFlag, 0).eq(Goods::getAppointStore, 1).eq(Goods::getStatus, 2));
+ List<Goods> list1 = goodsService.list(new LambdaQueryWrapper<Goods>().eq(Goods::getDelFlag, 0).eq(Goods::getStatus, 2));
if(list1.size() > 0){
Set<Integer> collect1 = list1.stream().map(Goods::getId).collect(Collectors.toSet());
long count = goodsShopService.count(new LambdaQueryWrapper<GoodsShop>().eq(GoodsShop::getShopId, id).in(GoodsShop::getGoodsId, collect1));
@@ -281,121 +211,53 @@
Shop shop = shopService.getById(id);
shop.setDelFlag(1);
shopService.updateById(shop);
- // 查询有没有门店绑定这个被删除的门店
- List<Shop> shops = shopService.lambdaQuery().eq(Shop::getPid, shop.getId()).list();
- for (Shop shop1 : shops) {
- LambdaUpdateWrapper<Shop> set = new LambdaUpdateWrapper<Shop>().set(Shop::getPid, null)
- .eq(Shop::getId,shop1.getId());
- shopService.update(set);
+ R deleteR = appUserShopClient.delete(shop.getId(), shop.getAppUserId());
+ if (deleteR.getCode()!=200){
+ throw new RuntimeException("删除用户门店关系失败");
}
- //清除用户绑定当前门店
- appUserClient.clearBindShop(shop.getId());
- //查询门店绑定的平台账号
- UserShop userShop = new UserShop();
- userShop.setShopId(shop.getId());
- List<UserShop> data = userShopClient.getUserShop(userShop).getData();
- if(data.size() > 0){
- //删除门店后台账号和关系数据
- sysUserClient.delShopUser(shop.getId(), 2);
- }*/
return R.ok();
}
@PutMapping("/editShop")
@ApiOperation(value = "门店管理-编辑门店", tags = {"管理后台-门店管理"})
public R<Void> editShop(@RequestBody Shop shop){
- /*String phone = shop.getPhone();
- if (!shopService.cheUserByPhone(phone)) {
+ //修改店长
+ String phone = shop.getPhone();
+ AppUser appUser = appUserClient.getAppUserByPhone1(phone).getData();
+ if (appUser == null){
return R.fail("该手机号未注册");
}
- String city = TencentMapUtil.inverseGeographicalAnalysis(shop.getLongitude(), shop.getLatitude(), false);
- if(!StringUtils.hasLength(city)){
- city = "510100";
- }
- *//*shop.setProvinceCode(city.substring(0, 2) + "0000");
- shop.setCityCode(city.substring(0, 4) + "00");
- shop.setDistrictCode(city);*//*
- Shop old_shop = shopService.getById(shop.getId());
- shopService.updateById(shop);
- //修改管理员
- AppUser appUser = appUserClient.getAppUserById(old_shop.getAppUserId());
-
- //删除后台用户和店铺关系数据
- UserShop userShop = new UserShop();
- userShop.setShopId(shop.getId());
- userShop.setRoleType(1);
- List<UserShop> data = userShopClient.getUserShop(userShop).getData();
- if(null != data && data.size() > 0){
- UserShop userShop1 = data.get(0);
- userShopClient.delUserShop(userShop1);
- //如果当前后台账户关联的店铺是最后一个，删除后台账户
- userShop = new UserShop();
- userShop.setUserId(userShop1.getUserId());
- data = userShopClient.getUserShop(userShop).getData();
- if(data.size() == 0){
- sysUserClient.delSysUserById(userShop1.getUserId());
- }
- }
-
- //添加新管理员
- appUser = appUserClient.getAppUserByPhone1(phone).getData();
- appUser.setUserType(2);
- appUserClient.editAppUserById(appUser);
-
- //修改管理员
+ Long originalUserId = shop.getAppUserId();
+ //添加用户id到shop信息中
shop.setAppUserId(appUser.getId());
+ //删除店铺关系
+ R deleteR = appUserShopClient.delete(shop.getId(), originalUserId);
+ if (deleteR.getCode()!=200){
+ throw new RuntimeException("删除用户门店关系失败");
+ }
+ //删除客服电话
+ QueryWrapper<Phone> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("shop_id", shop.getId());
+ phoneService.remove(queryWrapper);
+
+ //修改店铺
shopService.updateById(shop);
-
- //添加门店后台账号和门店关系数据
- SysUser sysUser = sysUserClient.queryUserByUserName(phone).getData();
- if(null != sysUser){
- userShop = new UserShop();
- userShop.setShopId(shop.getId());
- userShop.setUserId(sysUser.getUserId());
- 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);
- userShop.setRoleId(2L);
- userShop.setNickName(sysUser.getNickName());
- userShop.setCreateTime(LocalDateTime.now());
- 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 = new UserShop();
- userShop.setShopId(shop.getId());
- userShop.setUserId(userId);
- data = userShopClient.getUserShop(userShop).getData();
- if(null == data || data.size() == 0){
- userShop = new UserShop();
- userShop.setUserId(userId);
- userShop.setShopId(shop.getId());
- userShop.setRoleType(1);
- userShop.setRoleId(2L);
- userShop.setNickName(appUser.getName());
- userShop.setCreateTime(LocalDateTime.now());
- userShopClient.saveUserShop(userShop);
- }
- }*/
+ //添加shopuser
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShop.setShopId(shop.getId());
+ R appUserShopR = appUserShopClient.insert(appUserShop);
+ if (appUserShopR.getCode()!=200){
+ throw new RuntimeException("添加用户门店关系失败");
+ }
+ //添加客服phone
+ Phone phone1 = new Phone();
+ phone1.setType(2);//门店
+ phone1.setPhoneOne(shop.getServiceTel());
+ phone1.setShopId(shop.getId());
+ phoneService.save(phone1);
return R.ok();
+
}
public static void main(String[] args) {
@@ -406,59 +268,12 @@
@PutMapping("/freezingOrThawing")
@ApiOperation(value = "门店管理-冻结/解冻门店", tags = {"管理后台-门店管理"})
public R freezingOrThawing(@RequestParam("id") Integer id, @RequestParam("status") Integer status){
- /* Shop shop = shopService.getById(id);
+ Shop shop = shopService.getById(id);
if(shop.getStatus().equals(status)){
return R.fail("不能重复操作");
}
shop.setStatus(status);
shopService.updateById(shop);
- //处理员工等数据
- if(status == 1){
- UserShop userSh = new UserShop();
- userSh.setShopId(id);
- List<UserShop> data = userShopClient.getUserShop(userSh).getData();
- for (UserShop datum : data) {
- SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
- sysUser.setStatus("0");
- sysUserClient.updateUser(sysUser);
- }
- }else{
- //查询门店所有关联数据
- UserShop userSh = new UserShop();
- userSh.setShopId(id);
- List<UserShop> data = userShopClient.getUserShop(userSh).getData();
- for (UserShop datum : data) {
- //查询用户关联的其他店铺
- UserShop userShop = new UserShop();
- userShop.setUserId(datum.getUserId());
- List<UserShop> data1 = userShopClient.getUserShop(userShop).getData();
- List<UserShop> collect = data1.stream().filter(s -> !s.getShopId().equals(id)).collect(Collectors.toList());
- if(collect.size() == 0){
- //如果没有其他店铺，则将用户禁用
- SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
- sysUser.setStatus("1");
- sysUserClient.updateUser(sysUser);
- }else{
- List<Integer> shopIds = collect.stream().map(UserShop::getShopId).collect(Collectors.toList());
- List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1)
- .in(Shop::getId, shopIds));
- //如果用户关联的其他门店都禁用了，将用户禁用
- if(list.size() == 0){
- SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
- sysUser.setStatus("1");
- sysUserClient.updateUser(sysUser);
- }else{
- //修改默认门店
- SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
- if(sysUser.getObjectId().equals(id)){
- sysUser.setObjectId(list.get(0).getId());
- sysUserClient.updateUser(sysUser);
- }
- }
- }
- }
- }*/
-
return R.ok();
}
@@ -469,9 +284,9 @@
@ApiOperation(value = "门店列表", tags = {"管理后台-门店管理"})
public R<IPage<Shop>> list(@ApiParam("页码") @RequestParam("pageNum") Integer pageNum,@ApiParam("每一页数据大小") @RequestParam("pageSize") Integer pageSize,Shop shop){
IPage<Shop> shopIPage = shopService.getShopList(pageNum, pageSize, shop);
- /*for (Shop record : shopIPage.getRecords()) {
- record.setLaveUsePoint(record.getLavePoint());
- }*/
+ for (Shop record : shopIPage.getRecords()) {
+ record.setFullAddress(record.getAddress()+record.getDetailAddress());
+ }
return R.ok(shopIPage);
}
@@ -905,6 +720,13 @@
return R.ok(shopService.getMap(queryWrapper));
}
+ @PostMapping("/insert")
+ R insert(@RequestBody Shop shop){
+ shopService.save(shop);
+ return R.ok(shop.getId());
+ }
+
+
}
--
Gitblit v1.7.1