update

src/main/java/com/gogirl/application/market/coupon/impl/MarketServiceImpl.java

@@ -688,7 +688,6 @@ public class MarketServiceImpl implements MarketService {
 
     @Override
     public void orderAmountReCalc(Integer orderId) {
-
         //订单使用的内部券
         List<CouponCustomerRelevance> innerCouponCustomerRelevanceServiceList = couponCustomerRelevanceService
                 .list(new LambdaQueryWrapper<CouponCustomerRelevance>()
@@ -711,6 +710,7 @@ public class MarketServiceImpl implements MarketService {
 
         //查询订单聚合
         OrderManage orderManage = orderManageMapper.selectById(orderId);
+
         List<OrderServe> orderServeList = orderServeMapper.selectList(new LambdaQueryWrapper<OrderServe>().eq(OrderServe::getOrderId, orderId));
         orderManage.setListOrderServer(orderServeList);
 
@@ -809,8 +809,8 @@ public class MarketServiceImpl implements MarketService {
         }
 
         //卡券之前删除订单服务和卡券关联
-        couponOrderRelevanceService.remove(new LambdaQueryWrapper<CouponOrderRelevance>()
-                .eq(CouponOrderRelevance::getOrderId, orderId));
+        couponOrderRelevanceService.remove(new LambdaQueryWrapper<CouponOrderRelevance>().eq(CouponOrderRelevance::getOrderId, orderId));
+
 
         //3、外部券
         if (ListUtil.isNotEmpty(outerCouponCustomerRelevanceServiceList)) {
@@ -879,6 +879,7 @@ public class MarketServiceImpl implements MarketService {
 
                     });
         }
+
         //4、内部券
         if (ListUtil.isNotEmpty(innerCouponCustomerRelevanceServiceList)) {
 
@@ -978,6 +979,7 @@ public class MarketServiceImpl implements MarketService {
                     .collect(Collectors.toList());
             freeInnerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevanceConsumer);
 
+
             //6、普通内部券
             List<CouponCustomerRelevance> normalInnerCouponCustomerRelevanceServiceList = innerCouponCustomerRelevanceServiceList
                     .stream()
@@ -1008,7 +1010,11 @@ public class MarketServiceImpl implements MarketService {
             if (freeInnerCouponCustomerRelevanceServiceList.size() > 1) {
                 throw new RRException("免单券券只能用一张");
             }
+
+
         }
+
+
         orderManageMapper.updateById(orderManage);
         orderServeService.updateBatchById(orderServeList);
     }

src/main/java/com/gogirl/domain/market/coupon/Coupon.java

@@ -32,8 +32,11 @@ public class Coupon implements Serializable {
     private BigDecimal reachingAmount;
 
     @ApiModelProperty("优惠折扣")
+    @Deprecated
     private BigDecimal discountPercent;
 
+    private BigDecimal discountRate;
+
     @DictParam(dictCode = "COUPON_TYPE", dictValueParam = "typeStr")
     @ApiModelProperty("优惠券类型:1.现金抵扣券;2.免单券；3满减券；4卸甲券；5 = 折扣券")
     private Integer type;

src/main/java/com/gogirl/domain/market/coupon/CouponCustomerRelevance.java

@@ -148,7 +148,7 @@ public class CouponCustomerRelevance implements Serializable {
                 //卡券折扣金额
                 .discountAmount(coupon.getDiscountAmount())
                 //卡券折扣
-                .discountPercent(coupon.getDiscountPercent())
+                .discountPercent(coupon.getDiscountRate())
                 //卡券支付基恩
                 .payAmount(coupon.getPayAmount())
                 //达到多少金额可用

src/main/java/com/gogirl/interfaces/order/serve/OrderManageController.java

@@ -270,7 +270,7 @@ public class OrderManageController {
     @ApiOperation("重算订单金额")
     @GetMapping("/technician/ordermanage/no_calcOrderAmount/{orderId}")
     public JsonResult<Void> calcOrderAmount(@PathVariable Integer orderId) {
-//        marketService.calcOrderAmount(orderId);
+        marketService.orderAmountReCalc(orderId);
         return JsonResult.success();
     }
 }

src/test/java/com/gogirl/Test.java

@@ -681,6 +681,11 @@ public class Test {
         marketService.calcOrderAmount(13431);
     }
 
+
+    @org.junit.Test
+    public void reCalcOrderAmount() {
+        marketService.orderAmountReCalc(14878);
+    }
     @Resource
     PurchaseSkuMapper purchaseSkuMapper;