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

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

Browse Source
This commit is contained in:
gong
2025-12-08 17:43:38 +08:00
parent 03482e745d 8a696ff9e2
commit ccd6fc3a87
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
View File

@@ -106,9 +106,11 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
Map<Long, ShopCoupon> couponMap = shopCouponService.list(new QueryWrapper().in(ShopCoupon::getId, couponIdList)).stream().collect(Collectors.toMap(ShopCoupon::getId, v -> v)); Map<Long, ShopCoupon> couponMap = shopCouponService.list(new QueryWrapper().in(ShopCoupon::getId, couponIdList)).stream().collect(Collectors.toMap(ShopCoupon::getId, v -> v));
couponInfoDTOS.forEach(item -> { couponInfoDTOS.forEach(item -> {
ShopCoupon shopCoupon = couponMap.get(item.getId()); ShopCoupon shopCoupon = couponMap.get(item.getId());
if (shopCoupon != null) {
shopCoupon.setInfo(); if (shopCoupon == null) {
return;
} }
shopCoupon.setInfo();
couponInfoVOS.add(new CouponInfoVO().setCoupon(shopCoupon).setNum(item.getNum())); couponInfoVOS.add(new CouponInfoVO().setCoupon(shopCoupon).setNum(item.getNum()));
}); });
} }

1
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
View File

@@ -95,6 +95,7 @@
consStockFlow.setInOutItem(InOutItemEnum.MANUAL_IN.value()); consStockFlow.setInOutItem(InOutItemEnum.MANUAL_IN.value());
consStockFlow.setCreateUserId(createUserId); consStockFlow.setCreateUserId(createUserId);
consStockFlow.setCreateUserName(createUserName); consStockFlow.setCreateUserName(createUserName);
consStockFlow.setVendorId(param.getVendorId());
String conId = entity.getConId(); String conId = entity.getConId();
ConsInfo consInfo; ConsInfo consInfo;
if (StrUtil.isBlank(entity.getConId())) { if (StrUtil.isBlank(entity.getConId())) {