From 66abc3ce8009e42790c073d752a9a36e022ed668 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 08:41:57 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 4 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 cef7042..936e3bd 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
@@ -4,6 +4,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.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.feignClient.AppUserShopClient;
import com.ruoyi.account.api.model.AppUser;
@@ -33,10 +34,13 @@
import io.swagger.annotations.ApiParam;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -79,6 +83,8 @@
private TechnicianSubscribeService technicianSubscribeService;
@Resource
private TechnicianService technicianService;
+ @Resource
+ private ReceiverBankChannelService receiverBankChannelService;
@@ -132,6 +138,7 @@
userShop.setUserId(sysUser.getUserId());
userShop.setShopId(shop.getId());
userShop.setRoleType(1);
+ userShop.setNickName(sysUser.getNickName());
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
if(null == data || data.size() == 0){
userShop = new UserShop();
@@ -139,6 +146,7 @@
userShop.setShopId(shop.getId());
userShop.setRoleType(1);
userShop.setRoleId(2L);
+ userShop.setCreateTime(LocalDateTime.now());
userShopClient.saveUserShop(userShop);
}
}else{
@@ -182,6 +190,7 @@
Shop shop = shopService.getById(id);
shop.setDelFlag(1);
shopService.updateById(shop);
+ appUserClient.clearBindShop(shop.getId());
UserShop userShop = new UserShop();
userShop.setShopId(shop.getId());
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
@@ -227,6 +236,12 @@
String phone = shop.getPhone();
if (!shopService.cheUserByPhone(phone)) {
return R.fail("该手机号未注册");
+ }
+ if (shop.getPid()!=null){
+ Shop shopP = shopService.getById(shop.getPid());
+ if (shopP.getPid()!=null&&shopP.getPid()!=0&& shopP.getPid().equals(shop.getId())){
+ return R.fail("门店之间不能互相作为上级门店");
+ }
}
String city = TencentMapUtil.inverseGeographicalAnalysis(shop.getLongitude(), shop.getLatitude(), false);
shop.setProvinceCode(city.substring(0, 2) + "0000");
@@ -406,7 +421,7 @@
return R.ok(new ArrayList<>());
}
List<Integer> shopIds = appUserShopList.stream().map(AppUserShop::getShopId).collect(Collectors.toList());
- List<Shop> shopList = shopService.listByIds(shopIds);
+ List<Shop> shopList = shopService.list(new LambdaQueryWrapper<Shop>().in(Shop::getId, shopIds).eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
if(null != appUser.getShopId()){
Optional<Shop> first = shopList.stream().filter(s -> s.getId().equals(appUser.getShopId())).findFirst();
if(first.isPresent()){
@@ -424,8 +439,14 @@
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();
+ double v = 5;
+ if(list.size() > 0){
+ v = list.stream().map(ShopScore::getScore).reduce(BigDecimal.ZERO, BigDecimal::add)
+ .divide(new BigDecimal(list.size()), new MathContext(2, RoundingMode.HALF_EVEN)).doubleValue();
+ }
shop.setScore(v);
+ ShopScore one = shopScoreService.getOne(new LambdaQueryWrapper<ShopScore>().eq(ShopScore::getAppUserId, userid).eq(ShopScore::getShopId, shop.getId()).last(" order by create_time desc limit 0, 1"));
+ shop.setMyScore(null == one ? "0" : one.getScore().toString());
}
return R.ok(shopList);
}
@@ -438,6 +459,13 @@
@GetMapping("/bindShop")
@ApiOperation(value = "绑定门店", tags = {"小程序-个人中心"})
public R<Void> bindShop(@ApiParam("门店id") @RequestParam Integer shopId) {
+ Shop shop = shopService.getById(shopId);
+ if(null == shop || shop.getDelFlag() == 1){
+ return R.fail("绑定店铺不存在");
+ }
+ if(2 == shop.getStatus()){
+ return R.fail("绑定店铺已被冻结");
+ }
AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
appUser.setShopId(shopId);
return appUserClient.editAppUserById(appUser);
@@ -544,7 +572,7 @@
city = "510100";
}
city = city.substring(0, 4) + "00";
- LambdaQueryWrapper<Shop> wrapper = new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getCityCode, city);
+ LambdaQueryWrapper<Shop> wrapper = new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1).eq(Shop::getCityCode, city);
if(null != goodsId){
Goods goods = goodsService.getById(goodsId);
if(1 == goods.getType() && 1 == goods.getAppointStore()){
@@ -587,7 +615,7 @@
userShop.setUserId(userid);
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
List<Integer> collect = data.stream().map(UserShop::getShopId).collect(Collectors.toList());
- List<Shop> shops = shopService.listByIds(collect);
+ List<Shop> shops = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getId, collect).eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
List<VerifiableShopVo> list = new ArrayList<>();
for (Shop shop : shops) {
VerifiableShopVo vo = new VerifiableShopVo();
@@ -617,5 +645,30 @@
List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
return R.ok(list);
}
+
+ @ResponseBody
+ @GetMapping("/verifyAccountConfiguration")
+ @ApiOperation(value = "判断是否有提现账户", tags = {"门店后台-财务管理-提现明细"})
+ public R verifyAccountConfiguration(){
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ Shop shop = shopService.getById(sysUser.getObjectId());
+ if(StringUtils.hasLength(shop.getReceiverAccountNoEnc())){
+ return R.ok();
+ }
+ return R.fail("请先配置收款账户");
+ }
+
+
+
+ @ResponseBody
+ @GetMapping("/getBankSerialNumber")
+ @ApiOperation(value = "获取行联号", tags = {"门店后台-财务管理-提现明细"})
+ public R<List<ReceiverBankChannel>> getBankSerialNumber(String name){
+ List<ReceiverBankChannel> list = receiverBankChannelService.list(new LambdaQueryWrapper<ReceiverBankChannel>()
+ .like(ReceiverBankChannel::getName, name));
+ return R.ok(list);
+ }
+
}
--
Gitblit v1.7.1