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

Compare commits

base: czg_team:84acedfff6b0dcc4b74cf9c08e9921f06b41e47b
Branches Tags
czg_team:master
czg_team:test
czg_team:dev
czg_team:backup-250910
czg_team:prod
..
compare: czg_team:f32aa4c7a0173d0d62b7616ed5d72e770e4b3ab5
Branches Tags
czg_team:test
czg_team:dev
czg_team:backup-250910
czg_team:prod
czg_team:master

No commits in common. "84acedfff6b0dcc4b74cf9c08e9921f06b41e47b" and "f32aa4c7a0173d0d62b7616ed5d72e770e4b3ab5" have entirely different histories.
84acedfff6 ... f32aa4c7a0

1 changed files with 5 additions and 15 deletions
Show Stats Expand all files Collapse all files

20
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java
View File

@ -1305,7 +1305,6 @@ public class ShopSyncServiceImpl implements ShopSyncService {
return; return;
} }
if ("only".equals(couponSource.getUseShopType())) { if ("only".equals(couponSource.getUseShopType())) {
upIsDel(couponId);
return; return;
} }
List<Long> ids = new ArrayList<>(); List<Long> ids = new ArrayList<>();
@ -1328,16 +1327,14 @@ public class ShopSyncServiceImpl implements ShopSyncService {
couponSource.setId(null); couponSource.setId(null);
switch (type) { switch (type) {
case 1://新增 case 1://新增
saveCouponsForShops(null, ids, couponSource, couponId); saveCouponsForShops(ids, couponSource, couponId);
break; break;
case 2://先删除再新增 case 2://先删除再新增
List<ShopCoupon> couponList = couponService.list(new QueryWrapper().eq(ShopCoupon::getSyncId, couponId));
Map<Long, Long> map = couponList.stream().collect(Collectors.toMap(ShopCoupon::getShopId, ShopCoupon::getId));
deleteCouponsBySyncId(couponId); deleteCouponsBySyncId(couponId);
saveCouponsForShops(map, ids, couponSource, couponId); saveCouponsForShops(ids, couponSource, couponId);
break; break;
case 3:// 删除 case 3:// 删除
upIsDel(couponId); deleteCouponsBySyncId(couponId);
break; break;
default: default:
// 处理未知类型，可根据业务需求抛出异常或忽略 // 处理未知类型，可根据业务需求抛出异常或忽略
@ -1345,7 +1342,7 @@ public class ShopSyncServiceImpl implements ShopSyncService {
} }
} }
private void saveCouponsForShops(Map<Long, Long> map, List<Long> ids, ShopCoupon coupon, Long couponId) { private void saveCouponsForShops(List<Long> ids, ShopCoupon coupon, Long couponId) {
List<Long> couponFoodIds = new ArrayList<>(); List<Long> couponFoodIds = new ArrayList<>();
if (StrUtil.isNotBlank(coupon.getFoods()) && ",".equals(coupon.getFoods())) { if (StrUtil.isNotBlank(coupon.getFoods()) && ",".equals(coupon.getFoods())) {
if (StrUtil.isNotBlank(coupon.getFoods()) && !",".equals(coupon.getFoods())) { if (StrUtil.isNotBlank(coupon.getFoods()) && !",".equals(coupon.getFoods())) {
@ -1364,19 +1361,12 @@ public class ShopSyncServiceImpl implements ShopSyncService {
coupon.setShopId(id); coupon.setShopId(id);
coupon.setSyncId(couponId); coupon.setSyncId(couponId);
coupon.setId(null); coupon.setId(null);
if (CollUtil.isNotEmpty(map) && map.containsKey(id)) {
coupon.setId(map.get(id));
}
couponService.save(coupon); couponService.save(coupon);
} }
} }
private void upIsDel(Long couponId) { private void deleteCouponsBySyncId(Long couponId) {
couponService.update(new ShopCoupon().setIsDel(1), new QueryWrapper() couponService.update(new ShopCoupon().setIsDel(1), new QueryWrapper()
.eq(ShopCoupon::getSyncId, couponId)); .eq(ShopCoupon::getSyncId, couponId));
} }
private void deleteCouponsBySyncId(Long couponId) {
couponService.remove(new QueryWrapper().eq(ShopCoupon::getSyncId, couponId));
}
} }