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

充值可用店铺列表

Browse Source
This commit is contained in:
张松
2025-09-28 17:57:43 +08:00
parent c34a1d1f88
commit a12b87d47e
5 changed files with 57 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,10 +20,7 @@ import com.czg.market.entity.ShopCoupon;
import com.czg.market.service.MkShopCouponRecordService;
import com.czg.market.service.MkShopRechargeDetailService;
import com.czg.market.service.ShopCouponService;
import com.czg.market.vo.CouponInfoVO;
import com.czg.market.vo.MkShopRechargeDetailVO;
import com.czg.market.vo.MkShopRechargeVO;
import com.czg.market.vo.RechargeListVO;
import com.czg.market.vo.*;
import com.czg.order.entity.OrderInfo;
import com.czg.service.market.enums.OrderStatusEnums;
import com.czg.utils.AssertUtil;
@@ -214,4 +211,29 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
});
return rechargeListVOS;
}
@Override
public List<MkShopRechargeShopListVO> shopList(Long shopId, String shopName) {
Long mainShopId = shopInfoService.getMainIdByShopId(shopId);
MkShopRechargeVO rechargeVO = detail(shopId);
List<Long> shopIdList = rechargeVO.getShopIdList();
QueryWrapper queryWrapper = new QueryWrapper().like(ShopInfo::getShopName, shopName);
if ("all".equals(rechargeVO.getUseType())) {
queryWrapper.and(q -> {
q.eq(ShopInfo::getMainId, mainShopId).or(q1 -> {
q1.eq(ShopInfo::getId, mainShopId);
});
});
}else {
shopIdList.add(shopId);
queryWrapper.in(ShopInfo::getId, shopIdList);
}
return shopInfoService.list(queryWrapper)
.stream()
.map(shop -> BeanUtil.copyProperties(shop, MkShopRechargeShopListVO.class))
.toList();
}
}

2
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@@ -824,7 +824,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
}
if (StrUtil.isNotBlank(payment.getTradeNumber())) {
log.info("订单处理过，payment id：{}", payment.getId());
return;
// return;
}
payment.setTradeNumber(czgCallBackDto.getPayOrderId());
payment.setRespJson(resultJson.toString());