食谱计划页面弹窗样式优化、按天提成列表增加一列

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

@@ -37,6 +37,9 @@ public class SysCommissionDayDetail extends BaseEntity {
     @Excel(name = "未发放提成")
     private BigDecimal totalNotSentCommissionAmount;
 
+    @Excel(name = "下月应发提成")
+    private BigDecimal nextMonthCommission;
+
     private List<Map<String, Object>> sendDetailList;
 
     public Long getUserId() {
@@ -110,4 +113,12 @@ public class SysCommissionDayDetail extends BaseEntity {
     public void setSendDetailList(List<Map<String, Object>> sendDetailList) {
         this.sendDetailList = sendDetailList;
     }
+
+    public BigDecimal getNextMonthCommission() {
+        return nextMonthCommission;
+    }
+
+    public void setNextMonthCommission(BigDecimal nextMonthCommission) {
+        this.nextMonthCommission = nextMonthCommission;
+    }
 }

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

@@ -29,9 +29,12 @@ public class SysRecipesPlan extends BaseEntity
     private String customer;
 
     //非持久化字段，客户手机号
-    @Excel(name = "客户手机号")
     private String phone;
 
+    @Excel(name = "客户手机号")
+    //处理过的客户手机号
+    private String hidePhone;
+
     /** 食谱开始日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "食谱开始日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -217,6 +220,14 @@ public class SysRecipesPlan extends BaseEntity
         this.phone = phone;
     }
 
+    public String getHidePhone() {
+        return hidePhone;
+    }
+
+    public void setHidePhone(String hidePhone) {
+        this.hidePhone = hidePhone;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -37,6 +37,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
         total.setTotalCommissionAmount(new BigDecimal(0));
         total.setTotalHasSentCommissionAmount(new BigDecimal(0));
         total.setTotalNotSentCommissionAmount(new BigDecimal(0));
+        total.setNextMonthCommission(new BigDecimal(0));
         if(list != null && list.size() > 0){
             Map<Long, List<SysOrderCommisionDayDetail>> orderDetailMap = getOrderByList(sysCommision.getUserId());
             SysCommissionDayDetail sysCommissionDayDetail = null;
@@ -52,6 +53,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
                 total.setTotalCommissionAmount(total.getTotalCommissionAmount().add(sysCommissionDayDetail.getTotalCommissionAmount()));
                 total.setTotalHasSentCommissionAmount(total.getTotalHasSentCommissionAmount().add(sysCommissionDayDetail.getTotalHasSentCommissionAmount()));
                 total.setTotalNotSentCommissionAmount(total.getTotalNotSentCommissionAmount().add(sysCommissionDayDetail.getTotalNotSentCommissionAmount()));
+                total.setNextMonthCommission(total.getNextMonthCommission().add(sysCommissionDayDetail.getNextMonthCommission()));
             }
         }
         total.setPostName("胜唐体控");
@@ -166,6 +168,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
         //未发放提成 = 总提成 - 已发放提成
         sysCommissionDayDetail.setTotalNotSentCommissionAmount(totalCommissionAmount.subtract(totalHasSentCommissionAmount));
         sysCommissionDayDetail.setSendDetailList(sendDetailList);
+        sysCommissionDayDetail.setNextMonthCommission(sendDetailList.size() > 0 ? (BigDecimal)sendDetailList.get(0).get("yearMonthCommission") : new BigDecimal(0));
     }
 
     /**判断该月提成是否已发放*/