手续费计算修改

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/refund/impl/TradeRefundServiceImpl.java

@@ -811,10 +811,12 @@ public class TradeRefundServiceImpl implements TradeRefundService {
         long between = DateUtil.between(new Date(), tradeOrderDO.getTravelDate(), DateUnit.DAY, false);
         BigDecimal damaged;
         if (between > 21) {
-            damaged = new BigDecimal(500).multiply(new BigDecimal(num));
-//            if(tradeOrderDO.getSellMethod()==3){
-//                damaged =  BigDecimal.ZERO;
-//            }
+            //开航前大于21天的留位/锁位订单，调整无扣损
+            if(tradeOrderDO.getDeposi().compareTo(BigDecimal.ZERO)==0 && (tradeOrderDO.getOrderStatus()==1 || tradeOrderDO.getOrderStatus()==14)){
+                damaged = BigDecimal.ZERO;
+            }else{
+                damaged = new BigDecimal(500).multiply(new BigDecimal(num));
+            }
         } else if (between > 15) {
             damaged = tradeOrderDO.getPayAmount().multiply(new BigDecimal("0.2"));
         } else {