update

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

@@ -1180,6 +1180,7 @@ public class MarketServiceImpl implements MarketService {
                             if (couponCustomerRelevance.getType() == 5) {
                                 discountAmount = orderServe.getPrice().multiply(BigDecimal.ONE.subtract(couponCustomerRelevance.getDiscountPercent()));
                             }
+
                             BigDecimal actualDiscountAmount = orderServe.getPayPrice().min(discountAmount);
 
                             //新增外部券抵扣情况记录
@@ -1365,7 +1366,7 @@ public class MarketServiceImpl implements MarketService {
     @Async
     @Override
     public void asyncAutoSetCoupon(Integer couponCustomerRelevanceId, Integer orderId) {
-        this.setUpInnerCoupon(orderId,Lists.newArrayList(couponCustomerRelevanceId));
+        this.setUpInnerCoupon(orderId, Lists.newArrayList(couponCustomerRelevanceId));
         //结算订单
         this.calcOrderAmount(orderId);
     }

src/main/java/com/gogirl/application/product/mall/impl/MallCategoryServiceImpl.java

@@ -39,9 +39,8 @@ public class MallCategoryServiceImpl extends ServiceImpl<CategoryMapper, MallCat
 
         for (MallCategory mallCategory : list) {
             if (mallCategory.getId().equals(subTreeId)) {
-                List<MallCategory> clone = SerializationUtils.clone((new ArrayList<>(mallCategory.getChildList())));
-                if (ListUtil.isNotEmpty(clone)) {
-                    return clone;
+                if (ListUtil.isNotEmpty(mallCategory.getChildList())) {
+                    return SerializationUtils.clone((new ArrayList<>(mallCategory.getChildList())));
                 }
             } else if (ListUtil.isNotEmpty(mallCategory.getChildList())) {
                 this.findSubTree(mallCategory.getChildList(), subTreeId);

src/main/java/com/gogirl/infrastructure/mapper/market/coupon/CouponCustomerRelevanceMapper.java

@@ -37,6 +37,7 @@ public interface CouponCustomerRelevanceMapper extends BaseMapper<CouponCustomer
      */
     List<Integer> queryCouponCustomerServeRelevance(Integer couponId);
 
+
     List<CouponCustomerRelevance> selectByOrderTimes();
 
 

src/main/resources/application.yml

 spring:
   profiles:
-    active: pre
+    active: prod
   servlet:
     #文件上传最大容量
     multipart:

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

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