fix

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

@@ -1432,6 +1432,9 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                             divideLog.setRealBadMoney(badPrice);
                         }
                     }
+                    if (divideLog.getPayMoney().compareTo(BigDecimal.ZERO) == 0) {
+                        divideLog.setPayStatus(6);
+                    }
                     iTopDivideLogService.updateById(divideLog);
                 }
 
@@ -1560,6 +1563,9 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     divideLog.setUnDeductMoney(new BigDecimal(0));
                     divideLog.setPayMoney(divideLog.getTotalPayMoney().subtract(divideLog.getDeductMoney()));
                 }
+                if (divideLog.getPayMoney().compareTo(BigDecimal.ZERO) == 0) {
+                    divideLog.setPayStatus(6);
+                }
                 iTopDivideLogService.updateById(divideLog);
             }
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/mapper/TopDivideOrderMapper.java

@@ -35,7 +35,7 @@ public interface TopDivideOrderMapper extends BaseMapper<TopDivideOrder> {
 
     List<TopDivideOrderVo> getMonthCreditList(TopDivideOrderQueryBo bo);
 
-    Long getMonthCreditWaitCount(TopOldOrderQueryBo bo);
+    Long getMonthCreditWaitCount(TopDivideOrderQueryBo bo);
 
     List<String> getMonthFinishAllTenant(TopDivideOrderQueryBo bo);
 

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

@@ -69,7 +69,7 @@ public interface ITopDivideOrderService extends IService<TopDivideOrder> {
 
 	List<TopDivideOrderVo> getMonthCreditList(TopDivideOrderQueryBo bo);
 
-	Long getMonthCreditWaitCount(TopOldOrderQueryBo bo);
+	Long getMonthCreditWaitCount(TopDivideOrderQueryBo bo);
 
 	List<String> getMonthFinishAllTenant(TopDivideOrderQueryBo bo);
 

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

@@ -160,7 +160,7 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
 
     @Override
     public List<TopDivideLogVo> getCompanyList(TopDivideLogQueryBo bo) {
-        if(Validator.isNotEmpty(bo.getPayStatus())){
+        if(Validator.isNotEmpty(bo.getPayStatus())&&bo.getPayStatus().size()>0){
             List<Integer> payStatus = new ArrayList<>();
             for(Integer status : bo.getPayStatus()){
                 if(status==2){
@@ -175,7 +175,7 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
             }
             bo.setPayStatus(payStatus);
         }
-        if(Validator.isNotEmpty(bo.getOverPayDay())){
+        if(Validator.isNotEmpty(bo.getOverPayDay())&&bo.getOverPayDay()>0){
             bo.setNotPayStatus(1);
             if(bo.getOverPayDay()==1){
                 bo.setOverPayDayTime(DateUtils.getNowTime()-(7*24*3600));
@@ -293,7 +293,7 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
 
     @Override
     public List<TopDivideLogVo> getSellerList(TopDivideLogQueryBo bo) {
-        if(Validator.isNotEmpty(bo.getPayStatus())){
+        if(Validator.isNotEmpty(bo.getPayStatus())&&bo.getPayStatus().size()>0){
             List<Integer> payStatus = new ArrayList<>();
             for(Integer status : bo.getPayStatus()){
                 if(status==2){
@@ -308,7 +308,7 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
             }
             bo.setPayStatus(payStatus);
         }
-        if(Validator.isNotEmpty(bo.getOverPayDay())){
+        if(Validator.isNotEmpty(bo.getOverPayDay())&&bo.getOverPayDay()>0){
             bo.setNotPayStatus(1);
             if(bo.getOverPayDay()==1){
                 bo.setOverPayDayTime(DateUtils.getNowTime()-(7*24*3600));
@@ -345,7 +345,7 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
 
     @Override
     public List<TopDivideOrderVo> getCommissionList(TopDivideOrderQueryBo bo) {
-        if(Validator.isNotEmpty(bo.getCheckStatus())){
+        if(Validator.isNotEmpty(bo.getCheckStatus())&&bo.getCheckStatus().size()>0){
             List<Integer> payStatus = new ArrayList<>();
             for(Integer status : bo.getCheckStatus()){
                 if(status==0){
@@ -385,6 +385,8 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
             orderTotalPrice = orderTotalPrice.add(vo.getOrderPrice());
             pretaxTotalBrokerage = pretaxTotalBrokerage.add(vo.getPretaxBrokerage());
         }
+        Long result =iTopDivideOrderService.getMonthCreditWaitCount(bo);
+        map.put("waitAuditTotal", Validator.isNotEmpty(result)?result:0);
         map.put("orderTotalPrice",orderTotalPrice);  //订单金额
         map.put("BrokerageTotalMoney",brokerageTotalMoney); //结算佣金
         map.put("pretaxTotalBrokerage",pretaxTotalBrokerage);//税前佣金

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

@@ -242,7 +242,7 @@ public class TopDivideOrderServiceImpl extends ServiceImpl<TopDivideOrderMapper,
     }
 
     @Override
-    public Long getMonthCreditWaitCount(TopOldOrderQueryBo bo) {
+    public Long getMonthCreditWaitCount(TopDivideOrderQueryBo bo) {
         return baseMapper.getMonthCreditWaitCount(bo);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderQueryBo.java

@@ -160,4 +160,7 @@ public class TopOldOrderQueryBo extends BaseEntity {
 
 	@ApiModelProperty("预付超期 1：7天 2：30 3：半年 4：1年")
 	private Integer overPayDay;
+
+	@ApiModelProperty("预付超期时间戳")
+	private Long overPayDayTime;
 }

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

@@ -4378,7 +4378,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             map.put("unPayMoneyTotal", Validator.isEmpty(vo1) ? 0 : vo1.getUnPayMoneyTotal());
             map.put("payMoneyTotal", Validator.isEmpty(vo1) ? 0 : vo1.getPayMoneyTotal());
             map.put("deductMoneyTotal", Validator.isEmpty(vo1) ? 0 : vo1.getDeductMoneyTotal());
-            map.put("waitAuditTotal", iTopDivideLogService.getCompanyWaitCount(bo));
+            Long result = iTopDivideLogService.getCompanyWaitCount(bo);
+            map.put("waitAuditTotal", Validator.isNotEmpty(result)?result:0);
         }
         if (bo.getTotalType() == 3) {
             //3业务员提成
@@ -4389,18 +4390,19 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             map.put("unPayMoneyTotal", Validator.isEmpty(vo1) ? 0 : vo1.getUnPayMoneyTotal());
             map.put("payMoneyTotal", Validator.isEmpty(vo1) ? 0 : vo1.getPayMoneyTotal());
             map.put("deductMoneyTotal", Validator.isEmpty(vo1) ? 0 : vo1.getDeductMoneyTotal());
-            map.put("waitAuditTotal", iTopDivideLogService.getSellerListWaitCount(bo));
+            Long result =iTopDivideLogService.getSellerListWaitCount(bo);
+            map.put("waitAuditTotal", Validator.isNotEmpty(result)?result:0);
         }
-        if (bo.getTotalType() == 4) {
+       /* if (bo.getTotalType() == 4) {
             //4佣金结算
             TopDivideLogQueryBo queryBo1 = BeanUtil.toBean(bo, TopDivideLogQueryBo.class);
             queryBo1.setDivideType(3);
             TopDivideLogVo vo1 = iTopDivideLogService.getSumMoney(queryBo1);
             map.put("unPayMoneyTotal", Validator.isEmpty(vo1) ? 0 : vo1.getUnPayMoneyTotal());
             map.put("payMoneyTotal", Validator.isEmpty(vo1) ? 0 : vo1.getPayMoneyTotal());
-            map.put("waitAuditTotal", iTopDivideOrderService.getMonthCreditWaitCount(bo));
-        }
 
+        }
+*/
         return map;
     }
 }

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

@@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getCompanyWaitCount" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo"  resultType="Long">
         SELECT
-            COUNT(dl.*)
+        IFNULL(COUNT(*) ,0)
         FROM
             top_divide_log dl
                 LEFT JOIN sys_tenant st ON dl.tenant_id = st.tenant_id
@@ -264,8 +264,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="tenantId != null and tenantId != ''">
             AND dl.tenant_id = #{tenantId}
         </if>
-        <if test="payStatus != null">
-            AND dl.pay_status = #{payStatus}
+        <if test="payStatus != null and payStatus.size()!=0">
+            AND dl.pay_status in
+            <foreach collection="payStatus" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         <if test="billType != null and billType != ''">
             AND st.bill_type = #{billType}
@@ -392,7 +395,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getSellerListWaitCount" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo"  resultType="Long">
         SELECT
-        COUNT(dl.*)
+        IFNULL(COUNT(*) ,0)
         FROM
         top_divide_log dl
         LEFT JOIN sys_tenant st ON dl.tenant_id = st.tenant_id

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

@@ -333,7 +333,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
-    <select id="getMonthCreditWaitCount" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo"  resultType="Long">
+    <select id="getMonthCreditWaitCount" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="Long">
         SELECT
         count(*)
         FROM