czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松 2025-09-26 16:06:46 +08:00
parent fac4805780 66a4f44d6d
commit 6e1cb349ad
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java
View File

@ -252,18 +252,11 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
coupon.setUseShops("所有门店"); coupon.setUseShops("所有门店");
} else if ("custom".equals(coupon.getUseShopType())) { } else if ("custom".equals(coupon.getUseShopType())) {
if (StrUtil.isNotBlank(coupon.getUseShops())) { if (StrUtil.isNotBlank(coupon.getUseShops())) {
List<String> shopNames = shopInfoService.listAs(new QueryWrapper().select(ShopInfo::getShopName) coupon.setUseShops(coupon.getUseShops() + "," + coupon.getShopId());
QueryWrapper queryWrapper = QueryWrapper.create().select(ShopInfo::getShopName)
.in(ShopInfo::getId, Arrays.stream(coupon.getUseShops().split(",")).map(Long::parseLong).toList()) .in(ShopInfo::getId, Arrays.stream(coupon.getUseShops().split(",")).map(Long::parseLong).toList())
.eq(ShopInfo::getStatus, 1), String.class); .eq(ShopInfo::getStatus, 1);
Long mainId = shopInfoService.getMainIdByShopId(coupon.getShopId()); List<String> shopNames = shopInfoService.listAs(queryWrapper, String.class);
String mainShopName = "";
if (!mainId.equals(coupon.getShopId())) {
ShopInfo mainShop = shopInfoService.getById(mainId);
mainShopName = mainShop.getShopName();
}
if (StrUtil.isNotBlank(mainShopName)) {
coupon.setUseShops(mainShopName);
}
if (CollUtil.isNotEmpty(shopNames)) { if (CollUtil.isNotEmpty(shopNames)) {
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
for (int i = 0; i < shopNames.size(); i++) { for (int i = 0; i < shopNames.size(); i++) {
@ -276,10 +269,7 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
break; break;
} }
} }
if (StrUtil.isNotBlank(mainShopName)) { coupon.setUseShops(result.toString());
coupon.setUseShops(coupon.getUseShops() + ",");
}
coupon.setUseShops(coupon.getUseShops() + result);
} }
} }
} }