From 11e61cc9f438225d778c3b688e55caa8a4989cfa Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 10 一月 2025 20:11:38 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 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 1a01bec..963c924 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
@@ -363,20 +363,6 @@
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);
- }
/**
@@ -413,7 +399,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()){
@@ -451,6 +437,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);
@@ -557,7 +550,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()){
@@ -600,7 +593,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();
@@ -650,7 +643,8 @@
@GetMapping("/getBankSerialNumber")
@ApiOperation(value = "获取行联号", tags = {"门店后台-财务管理-提现明细"})
public R<List<ReceiverBankChannel>> getBankSerialNumber(String name){
- List<ReceiverBankChannel> list = receiverBankChannelService.list(new LambdaQueryWrapper<ReceiverBankChannel>().like(ReceiverBankChannel::getName, name));
+ List<ReceiverBankChannel> list = receiverBankChannelService.list(new LambdaQueryWrapper<ReceiverBankChannel>()
+ .like(ReceiverBankChannel::getName, name));
return R.ok(list);
}
--
Gitblit v1.7.1