Merge branch 'master-modify-cutAmount' into dev

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

@@ -29,6 +29,7 @@ import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
@@ -160,7 +161,7 @@ public class OrderCancelBiz {
                         Long useTimeLag = System.currentTimeMillis() - beginOfStartDay;
                         log.info("useTimeLag {}", new BigDecimal(useTimeLag + ""));
                         log.info("divide {}", new BigDecimal((24 * 60 * 60 * 1000)+ ""));
-                        Integer useDays = new BigDecimal(useTimeLag + "").divide(new BigDecimal((24 * 60 * 60 * 1000)+ "")).setScale(0, BigDecimal.ROUND_UP).intValue();
+                        Integer useDays = new BigDecimal(useTimeLag + "").divide(new BigDecimal((24 * 60 * 60 * 1000)+ ""), 0, RoundingMode.UP).intValue();
                         inProgressVO = orderCalculateBiz.calculateOrderComplete(baseOrder, orvd, oad, orderItem, useDays);
                         //结合
                         //退款子流程: 订单基础，退款描述，退款金额
@@ -326,4 +327,9 @@ public class OrderCancelBiz {
             throw new BaseException(ResultCode.FAILED_CODE);
         }
     }
+
+//    public static void main(String[] args) {
+//        Integer aaa = new BigDecimal(140119562.00 + "").divide(new BigDecimal((24 * 60 * 60 * 1000)+ ""), 0, RoundingMode.UP).intValue();
+//        System.out.println(aaa);
+//    }
 }
\ No newline at end of file