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

显式抛出

Browse Source
This commit is contained in:
wangw
2025-11-14 16:52:09 +08:00
parent b4a08d5f69
commit 5ccdef60ae
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -316,7 +316,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
} }
@Override @Override
public OrderInfo checkOrderPay(CheckOrderPay param) throws OrderValidateException, OrderCancelException { public OrderInfo checkOrderPay(CheckOrderPay param) throws OrderValidateException, OrderCancelException, CzgException {
AssertUtil.isNull(param.getOrderId(), "支付失败，订单id不能为空"); AssertUtil.isNull(param.getOrderId(), "支付失败，订单id不能为空");
OrderInfo orderInfo = getById(param.getOrderId()); OrderInfo orderInfo = getById(param.getOrderId());
if (!orderInfo.getStatus().equals(OrderStatusEnums.UNPAID.getCode())) { if (!orderInfo.getStatus().equals(OrderStatusEnums.UNPAID.getCode())) {
@@ -535,9 +535,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
upOrderPayInfo(orderInfo, param); upOrderPayInfo(orderInfo, param);
orderDetailService.updateBatch(orderDetails); orderDetailService.updateBatch(orderDetails);
return orderInfo; return orderInfo;
} }
@@ -601,7 +598,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
*/ */
private void couponExecute(List<OrderDetail> orderDetails, CheckOrderPay param, BigDecimalDTO totalAmount, BigDecimalDTO tempAmount, private void couponExecute(List<OrderDetail> orderDetails, CheckOrderPay param, BigDecimalDTO totalAmount, BigDecimalDTO tempAmount,
BigDecimalDTO prodCouponAmount, BigDecimalDTO oneGiftAmount, BigDecimalDTO twoHalfAmount, BigDecimalDTO prodCouponAmount, BigDecimalDTO oneGiftAmount, BigDecimalDTO twoHalfAmount,
BigDecimalDTO rateAmount, BigDecimalDTO fullReductionAmount) { BigDecimalDTO rateAmount, BigDecimalDTO fullReductionAmount) throws CzgException {
if (CollUtil.isNotEmpty(param.getCouponList()) && (!param.isFreeDine() || param.isWithCoupon())) { if (CollUtil.isNotEmpty(param.getCouponList()) && (!param.isFreeDine() || param.isWithCoupon())) {
QueryWrapper couponRecordQuery = new QueryWrapper(); QueryWrapper couponRecordQuery = new QueryWrapper();
couponRecordQuery.in(MkShopCouponRecord::getId, param.getCouponList()); couponRecordQuery.in(MkShopCouponRecord::getId, param.getCouponList());
@@ -762,7 +759,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
* @param isVipShare 门槛计算是否与会员价共享 * @param isVipShare 门槛计算是否与会员价共享
*/ */
private void thresholdCalculation(List<OrderDetail> orderDetails, BigDecimal fullAmount, boolean isAllFoods, List<Long> couponFoodIds, private void thresholdCalculation(List<OrderDetail> orderDetails, BigDecimal fullAmount, boolean isAllFoods, List<Long> couponFoodIds,
boolean isVipPrice, boolean isTimeDiscountShare, boolean isVipShare, String title) { boolean isVipPrice, boolean isTimeDiscountShare, boolean isVipShare, String title) throws CzgException {
BigDecimal calculationAmount = BigDecimal.ZERO; BigDecimal calculationAmount = BigDecimal.ZERO;
for (OrderDetail orderDetail : orderDetails) { for (OrderDetail orderDetail : orderDetails) {
if (orderDetail.getIsGift() == 1 || orderDetail.getIsTemporary() == 1) { if (orderDetail.getIsGift() == 1 || orderDetail.getIsTemporary() == 1) {