fix

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

@@ -1492,6 +1492,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
             TopDivideLog divideLog = new TopDivideLog();
             divideLog.setCreateNo(createNo.getCreateNo());
             divideLog.setCreateUsername(createNo.getCreateUsername());
+            divideLog.setCreateSysUserId(createNo.getCreateSysUserId());
             divideLog.setTenantId(createNo.getTenantId().toString());
             divideLog.setDivideType(2);
             divideLog.setPayStatus(2);
@@ -1502,7 +1503,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
             divideLog.setUpdateTime(DateUtils.getNowTime());
             //判断账单是否生成
             TopDivideLog nowMonth = iTopDivideLogService.getOne(new LambdaQueryWrapper<TopDivideLog>()
-                    .eq(TopDivideLog::getCreateNo, createNo.getCreateNo())
+                    .eq(TopDivideLog::getCreateSysUserId, createNo.getCreateSysUserId())
                     .eq(TopDivideLog::getTenantId, createNo.getTenantId())
                     .eq(TopDivideLog::getDivideType, 2)
                     .eq(TopDivideLog::getYear, year)
@@ -1513,7 +1514,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
             }
             //获取上个账单
             LambdaQueryWrapper<TopDivideLog> lqw = Wrappers.lambdaQuery();
-            TopDivideLog divideLogLast = iTopDivideLogService.getOne(lqw.eq(TopDivideLog::getCreateNo, createNo.getCreateNo()).eq(TopDivideLog::getTenantId, createNo.getTenantId()).eq(TopDivideLog::getDivideType, 2).orderByDesc(TopDivideLog::getId).last("limit 1"));
+            TopDivideLog divideLogLast = iTopDivideLogService.getOne(lqw.eq(TopDivideLog::getCreateSysUserId, createNo.getCreateSysUserId()).eq(TopDivideLog::getTenantId, createNo.getTenantId()).eq(TopDivideLog::getDivideType, 2).orderByDesc(TopDivideLog::getId).last("limit 1"));
             divideLog.setDeductMoney(new BigDecimal(0));
             if (Validator.isNotEmpty(divideLogLast)) {
                 //上个月流入未扣金额
@@ -1526,7 +1527,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 queryBo1.setAccomplishEndTime(cal2.getTimeInMillis() / 1000);
                 queryBo1.setDivideModel(2);
                 queryBo1.setTenantId(createNo.getTenantId());
-                queryBo1.setCreateNo(createNo.getCreateNo());
+                queryBo1.setCreateSysUserId(createNo.getCreateSysUserId());
                 //订单总待付分成
                 BigDecimal totalPayMoney = new BigDecimal(0);
                 List<TopDivideOrderVo> list1 = iTopDivideOrderService.getMonthFinishList(queryBo1);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopDivideOrderQueryBo.java

@@ -116,4 +116,7 @@ public class TopDivideOrderQueryBo extends BaseEntity {
 	@ApiModelProperty("重写审核状态：1待审核 2审核中")
 	private Integer reCheckStatus;
 
+	@ApiModelProperty("业务员ID")
+	private Long createSysUserId;
+
 }

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

@@ -29,6 +29,8 @@ public class TopCreateUserVo {
 	private String createUsername;
 	@ApiModelProperty("企业ID")
 	private Long tenantId;
+	@ApiModelProperty("业务员ID")
+	private Long createSysUserId;
 
 
 

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

@@ -239,6 +239,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="createNo != null and createNo != ''">
             AND v.create_no = #{createNo}
         </if>
+        <if test="createSysUserId != null and createSysUserId != ''">
+            AND v.create_sys_user_id = #{createSysUserId}
+        </if>
     </select>
 
     <select id="getMonthCreditList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo">
@@ -422,6 +425,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="createNo != null and createNo != ''">
             AND v.create_no = #{createNo}
         </if>
+        <if test="createSysUserId != null and createSysUserId != ''">
+            AND v.create_sys_user_id = #{createSysUserId}
+        </if>
     </select>
 
     <select id="getMonthBadSum" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="BigDecimal">
@@ -445,8 +451,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getMonthFinishAllSeller" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopCreateUserVo">
         SELECT
-        v.create_no,
-        v.create_username,
+        v.create_sys_user_id,
+        any_value (v.create_username) create_username,
         v.tenant_id
         FROM
         v_top_order v
@@ -465,7 +471,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="createNo != null and createNo != ''">
             AND v.create_no = #{createNo}
         </if>
-        GROUP BY v.create_no,v.create_username,v.tenant_id
+        GROUP BY v.create_sys_user_id,v.tenant_id
     </select>
 
     <select id="getByOrderSn" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo">