Merge branch 'master-modify-cutAmount' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -288,7 +288,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 stringBuilder.append("违约金( ¥");
                 stringBuilder.append(amount);
                 stringBuilder.append(" x ");
-                stringBuilder.append(actualDay - noUsedDay);
+                stringBuilder.append(noUsedDay);
                 stringBuilder.append("天) = ");
                 BigDecimal cost = (inProgressVO.getExtraAmount()).add(inProgressVO.getViolateAmount());
                 stringBuilder.append(cost);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCalculateBiz.java

 package com.xxfc.platform.order.biz.inner;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
@@ -85,19 +86,21 @@ public class OrderCalculateBiz {
                 Integer consumeDays = 0 - backFreeDays;
                     //计算使用天数的费用
                 consumeAmount = orderItem.getUnitPrice().multiply(new BigDecimal(consumeDays+""));
-                List<BigDecimal> couponAmounts = Lists.newArrayList();
-                for(String tickerNo : baseOrder.getCouponTickerNos().split(",")) {
-                    BigDecimal couponAmount = activityFeign.use(baseOrder.getUserId(), Lists.newArrayList(tickerNo), baseOrder.getNo(), Coupon.CHANNEL_RENT, consumeAmount, ActivityFeign.TYPE_CHECK);
-                    if(couponAmount.compareTo(BigDecimal.ZERO) > 0) {
-                        //能够使用优惠券，则不返还
-                        couponAmounts.add(couponAmount);
-                    } else {
-                        backCouponNos.add(tickerNo);
+                if(StrUtil.isNotBlank(baseOrder.getCouponTickerNos())) {
+                    List<BigDecimal> couponAmounts = Lists.newArrayList();
+                    for(String tickerNo : baseOrder.getCouponTickerNos().split(",")) {
+                        BigDecimal couponAmount = activityFeign.use(baseOrder.getUserId(), Lists.newArrayList(tickerNo), baseOrder.getNo(), Coupon.CHANNEL_RENT, consumeAmount, ActivityFeign.TYPE_CHECK);
+                        if(couponAmount.compareTo(BigDecimal.ZERO) > 0) {
+                            //能够使用优惠券，则不返还
+                            couponAmounts.add(couponAmount);
+                        } else {
+                            backCouponNos.add(tickerNo);
+                        }
                     }
-                }
 
-                for(BigDecimal couponAmount : couponAmounts) {
-                    consumeAmount = consumeAmount.subtract(couponAmount);
+                    for(BigDecimal couponAmount : couponAmounts) {
+                        consumeAmount = consumeAmount.subtract(couponAmount);
+                    }
                 }
 
                 //设置消费金额

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java

@@ -251,6 +251,9 @@ public class OrderCancelBiz {
                         setOrderId(baseOrder.getId());
                     }});
 
+                    BigDecimal adultItemAmount = (null == adultItem)? BigDecimal.ZERO: adultItem.getRealAmount();
+                    BigDecimal childItemAmount = (null == childItem)? BigDecimal.ZERO: childItem.getRealAmount();
+
                     //判断是省内还是省外
                     String key = TOUR_IN_REFUND;
                     if(SYS_TRUE.equals(otd.getIsOutside())) {
@@ -258,7 +261,7 @@ public class OrderCancelBiz {
                     }
 
                     //退款流程
-                    orderAccountBiz.rentRefundProcessCancel(baseOrder, adultItem.getRealAmount().add(childItem.getRealAmount()), timeLag, APP_ORDER+ "_"+ key, BigDecimal.ZERO, BigDecimal.ZERO, oad, BigDecimal.ZERO );
+                    orderAccountBiz.rentRefundProcessCancel(baseOrder, adultItemAmount.add(childItemAmount), timeLag, APP_ORDER+ "_"+ key, BigDecimal.ZERO, BigDecimal.ZERO, oad, BigDecimal.ZERO );
 
                     //如果有扣款项，则生成额外的费用明细
                     if(oad.getDeductions().size() > 0) {