diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java index 46e3485..307e511 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java @@ -112,7 +112,7 @@ public class ConsMsgConsumer { if (Objects.nonNull(tbConsInfo)) { - if (N.gt(tbConsInfo.getConWarning(), tbConsInfo.getStockNumber())) { + if (N.gt(tbConsInfo.getConWarning(), tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()).abs())) { String key = redisUtil.getMessage(RedisCst.ORDER_MESSAGE.concat(tbConsInfo.getShopId().toString()).concat("#").concat(tbConsInfo.getId().toString())); if (Objects.isNull(key)) { diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index fe39492..55d9c39 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -880,7 +880,7 @@ public class PayService { flow.setBizCode("accountReturnPay"); flow.setBizName("会员储值卡退款"); flow.setType("+"); - flow.setAmount(orderInfo.getOrderAmount()); + flow.setAmount(newOrderInfo.getOrderAmount()); flow.setBalance(user.getAmount()); flow.setCreateTime(new Date()); tbShopUserFlowMapper.insert(flow);