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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
GYJ
2025-03-11 14:44:10 +08:00
parent 8c4225b2b9 6d74d26ff5
commit 52b928abbf
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.czg.service.account.service.impl; package com.czg.service.account.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@@ -163,6 +164,9 @@ public class ShopActivateServiceImpl extends ServiceImpl<ShopActivateMapper, Sho
private List<ShopCoupon> getCoupons(String couponJson) { private List<ShopCoupon> getCoupons(String couponJson) {
Map<String, Integer> couponMap = JSONObject.parseObject(couponJson, new TypeReference<>() { Map<String, Integer> couponMap = JSONObject.parseObject(couponJson, new TypeReference<>() {
}); });
if (couponMap.isEmpty()) {
return new ArrayList<>();
}
List<ShopCoupon> list = couponService.queryChain() List<ShopCoupon> list = couponService.queryChain()
.select(ShopCoupon::getId, ShopCoupon::getTitle, ShopCoupon::getLeftNumber) .select(ShopCoupon::getId, ShopCoupon::getTitle, ShopCoupon::getLeftNumber)
.in(ShopCoupon::getId, couponMap.keySet()) .in(ShopCoupon::getId, couponMap.keySet())

2
cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java
View File

@@ -238,7 +238,7 @@ public abstract class PrinterHandler {
// 判断订单是否是先付费或者已结算 // 判断订单是否是先付费或者已结算
if (!"after-pay".equals(orderInfo.getPayMode()) && (OrderStatusEnums.UNPAID.getCode().equals(orderInfo.getStatus()) || OrderStatusEnums.CANCELLED.getCode().equals(orderInfo.getStatus()))) { if (!"after-pay".equals(orderInfo.getPayMode()) && (OrderStatusEnums.UNPAID.getCode().equals(orderInfo.getStatus()) || OrderStatusEnums.CANCELLED.getCode().equals(orderInfo.getStatus()))) {
log.warn("此订单未支付, 订单信息: {}", orderInfo); log.warn("此订单未支付, 订单信息: {}", orderInfo);
return; // return;
} }
List<?> categoryIds = JSONObject.parseObject(StrUtil.emptyToDefault(machine.getCategoryIds(), "[]"), List.class); List<?> categoryIds = JSONObject.parseObject(StrUtil.emptyToDefault(machine.getCategoryIds(), "[]"), List.class);