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

Merge branch 'dev' into prod

Browse Source
This commit is contained in:
wangw
2025-11-13 15:53:08 +08:00
parent 00daa7403b c3a0edc72b
commit c36bd16d15
6 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -264,7 +264,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
@Override
@Transactional
public OrderInfo createOrder(OrderInfoAddDTO param) throws ValidateException{
public OrderInfo createOrder(OrderInfoAddDTO param) throws ValidateException {
ShopInfo shopInfo = shopInfoService.getById(param.getShopId());
AssertUtil.isNull(shopInfo, "生成订单失败，店铺信息不存在");
if (!shopInfo.getEatModel().contains(param.getDineMode())) {
@@ -524,16 +524,21 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
支付计算金额不正确，
订单Id:{},支付计算金额为:{},商品总金额:{},临时菜价格:{},打包费:{}，餐位费:{},
传递支付金额为:{},商品券:{},其它券:{},新客立减:{},满减活动:{},
商家最终改价:{},积分抵扣金额:{},抹零金额:{}
超级会员折扣金额:{},商家最终改价:{},积分抵扣金额:{},抹零金额:{}
""",
orderInfo.getId(), newTotalAmount, totalAmount.getPrice(), tempAmount.getPrice(), packAmount.getPrice(), orderInfo.getSeatAmount(),
param.getOrderAmount(), param.getProductCouponDiscountAmount(), param.getOtherCouponDiscountAmount(), param.getNewCustomerDiscountAmount(),
discountActAmount, param.getDiscountAmount(), param.getPointsDiscountAmount(), param.getRoundAmount());
discountActAmount, param.getVipDiscountAmount(), param.getDiscountAmount(), param.getPointsDiscountAmount(), param.getRoundAmount());
throw new OrderValidateException("生成支付订单失败，支付金额不正确");
}
orderInfo.setPackFee(packAmount.getPrice());
//生成订单 //discount_info 所有折扣 几折 折扣金额 满减金额 优惠券金额 积分抵扣金额 抹零
upOrderPayInfo(orderInfo, param);
orderDetailService.updateBatch(orderDetails);
return orderInfo;
}