fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopDivideLogServiceImpl.java

@@ -28,9 +28,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -128,6 +126,17 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
     @Override
     public List<TopDivideLogVo> getCompanyList(TopDivideLogQueryBo bo) {
         List<TopDivideLogVo> list = baseMapper.getCompanyList(bo);
+        for(TopDivideLogVo logVos : list){
+            if (Validator.isNotEmpty(logVos.getBillDay())) {
+                Calendar cal1 = new GregorianCalendar();
+                cal1.setTimeInMillis(logVos.getMonthTime()* 1000);
+                cal1.add(Calendar.MONTH, 1);
+                cal1.set(Calendar.DAY_OF_MONTH, logVos.getBillDay());
+                logVos.setPredictPayTime(cal1.getTimeInMillis()/1000);
+                Integer predictDay = DateUtils.dayBetween(logVos.getPredictPayTime(), DateUtils.getNowTime());
+                logVos.setPredictPayDay(predictDay);
+            }
+        }
         return list;
     }
 
@@ -152,12 +161,34 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
     @Override
     public List<TopDivideLogVo> getSellerList(TopDivideLogQueryBo bo) {
         List<TopDivideLogVo> list = baseMapper.getSellerList(bo);
+        for(TopDivideLogVo logVos : list){
+            if (Validator.isNotEmpty(logVos.getBillDay())) {
+                Calendar cal1 = new GregorianCalendar();
+                cal1.setTimeInMillis(logVos.getMonthTime()* 1000);
+                cal1.add(Calendar.MONTH, 1);
+                cal1.set(Calendar.DAY_OF_MONTH, logVos.getBillDay());
+                logVos.setPredictPayTime(cal1.getTimeInMillis()/1000);
+                Integer predictDay = DateUtils.dayBetween(logVos.getPredictPayTime(), DateUtils.getNowTime());
+                logVos.setPredictPayDay(predictDay);
+            }
+        }
         return list;
     }
 
     @Override
     public List<TopDivideLogVo> getCommissionList(TopDivideLogQueryBo bo) {
         List<TopDivideLogVo> list = baseMapper.getCommissionList(bo);
+        for(TopDivideLogVo logVos : list){
+            if (Validator.isNotEmpty(logVos.getBillDay())) {
+                Calendar cal1 = new GregorianCalendar();
+                cal1.setTimeInMillis(logVos.getMonthTime()* 1000);
+                cal1.add(Calendar.MONTH, 1);
+                cal1.set(Calendar.DAY_OF_MONTH, logVos.getBillDay());
+                logVos.setPredictPayTime(cal1.getTimeInMillis()/1000);
+                Integer predictDay = DateUtils.dayBetween(logVos.getPredictPayTime(), DateUtils.getNowTime());
+                logVos.setPredictPayDay(predictDay);
+            }
+        }
         return list;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopDivideLogVo.java

@@ -110,5 +110,11 @@ public class TopDivideLogVo {
 	private Long monthTime;
 	@ApiModelProperty("打款时间")
 	private Long payTime;
+	@ApiModelProperty("账单日")
+	private Integer billDay;
+	@ApiModelProperty("预付时间")
+	private Long predictPayTime;
+	@ApiModelProperty("预付款剩余天数")
+	private Integer predictPayDay;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -2882,9 +2882,6 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if(Validator.isEmpty(bankPay)){
             throw new CustomException("支付单号错误");
         }
-
-
-
         if (bankPay.getType() == 2){
                TopOldOrder order = getOne(new LambdaQueryWrapper<TopOldOrder>()
                 .eq(TopOldOrder::getOrderSn, bankPay.getOrderSn()).last("limit 1"));
@@ -2947,7 +2944,6 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             if(divideLog.getPayStatus()!=0){
                 throw new CustomException("非法操作");
             }
-
             if(bo.getStatus()==1){
                 //支付成功
                 bankPay.setResultStatus(1);

zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideLogMapper.xml

@@ -26,7 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             dl.*,
             st.tenant_name,
-               st.bill_type
+               st.bill_type,
+               st.bill_day
         FROM
             top_divide_log dl
                 LEFT JOIN sys_tenant st ON dl.tenant_id = st.tenant_id
@@ -111,7 +112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getSellerList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideLogVo">
         SELECT
         dl.*,
-        st.tenant_name
+        st.tenant_name,
+        st.bill_day
         FROM
         top_divide_log dl
         LEFT JOIN sys_tenant st ON dl.tenant_id = st.tenant_id
@@ -131,7 +133,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getCommissionList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo">
         SELECT
         dl.*,
-        st.tenant_name
+        st.tenant_name,
+        st.bill_day
         FROM
         top_divide_log dl
         LEFT JOIN sys_tenant st ON dl.tenant_id = st.tenant_id