add payTime

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/schedule/ScheduleController.java

@@ -84,4 +84,11 @@ public class ScheduleController extends BaseController {
         iScheduleService.makeDivideSellerMonthBill();
         return AjaxResult.success();
     }
+
+    @ApiOperation("更新机构分成，业务提成应付时间")
+    @GetMapping("/updateCompanyPredictPayTime")
+    public AjaxResult updateCompanyPredictPayTime(){
+        iScheduleService.updatePredictPayTime();
+        return AjaxResult.success();
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/IScheduleService.java

@@ -112,4 +112,6 @@ public interface IScheduleService extends IService<PolyvVideo> {
 
     void createExamApply();
 
+    void updatePredictPayTime();
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -328,6 +328,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
     @Autowired
     private ICourseBusinessService iCourseBusinessService;
 
+
     @Value("${aliyun.sms.OpenTheGoodsCode}")
     private String OpenTheGoodsCode;
 
@@ -1792,6 +1793,12 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
 
     }
 
+    @Override
+    public void updatePredictPayTime() {
+        iTopDivideLogService.updateCompanyPredictPayTime();
+        iTopDivideLogService.updateSellerPredictPayTime();
+    }
+
     private String getWeeks(Long time){
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(DateUtils.timeToDate(time));

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

@@ -55,7 +55,9 @@ public interface ITopDivideLogService extends IService<TopDivideLog> {
 
 	List<TopDivideLogVo> getCompanyList(TopDivideLogQueryBo bo);
 
-	void updateCompanyPredictPayTime(TopDivideLogQueryBo bo);
+	void updateCompanyPredictPayTime();
+
+	void updateSellerPredictPayTime();
 
 	boolean updateRemark(TopDivideLogEditBo bo);
 

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

@@ -153,7 +153,8 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
     }
 
     @Override
-    public void updateCompanyPredictPayTime(TopDivideLogQueryBo bo) {
+    public void updateCompanyPredictPayTime() {
+        TopDivideLogQueryBo bo = new TopDivideLogQueryBo();
         bo.setNotPayStatus(1);
         List<TopDivideLogVo> list = baseMapper.getCompanyList(bo);
         for(TopDivideLogVo logVos : list){
@@ -170,13 +171,13 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
                         if(month<4){
                             cal1.set(Calendar.MONTH, 2);
                         }
-                        if(month<7){
+                        else if(month<7&&month>3){
                             cal1.set(Calendar.MONTH, 5);
                         }
-                        if(month<10){
+                        else if(month<10&&month>6){
                             cal1.set(Calendar.MONTH, 8);
                         }
-                        if(month<13){
+                        else if(month<13&&month>9){
                             cal1.set(Calendar.MONTH, 11);
                         }
                     }
@@ -200,6 +201,23 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
         }
     }
 
+    @Override
+    public void updateSellerPredictPayTime() {
+        TopDivideLogQueryBo bo = new TopDivideLogQueryBo();
+        bo.setNotPayStatus(1);
+        List<TopDivideLogVo> list = baseMapper.getSellerList(bo);
+        for(TopDivideLogVo logVos : list){
+            Calendar cal1 = new GregorianCalendar();
+            cal1.setTimeInMillis(logVos.getMonthTime()* 1000);
+            cal1.set(Calendar.DAY_OF_MONTH, logVos.getBillDay());
+            TopDivideLog update = new TopDivideLog();
+            update.setId(logVos.getId());
+            update.setPredictPayTime(cal1.getTimeInMillis()/1000);
+            update.setUpdateTime(DateUtils.getNowTime());
+            this.updateById(update);
+        }
+    }
+
     @Override
     public boolean updateRemark(TopDivideLogEditBo bo) {
         if (Validator.isEmpty(bo.getRemark()) || Validator.isEmpty(bo.getId())) {
@@ -220,14 +238,29 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
 
     @Override
     public List<TopDivideLogVo> getSellerList(TopDivideLogQueryBo bo) {
+        if(Validator.isNotEmpty(bo.getOverPayDay())){
+            bo.setNotPayStatus(1);
+        }
+        if(bo.getOverPayDay()==1){
+            bo.setOverPayDayTime(DateUtils.getNowTime()-(7*24*3600));
+        }
+        else if(bo.getOverPayDay()==2){
+            bo.setOverPayDayTime(DateUtils.getNowTime()-(30*24*3600));
+        }
+        else if(bo.getOverPayDay()==3){
+            bo.setOverPayDayTime(DateUtils.getNowTime()-(182*24*3600));
+        }
+        else if(bo.getOverPayDay()==4){
+            bo.setOverPayDayTime(DateUtils.getNowTime()-(365*24*3600));
+        }
         List<TopDivideLogVo> list = baseMapper.getSellerList(bo);
         for(TopDivideLogVo logVos : list){
             if (Validator.isNotEmpty(logVos.getBillDay())) {
-                Calendar cal1 = new GregorianCalendar();
+       /*         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);
+                logVos.setPredictPayTime(cal1.getTimeInMillis()/1000);*/
                 Integer predictDay = DateUtils.dayBetween(logVos.getPredictPayTime(), DateUtils.getNowTime());
                 logVos.setPredictPayDay(predictDay);
             }

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

@@ -165,6 +165,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="notPayStatus != null ">
+            AND dl.pay_status != #{notPayStatus}
+        </if>
     </select>
 
     <select id="getCommissionList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideLogVo">