From 5c6b1469792343d30781074c18880259498109b4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 09 一月 2025 18:11:37 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 94 +++++++++++++++++++++++++++++++---------------
1 files changed, 63 insertions(+), 31 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 ee35476..cef7042 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,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.feignClient.AppUserShopClient;
@@ -13,15 +14,9 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.feignClient.OrderClient;
import com.ruoyi.order.vo.VerifiableShopVo;
-import com.ruoyi.other.api.domain.Goods;
-import com.ruoyi.other.api.domain.GoodsShop;
-import com.ruoyi.other.api.domain.Shop;
-import com.ruoyi.other.api.domain.ShopScore;
+import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.mapper.ShopMapper;
-import com.ruoyi.other.service.GoodsService;
-import com.ruoyi.other.service.GoodsShopService;
-import com.ruoyi.other.service.ShopScoreService;
-import com.ruoyi.other.service.ShopService;
+import com.ruoyi.other.service.*;
import com.ruoyi.other.util.GeodesyUtil;
import com.ruoyi.other.util.tencentMap.TencentMapUtil;
import com.ruoyi.other.vo.NearbyShopVO;
@@ -80,6 +75,11 @@
private GoodsShopService goodsShopService;
@Resource
private OrderClient orderClient;
+ @Resource
+ private TechnicianSubscribeService technicianSubscribeService;
+ @Resource
+ private TechnicianService technicianService;
+
@@ -185,25 +185,38 @@
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) {
- //通过电话号码查询小程序用户和门店关系数据
- AppUser appUser = appUserClient.getAppUserByPhone1(sysUser.getUserName()).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);
+ if(data.size() > 0){
+ 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) {
+ //通过电话号码查询小程序用户和门店关系数据
+ AppUser appUser = appUserClient.getAppUserByPhone1(sysUser.getUserName()).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);
+ }
+ //删除用户门店关系表数据
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShop.setShopId(shop.getId());
+ appUserShopClient.delAppUserShop(appUserShop);
}
- //删除用户门店关系表数据
- AppUserShop appUserShop = new AppUserShop();
- appUserShop.setAppUserId(appUser.getId());
- appUserShop.setShopId(shop.getId());
- appUserShopClient.delAppUserShop(appUserShop);
+ }
+ //取消预约的订单
+ List<Technician> list = technicianService.list(new LambdaQueryWrapper<Technician>().eq(Technician::getShopId, shop.getId()).eq(Technician::getDelFlag, 0));
+ if(list.size() > 0){
+ for (Technician technician : list) {
+ technician.setDelFlag(1);
+ }
+ technicianService.updateBatchById(list);
+ Set<Integer> collect = list.stream().map(Technician::getId).collect(Collectors.toSet());
+ technicianSubscribeService.update(new LambdaUpdateWrapper<TechnicianSubscribe>().in(TechnicianSubscribe::getTechnicianId, collect).eq(TechnicianSubscribe::getDelFlag, 0)
+ .eq(TechnicianSubscribe::getStatus, 0).set(TechnicianSubscribe::getStatus, 2));
}
return R.ok();
}
@@ -383,8 +396,10 @@
*/
@GetMapping("/shopByUser")
@ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心"}, notes = "可绑定的门店列表")
- public R<List<Shop>> shopByUser() {
- R<List<AppUserShop>> r = appUserClient.getAppUserShop(SecurityUtils.getUserId());
+ public R<List<Shop>> shopByUser(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude) {
+ Long userid = tokenService.getLoginUserApplet().getUserid();
+ AppUser appUser = appUserClient.getAppUserById(userid);
+ R<List<AppUserShop>> r = appUserClient.getAppUserShop(userid);
if (R.isSuccess(r)){
List<AppUserShop> appUserShopList = r.getData();
if (CollectionUtils.isEmpty(appUserShopList)){
@@ -392,6 +407,26 @@
}
List<Integer> shopIds = appUserShopList.stream().map(AppUserShop::getShopId).collect(Collectors.toList());
List<Shop> shopList = shopService.listByIds(shopIds);
+ if(null != appUser.getShopId()){
+ Optional<Shop> first = shopList.stream().filter(s -> s.getId().equals(appUser.getShopId())).findFirst();
+ if(first.isPresent()){
+ Shop shop = first.get();
+ for (Shop shop1 : shopList) {
+ if(shop1.getId().equals(shop.getId())){
+ shopList.remove(shop1);
+ break;
+ }
+ }
+ shopList.add(0, shop);
+ }
+ }
+ for (Shop shop : shopList) {
+ Double wgs84 = GeodesyUtil.getDistance(longitude + "," + latitude, shop.getLongitude() + "," + shop.getLatitude()).get("WGS84");
+ shop.setDistance(wgs84);
+ List<ShopScore> list = shopScoreService.list(new LambdaQueryWrapper<ShopScore>().eq(ShopScore::getShopId, shop.getId()));
+ double v = list.stream().map(ShopScore::getScore).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
+ shop.setScore(v);
+ }
return R.ok(shopList);
}
return R.ok(new ArrayList<>());
@@ -404,9 +439,6 @@
@ApiOperation(value = "绑定门店", tags = {"小程序-个人中心"})
public R<Void> bindShop(@ApiParam("门店id") @RequestParam Integer shopId) {
AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
- if(null != appUser.getShopId()){
- return R.fail("不能重复绑定门店");
- }
appUser.setShopId(shopId);
return appUserClient.editAppUserById(appUser);
}
--
Gitblit v1.7.1