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

Browse Source
This commit is contained in:
张松
2025-09-26 15:54:12 +08:00
parent f79f26d155 80cc0c2497
commit 72f5d23db6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,7 +246,8 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
coupon.setFoods("全部商品"); coupon.setFoods("全部商品");
} }
if ("only".equals(coupon.getUseShopType())) { if ("only".equals(coupon.getUseShopType())) {
coupon.setUseShops("仅本店"); ShopInfo shopInfo = shopInfoService.getById(coupon.getShopId());
coupon.setUseShops("仅本店:" + shopInfo.getShopName());
} else if ("all".equals(coupon.getUseShopType())) { } else if ("all".equals(coupon.getUseShopType())) {
coupon.setUseShops("所有门店"); coupon.setUseShops("所有门店");
} else if ("custom".equals(coupon.getUseShopType())) { } else if ("custom".equals(coupon.getUseShopType())) {
@@ -278,7 +279,7 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
if (StrUtil.isNotBlank(mainShopName)) { if (StrUtil.isNotBlank(mainShopName)) {
coupon.setUseShops(coupon.getUseShops() + ","); coupon.setUseShops(coupon.getUseShops() + ",");
} }
coupon.setUseShops(result.toString()); coupon.setUseShops(coupon.getUseShops() + result);
} }
} }
} }