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

This commit is contained in:
张松
2025-09-26 15:54:12 +08:00

View File

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