提成改为保留三位小数四舍五入，订单页面修改，增加服务天数

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java

@@ -213,6 +213,12 @@ public class SysOrder extends BaseEntity {
     @Excel(name = "进粉时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date becomeFanTime;
 
+    /**
+     * 服务天数
+     */
+    @Excel(name = "服务结束时间", width = 30)
+    private Integer serverDay;
+
     /**
      * 订单暂停记录 非持久化字段
      * */
@@ -525,6 +531,14 @@ public class SysOrder extends BaseEntity {
         this.becomeFanTime = becomeFanTime;
     }
 
+    public Integer getServerDay() {
+        return serverDay;
+    }
+
+    public void setServerDay(Integer serverDay) {
+        this.serverDay = serverDay;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java

@@ -1,5 +1,6 @@
 package com.stdiet.custom.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.stdiet.common.utils.DateUtils;
 import com.stdiet.custom.domain.*;
 import com.stdiet.custom.mapper.SysCommisionMapper;
@@ -106,6 +107,14 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
      * 根据用户ID统计出该用户在该月所有订单的服务数量、服务总天数、服务订单总额、暂停总天数
      * **/
     public void dealServerOrderCommissionDetail(List<SysOrderCommisionDayDetail> orderDetailList, SysCommissionDayDetail sysCommissionDayDetail){
+        /*System.out.println("------------------开始--------------");
+        if(orderDetailList != null){
+            for(SysOrderCommisionDayDetail sysOrderCommisionDayDetail : orderDetailList){
+                System.out.println("姓名："+sysOrderCommisionDayDetail.getName() + "  总天数："+sysOrderCommisionDayDetail.getServerDay()
+                        +" 每天金额："+sysOrderCommisionDayDetail.getDayMoney() + " 一月服务天数："+sysOrderCommisionDayDetail.getEveryYearMonthServerDay().get("20211")
+                        +" 一月对应金额："+ sysOrderCommisionDayDetail.getEveryYearMonthServerMoney().get("20211"));
+            }
+        }*/
         //总提成
         BigDecimal totalCommissionAmount = new BigDecimal(0);
         //已发放提成
@@ -440,7 +449,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
      * double转为BigDecimal，保留一位小数，向下舍去
      * */
     public BigDecimal getMoney(Double money, int n){
-        return new BigDecimal(money.toString()).setScale(n, BigDecimal.ROUND_DOWN);
+        return new BigDecimal(money.toString()).setScale(3, BigDecimal.ROUND_HALF_UP);
     }
 
     /**
@@ -475,10 +484,6 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
 
         /*System.out.println(ts(109792.8 * 6 / 100D, 1));
         System.out.println(ts(6587.8,2).doubleValue());*/
-        System.out.println(ts(1.919,1).doubleValue());
-    }
 
-    public static BigDecimal ts(Double money, int n){
-        return new BigDecimal(money.toString()).setScale(n, BigDecimal.ROUND_DOWN);
     }
 }

stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml

@@ -78,6 +78,7 @@
             <if test="endTime != null and endTime != ''">and date_format(order_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')</if>
             <if test="serveTimeId != null ">and serve_time_id = #{serveTimeId}</if>
             <if test="reviewStatus != null ">and review_status = #{reviewStatus}</if>
+            <if test="serveTimeId != null ">and serve_time_id = #{serveTimeId}</if>
         </where>
     </select>