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

桌位费问题

This commit is contained in:
wangw 2025-03-01 10:30:03 +08:00
parent 80a47a6f97
commit 80fb7be859
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,13 +201,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
if (packAmount.getPrice().compareTo(param.getPackFee()) != 0) { if (packAmount.getPrice().compareTo(param.getPackFee()) != 0) {
throw new ValidateException("生成订单失败，打包费不正确"); throw new ValidateException("生成订单失败，打包费不正确");
} }
BigDecimal seatAmount = BigDecimal.ZERO; log.info("下单3 打包费{} 金额{}", param.getPackFee(), param.getOriginAmount());
if (shopInfo.getIsTableFee().equals(0)) {
seatAmount = shopInfo.getTableFee().multiply(new BigDecimal(param.getSeatNum()));
}
log.info("下单3 打包费{} 餐位费{} 金额{}", param.getPackFee(), seatAmount, param.getOriginAmount());
//总金额 //总金额
if (totalAmount.add(param.getPackFee()).add(seatAmount).compareTo(param.getOriginAmount()) != 0) { if (totalAmount.add(param.getPackFee()).compareTo(param.getOriginAmount()) != 0) {
throw new ValidateException("生成订单失败，订单金额不正确"); throw new ValidateException("生成订单失败，订单金额不正确");
} }
//生成订单 //生成订单
@ -440,6 +436,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
public void payCallBackOrder(@NotBlank String orderNo, @NotNull JSONObject resultJson) { public void payCallBackOrder(@NotBlank String orderNo, @NotNull JSONObject resultJson) {
CzgPayNotifyDTO czgCallBackDto = JSONObject.parseObject(resultJson.toString(), CzgPayNotifyDTO.class); CzgPayNotifyDTO czgCallBackDto = JSONObject.parseObject(resultJson.toString(), CzgPayNotifyDTO.class);
OrderPayment payment = paymentService.queryChain().eq(OrderPayment::getOrderNo, orderNo).one(); OrderPayment payment = paymentService.queryChain().eq(OrderPayment::getOrderNo, orderNo).one();
if (StrUtil.isNotBlank(payment.getTradeNumber())) {
log.info("订单处理过，payment id：{}", payment.getId());
return;
}
paymentService.updateChain() paymentService.updateChain()
.set(OrderPayment::getTradeNumber, czgCallBackDto.getPayOrderId()) .set(OrderPayment::getTradeNumber, czgCallBackDto.getPayOrderId())
.set(OrderPayment::getRespJson, resultJson.toString()) .set(OrderPayment::getRespJson, resultJson.toString())
@ -633,7 +633,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
orderInfo.setSeatNum(param.getSeatNum()); orderInfo.setSeatNum(param.getSeatNum());
} }
orderInfo.setPlaceNum(param.getPlaceNum()); orderInfo.setPlaceNum(param.getPlaceNum());
orderInfo.setOriginAmount(orderInfo.getOriginAmount().add(param.getOriginAmount())); orderInfo.setOriginAmount(orderInfo.getOriginAmount().add(param.getOriginAmount()).add(orderInfo.getSeatAmount()));
orderInfo.setOrderAmount(orderInfo.getOriginAmount()); orderInfo.setOrderAmount(orderInfo.getOriginAmount());
orderInfo.setPackFee(orderInfo.getPackFee().add(param.getPackFee())); orderInfo.setPackFee(orderInfo.getPackFee().add(param.getPackFee()));
orderInfo.setRoundAmount(BigDecimal.ZERO); orderInfo.setRoundAmount(BigDecimal.ZERO);