diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java index b8153e8c..144bb79e 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java @@ -1580,25 +1580,6 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl canDoOrderCutPriceActivity = shopActivityCutpriceService.canDoOrderCutPriceActivity(acId, userId); - if (!canDoOrderCutPriceActivity.getFirst()) { - logger.error(canDoOrderCutPriceActivity.getSecond()); - throw new ApiException(I18nUtil._("砍价活动未达标,请继续努力,再提交订单。")); - } - } // 注:(重要)邮费检测和计算 dealWithCalFee(calFreight, cartData, chainId, isEdu); @@ -1626,22 +1607,6 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl pair = shopOrderInfoService.checkBookingOrderArgs(checkedStore, bookingState, bookingBeginTime, bookingEndTime); -// if (!pair.getFirst()) { -// throw new ApiException(I18nUtil._(pair.getSecond())); -// } -// -// cartData.put("booking_state", bookingState); -// cartData.put("booking_begin_time", bookingBeginTime); -// cartData.put("booking_end_time", bookingEndTime); -// cartData.put("booking_at", bookingAt); -// } // 添加保存订单(关键方法) List orderIdRow = addOrder(cartData, true, false, null); @@ -1667,6 +1632,26 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl canDoOrderCutPriceActivity = shopActivityCutpriceService.canDoOrderCutPriceActivity(acId, userId); + if (!canDoOrderCutPriceActivity.getFirst()) { + logger.error(canDoOrderCutPriceActivity.getSecond()); + throw new ApiException(I18nUtil._("砍价活动未达标,请继续努力,再提交订单。")); + } + } + // 判断是否拼团购买 if (gbId != null) { QueryWrapper historyQueryWrapper = new QueryWrapper<>();