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

新客立减 0的情况

Browse Source
This commit is contained in:
wangw
2025-09-28 17:41:27 +08:00
parent 629cb43741
commit c34a1d1f88
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -826,7 +826,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
log.info("订单处理过，payment id：{}", payment.getId()); log.info("订单处理过，payment id：{}", payment.getId());
return; return;
} }
payment.setTradeNumber( czgCallBackDto.getPayOrderId()); payment.setTradeNumber(czgCallBackDto.getPayOrderId());
payment.setRespJson(resultJson.toString()); payment.setRespJson(resultJson.toString());
paymentService.updateById(payment); paymentService.updateById(payment);
@@ -968,7 +968,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
} }
} else { } else {
//新客立减 //新客立减
if (orderInfo.getNewCustomerDiscountAmount() != null) { if (orderInfo.getNewCustomerDiscountAmount() != null && orderInfo.getNewCustomerDiscountAmount().compareTo(BigDecimal.ZERO) > 0) {
newConsumerDiscountRecordService.useDiscount(shopUser.getId(), orderInfo.getId(), orderInfo.getNewCustomerDiscountAmount()); newConsumerDiscountRecordService.useDiscount(shopUser.getId(), orderInfo.getId(), orderInfo.getNewCustomerDiscountAmount());
} }
//积分使用 //积分使用
@@ -1157,7 +1157,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
orderInfo.setStatus(OrderStatusEnums.DONE.getCode()); orderInfo.setStatus(OrderStatusEnums.DONE.getCode());
if (param.getPointsDiscountAmount().compareTo(BigDecimal.ZERO) > 0) { if (param.getPointsDiscountAmount().compareTo(BigDecimal.ZERO) > 0) {
orderInfo.setPayType(PayEnums.VIP_PAY.getValue()); orderInfo.setPayType(PayEnums.VIP_PAY.getValue());
}else { } else {
orderInfo.setPayType(PayEnums.CASH_PAY.getValue()); orderInfo.setPayType(PayEnums.CASH_PAY.getValue());
} }
orderInfo.setPaidTime(LocalDateTime.now()); orderInfo.setPaidTime(LocalDateTime.now());