Merge remote-tracking branch 'origin/dev' into dev

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuServiceImpl.java

@@ -181,7 +181,7 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(CourseMenuListAddBo bo) {
-        boolean result = false;
+        boolean result = true;
         remove(new LambdaQueryWrapper<CourseMenu>().eq(CourseMenu::getCourseId, bo.getCourseId()));
         for(int i=0;i<bo.getMenuList().size();i++){
             CourseMenu add = BeanUtil.toBean(bo.getMenuList().get(i), CourseMenu.class);

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

@@ -6,6 +6,7 @@ import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
 import com.zhongzheng.modules.top.financial.domain.TopDivideLog;
 import com.zhongzheng.modules.top.financial.vo.TopCostTpVo;
 import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo;
 
 import java.util.List;
 
@@ -18,11 +19,15 @@ import java.util.List;
 public interface TopDivideLogMapper extends BaseMapper<TopDivideLog> {
     List<TopDivideLogVo> getCompanyList(TopDivideLogQueryBo bo);
 
+    Long getCompanyWaitCount(TopOldOrderQueryBo bo);
+
     List<TopDivideLogVo> getCheckList(TopDivideLogQueryBo bo);
 
     TopDivideLogVo getSumMoney(TopDivideLogQueryBo bo);
 
     List<TopDivideLogVo> getSellerList(TopDivideLogQueryBo bo);
 
+    Long getSellerListWaitCount(TopOldOrderQueryBo bo);
+
     List<TopDivideLogVo> getCommissionList(TopDivideLogQueryBo bo);
 }

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

@@ -8,6 +8,7 @@ import com.zhongzheng.modules.top.financial.domain.TopDivideOrder;
 import com.zhongzheng.modules.top.financial.vo.TopCreateUserVo;
 import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
 import com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo;
 import com.zhongzheng.modules.top.order.domain.TopOrderBankPay;
 
 import java.math.BigDecimal;
@@ -34,6 +35,8 @@ public interface TopDivideOrderMapper extends BaseMapper<TopDivideOrder> {
 
     List<TopDivideOrderVo> getMonthCreditList(TopDivideOrderQueryBo bo);
 
+    Long getMonthCreditWaitCount(TopOldOrderQueryBo bo);
+
     List<String> getMonthFinishAllTenant(TopDivideOrderQueryBo bo);
 
     List<TopDivideOrderVo> getMonthRefundList(TopDivideOrderQueryBo bo);

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

@@ -11,6 +11,7 @@ import com.zhongzheng.modules.top.financial.domain.TopDivideLog;
 import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
 import com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo;
 import com.zhongzheng.modules.top.goods.bo.TopOldOrderEditBo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo;
 
 import java.util.Collection;
 import java.util.List;
@@ -68,8 +69,12 @@ public interface ITopDivideLogService extends IService<TopDivideLog> {
 
 	TopDivideLogVo getSumMoney(TopDivideLogQueryBo bo);
 
+	Long getCompanyWaitCount(TopOldOrderQueryBo bo);
+
 	List<TopDivideLogVo> getSellerList(TopDivideLogQueryBo bo);
 
+	Long getSellerListWaitCount(TopOldOrderQueryBo bo);
+
 	List<TopDivideOrderVo> getCommissionList(TopDivideOrderQueryBo bo);
 
 	TopDivideOrderVo getCommissionDetail(TopDivideOrderQueryBo bo);

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

@@ -9,6 +9,7 @@ import com.zhongzheng.modules.top.financial.domain.TopDivideOrder;
 import com.zhongzheng.modules.top.financial.vo.TopCreateUserVo;
 import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
 import com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo;
 import com.zhongzheng.modules.top.order.domain.TopOrderBankPay;
 
 import java.math.BigDecimal;
@@ -68,6 +69,8 @@ public interface ITopDivideOrderService extends IService<TopDivideOrder> {
 
 	List<TopDivideOrderVo> getMonthCreditList(TopDivideOrderQueryBo bo);
 
+	Long getMonthCreditWaitCount(TopOldOrderQueryBo bo);
+
 	List<String> getMonthFinishAllTenant(TopDivideOrderQueryBo bo);
 
 	List<TopDivideOrderVo> getMonthRefundList(TopDivideOrderQueryBo bo);

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

@@ -22,6 +22,7 @@ import com.zhongzheng.modules.top.financial.service.ITopDivideLogService;
 import com.zhongzheng.modules.top.financial.service.ITopDivideOrderService;
 import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
 import com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo;
 import com.zhongzheng.modules.top.goods.domain.TopOldOrder;
 import com.zhongzheng.modules.top.order.domain.TopOrderBankPay;
 import com.zhongzheng.modules.top.order.service.ITopOrderBankPayService;
@@ -285,6 +286,11 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
         return baseMapper.getSumMoney(bo);
     }
 
+    @Override
+    public Long getCompanyWaitCount(TopOldOrderQueryBo bo) {
+        return baseMapper.getCompanyWaitCount(bo);
+    }
+
     @Override
     public List<TopDivideLogVo> getSellerList(TopDivideLogQueryBo bo) {
         if(Validator.isNotEmpty(bo.getPayStatus())){
@@ -332,6 +338,11 @@ public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, Top
         return list;
     }
 
+    @Override
+    public Long getSellerListWaitCount(TopOldOrderQueryBo bo) {
+        return baseMapper.getSellerListWaitCount(bo);
+    }
+
     @Override
     public List<TopDivideOrderVo> getCommissionList(TopDivideOrderQueryBo bo) {
         if(Validator.isNotEmpty(bo.getCheckStatus())){

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

@@ -15,6 +15,7 @@ import com.zhongzheng.modules.top.financial.service.ITopDivideOrderService;
 import com.zhongzheng.modules.top.financial.vo.TopCreateUserVo;
 import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
 import com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo;
 import com.zhongzheng.modules.top.order.domain.TopOrderBankPay;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -240,6 +241,11 @@ public class TopDivideOrderServiceImpl extends ServiceImpl<TopDivideOrderMapper,
         return baseMapper.getMonthCreditList(bo);
     }
 
+    @Override
+    public Long getMonthCreditWaitCount(TopOldOrderQueryBo bo) {
+        return baseMapper.getMonthCreditWaitCount(bo);
+    }
+
     @Override
     public List<String> getMonthFinishAllTenant(TopDivideOrderQueryBo bo) {
         return baseMapper.getMonthFinishAllTenant(bo);

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

@@ -145,6 +145,10 @@ public class TopOldOrderQueryBo extends BaseEntity {
 	private Integer billOverType;
 	@ApiModelProperty("运营类型：1代运营 2独立运营")
 	private Integer operationType;
+	@ApiModelProperty("角色ID列表")
+	private List<Long> roleIds;
 
+	@ApiModelProperty("机构ID")
+	private List<String> tenantIds;
 
 }

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

@@ -4356,7 +4356,6 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             }
             Long uncollected = baseMapper.queryReceiveUnSum(bo);
             map.put("orderUncollectedTotal", uncollected); //未收账款
-
         }
         if (bo.getTotalType() == 2) {
             //机构分成
@@ -4367,6 +4366,7 @@ 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));
         }
         if (bo.getTotalType() == 3) {
             //3业务员提成
@@ -4377,6 +4377,7 @@ 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));
         }
         if (bo.getTotalType() == 4) {
             //4佣金结算
@@ -4385,6 +4386,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             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

@@ -139,7 +139,63 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
+    <select id="getCompanyWaitCount" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo"  resultType="Long">
+        SELECT
+            COUNT(dl.*)
+        FROM
+            top_divide_log dl
+                LEFT JOIN sys_tenant st ON dl.tenant_id = st.tenant_id
 
+        WHERE
+            dl.divide_type = 1
+        <if test="tenantId != null and tenantId != ''">
+            AND dl.tenant_id = #{tenantId}
+        </if>
+        <if test="billType != null and billType != ''">
+            AND st.bill_type = #{billType}
+        </if>
+        <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="monthTime != null and monthTime.size()!=0">
+            AND dl.month_time in
+            <foreach collection="monthTime" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="tenantIds != null and tenantIds.size()!=0">
+            AND dl.tenant_id in
+            <foreach collection="tenantIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="overPayDay != null ">
+            AND dl.predict_pay_time <![CDATA[ <= ]]> #{overPayDayTime}
+        </if>
+        <if test="notPayStatus != null ">
+            AND dl.pay_status != #{notPayStatus}
+        </if>
+        AND (SELECT
+        count(*)
+        FROM
+        top_divide_log bdl
+        LEFT JOIN top_divide_order btdo ON bdl.id = btdo.divide_log_id
+        LEFT JOIN top_old_order_check_log bcl ON btdo.order_sn = bcl.order_sn
+        WHERE
+        bcl.check_from = 2
+        AND bcl.check_status = 0
+        AND bcl.check_sign = 1
+        <if test="roleIds != null and roleIds.size()!=0">
+            AND bcl.role_id in
+            <foreach collection="roleIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        AND bdl.id = dl.id)>0
+    </select>
 
     <select id="getCheckList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo" resultType="com.zhongzheng.modules.top.financial.vo.TopDivideLogVo">
         SELECT
@@ -334,6 +390,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
+    <select id="getSellerListWaitCount" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo"  resultType="Long">
+        SELECT
+        COUNT(dl.*)
+        FROM
+        top_divide_log dl
+        LEFT JOIN sys_tenant st ON dl.tenant_id = st.tenant_id
+        WHERE
+        dl.divide_type = 2
+        <if test="tenantId != null and tenantId != ''">
+            AND dl.tenant_id = #{tenantId}
+        </if>
+        <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="createNo != null ">
+            AND (dl.create_no = #{createNo} or dl.create_username like concat('%', #{createNo}, '%'))
+        </if>
+        <if test="monthTime != null and monthTime.size()!=0">
+            AND dl.month_time in
+            <foreach collection="monthTime" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="tenantIds != null and tenantIds.size()!=0">
+            AND dl.tenant_id in
+            <foreach collection="tenantIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="notPayStatus != null ">
+            AND dl.pay_status != #{notPayStatus}
+        </if>
+            AND (SELECT
+            count(*)
+            FROM
+            top_divide_log bdl
+            LEFT JOIN top_divide_order btdo ON bdl.id = btdo.divide_log_id
+            LEFT JOIN top_old_order_check_log bcl ON btdo.order_sn = bcl.order_sn
+            WHERE
+            bcl.check_from = 3
+            AND bcl.check_status = 0
+            AND bcl.check_sign = 1
+            <if test="roleIds != null and roleIds.size()!=0">
+                AND bcl.role_id in
+                <foreach collection="roleIds" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            AND bdl.id = dl.id)>0
+
+    </select>
+
     <select id="getCommissionList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideLogVo">
         SELECT
         dl.*,

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

@@ -297,6 +297,83 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         AND v.finish_status = 1
         AND v.brokerage > 0
+        <if test="reCheckStatus == 1">
+            AND (SELECT
+            count(*)
+            FROM
+             top_old_order_check_log bcl
+            WHERE
+            bcl.check_from = 4
+            AND bcl.check_status = 0
+            AND bcl.check_sign = 1
+            <if test="roleIds != null and roleIds.size()!=0">
+                AND bcl.role_id in
+                <foreach collection="roleIds" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            AND  bcl.order_sn = v.order_sn)>0
+        </if>
+        <if test="reCheckStatus == 2">
+            AND (SELECT
+            count(*)
+            FROM
+            top_old_order_check_log bcl
+            WHERE
+            bcl.check_from = 4
+            AND bcl.check_status = 0
+            AND bcl.check_sign = 1
+            <if test="roleIds != null and roleIds.size()!=0">
+                AND bcl.role_id not in
+                <foreach collection="roleIds" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            AND bcl.order_sn = v.order_sn)>0
+        </if>
+    </select>
+
+    <select id="getMonthCreditWaitCount" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo"  resultType="Long">
+        SELECT
+        count(*)
+        FROM
+        top_old_order v
+        LEFT JOIN sys_tenant st ON v.tenant_id = st.tenant_id
+        LEFT JOIN
+        top_old_order_check_log cl ON cl.check_from = 4 AND  cl.check_sign = 1  AND  v.order_sn = cl.order_sn
+        LEFT JOIN top_sys_role r ON cl.role_id = r.role_id
+        LEFT JOIN top_order_bank_pay bp ON bp.type = 4 AND bp.order_sn = v.order_sn AND bp.result_status = 1
+        WHERE
+        1 = 1
+        <if test="accomplishStartTime != null and accomplishStartTime != ''">
+            AND v.accomplish_time BETWEEN #{accomplishStartTime} and #{accomplishEndTime}
+        </if>
+        <if test="tenantId != null and tenantId != ''">
+            AND v.tenant_id = #{tenantId}
+        </if>
+        <if test="createNo != null and createNo != ''">
+            AND (v.create_no = #{createNo} or v.create_username like concat('%', #{createNo}, '%'))
+        </if>
+        <if test="orderSn != null and orderSn != ''">
+            AND v.order_sn = #{orderSn}
+        </if>
+        AND v.finish_status = 1
+        AND v.brokerage > 0
+        AND (SELECT
+        count(*)
+        FROM
+        top_old_order_check_log bcl
+        WHERE
+        bcl.check_from = 4
+        AND bcl.check_status = 0
+        AND bcl.check_sign = 1
+        <if test="roleIds != null and roleIds.size()!=0">
+            AND bcl.role_id in
+            <foreach collection="roleIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        AND  bcl.order_sn = v.order_sn)>0
     </select>
 
     <select id="getMonthRefundList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo">