|
|
@@ -259,6 +259,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
|
|
|
private final UserDistributeSharedRelateUnbindMapper userDistributeSharedRelateUnbindMapper;
|
|
|
|
|
|
+ private final EquipmentActivityReduceMapper equipmentActivityReduceMapper;
|
|
|
+
|
|
|
private final List<String> noChekGoodsTemp = List.of("Apple One", "Youtube", "Spotify");
|
|
|
|
|
|
@Transactional(rollbackFor = Throwable.class)
|
|
|
@@ -431,7 +433,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
|
if (sku != null) {
|
|
|
//扣除使用优惠券、余额的订单金额
|
|
|
- deductOrderMoney(orderDon, couponUser, payRequest.getBalance(), user, sku.getPrice(), goodsDon.getType(), payRequest.getGcCash(), payRequest.getGcpIds());
|
|
|
+ deductOrderMoney(orderDon, couponUser, payRequest.getBalance(), user, sku.getPrice(), goodsDon.getType(), payRequest.getGcCash(), payRequest.getGcpIds(), payRequest.getIsAcReduce());
|
|
|
}
|
|
|
|
|
|
if (isSpecificPrice && (orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0 || orderDon.getMoney().compareTo(specificPrice) != 0)) {
|
|
|
@@ -957,7 +959,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
|
orderDon.setRealMoney(orderDon.getMoney());
|
|
|
//扣除使用优惠券、余额的订单金额
|
|
|
- deductOrderMoney(orderDon, couponUser, payRequest.getBalance(), user, sku.getPrice(), goodsDon.getType(), payRequest.getGcCash(), payRequest.getGcpIds());
|
|
|
+ deductOrderMoney(orderDon, couponUser, payRequest.getBalance(), user, sku.getPrice(), goodsDon.getType(), payRequest.getGcCash(), payRequest.getGcpIds(), false);
|
|
|
this.saveOrUpdate(orderDon);
|
|
|
if (orderDon.getStatus() == OrderDon.Status.noPayment) {
|
|
|
jobManager.addJob(EXPIRY_TIME, () -> {
|
|
|
@@ -2035,7 +2037,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
/**
|
|
|
* 使用优惠营销 订单金额抵扣
|
|
|
*/
|
|
|
- public void deductOrderMoney(OrderDon orderDon, CouponUser couponUser, BigDecimal balance, User user, BigDecimal skuMoney, Integer goodsType, BigDecimal gcCash, List<Long> gcpIds) {
|
|
|
+ public void deductOrderMoney(OrderDon orderDon, CouponUser couponUser, BigDecimal balance, User user, BigDecimal skuMoney, Integer goodsType, BigDecimal gcCash, List<Long> gcpIds, Boolean isAcReduce) {
|
|
|
if (gcCash != null && gcCash.compareTo(BigDecimal.ZERO) > 0 && couponUser != null) {
|
|
|
throw BusinessRuntimeException.getInstance("现金卡不能与其他优惠叠加使用");
|
|
|
}
|
|
|
@@ -2085,6 +2087,11 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
|
return;
|
|
|
}
|
|
|
+ //针对设备 满减活动优惠 不支持使用优惠券等优惠
|
|
|
+ if (isAcReduce != null && isAcReduce && orderDon.getGoodsId() == 15) {
|
|
|
+ epOrderDonActivityReduce(orderDon);
|
|
|
+ return;
|
|
|
+ }
|
|
|
//存在优惠券
|
|
|
if (couponUser != null) {
|
|
|
Long couponId = couponUser.getCouponId();
|
|
|
@@ -2734,4 +2741,33 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
orderRefundService.refundRecord(orderDon, orderRefundReq.getRefundMoney(), null, goodsDon, sku, outNo, orderDon.getType().getType());
|
|
|
return;
|
|
|
}
|
|
|
+
|
|
|
+ public void epOrderDonActivityReduce(OrderDon orderDon) {
|
|
|
+ if (orderDon.getMoney().compareTo(Constant.FIVE_HUNDRED) < 0) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ DateTime now = DateTime.now();
|
|
|
+ EquipmentActivityReduce equipmentActivityReduce = equipmentActivityReduceMapper.selectOne(Wrappers.lambdaQuery(EquipmentActivityReduce.class)
|
|
|
+ .ge(EquipmentActivityReduce::getSt, now)
|
|
|
+ .lt(EquipmentActivityReduce::getEt, now)
|
|
|
+ .eq(EquipmentActivityReduce::getDeleted, true)
|
|
|
+ .last("limit 1"));
|
|
|
+ BigDecimal money = orderDon.getMoney();
|
|
|
+ BigDecimal acReduceMoney = BigDecimal.ZERO;
|
|
|
+ if (money.compareTo(Constant.FIVE_HUNDRED) >= 0 && money.compareTo(Constant.THOUSAND) < 0) {
|
|
|
+ //500-1000
|
|
|
+ acReduceMoney = equipmentActivityReduce.getF();
|
|
|
+ log.info("活动设备订单:{}达到500元资格,满减金额:{}", orderDon.getId(), acReduceMoney.divide(BigDecimal.valueOf(100)));
|
|
|
+ } else if (money.compareTo(Constant.THOUSAND) >= 0 && money.compareTo(Constant.TWO_THOUSAND) < 0) {
|
|
|
+ //1000-2000
|
|
|
+ acReduceMoney = equipmentActivityReduce.getQ();
|
|
|
+ log.info("活动设备订单:{}达到1000元资格,满减金额:{}", orderDon.getId(), acReduceMoney.divide(BigDecimal.valueOf(100)));
|
|
|
+ } else if (money.compareTo(Constant.TWO_THOUSAND) >= 0) {
|
|
|
+ //2000
|
|
|
+ acReduceMoney = equipmentActivityReduce.getTq();
|
|
|
+ log.info("活动设备订单:{}达到2000元资格,满减金额:{}", orderDon.getId(), acReduceMoney.divide(BigDecimal.valueOf(100)));
|
|
|
+ }
|
|
|
+ orderDon.setMoney(orderDon.getMoney().subtract(acReduceMoney));
|
|
|
+ orderDon.setCouponMoney(acReduceMoney);
|
|
|
+ }
|
|
|
}
|