95966f4b3edd27029ec3c7bd34a38ba8aa717a42..b27420f3e0cbb0de34c34ddd308dd4baf7d4b225
2024-09-10 Cui Zhi Feng
Merge remote-tracking branch 'origin/master-v2' into master-v2
b27420 对比 | 目录
2024-09-10 Cui Zhi Feng
取消订单 优惠券不存在
d26e76 对比 | 目录
已修改2个文件
7 ■■■■ 文件已修改
src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/service/payment/UserPaymentV3Service.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
@@ -130,7 +130,7 @@
                        BigDecimal markupOne = getAmount(oi.getMarkupOne());
                        BigDecimal markupTwo = getAmount(oi.getMarkupTwo());
                        BigDecimal ppPrice = markupOne.add(markupTwo).subtract(oi.getCouponAmount());//1次加价+2次加价-优惠券金额
                        BigDecimal ppPrice = markupOne.add(markupTwo).subtract(getAmount(oi.getCouponAmount()));//1次加价+2次加价-优惠券金额
                        lackFeePlatform = lackFeePlatform.add(ppPrice.multiply(new BigDecimal(lackNum)));
                    } else if (Constants.CHECK_TYPE.replace.name().equals(type)) {
                        replaceNum = num == null ? 0 : num;
src/main/java/com/mzl/flower/service/payment/UserPaymentV3Service.java
@@ -457,7 +457,10 @@
        revertPointGoodsRecord(order.getId());
        //恢复优惠券
        couponRecordService.cancelCouponUsage(order.getId());
        String memberCouponId = order.getMemberCouponId();
        if(StringUtils.isNotEmpty(memberCouponId)) {
            couponRecordService.cancelCouponUsage(order.getId());
        }
    }
    private void revertPointGoodsRecord(String orderId){