fix

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/financial/TopOrderRecNoteController.java

@@ -76,5 +76,11 @@ public class TopOrderRecNoteController extends BaseController {
         return toAjax(iTopOrderRecNoteService.updateByEditBo(bo) ? 1 : 0);
     }
 
-
+    @ApiOperation("批量修改订单收款提醒")
+    @PreAuthorize("@ss.hasPermi('system:note:edit')")
+    @Log(title = "批量修改订单收款提醒", businessType = BusinessType.UPDATE)
+    @PostMapping("/editBatch")
+    public AjaxResult<Void> editBatch(@RequestBody List<TopOrderRecNoteEditBo> bo) {
+        return toAjax(iTopOrderRecNoteService.updateByBatchEditBo(bo) ? 1 : 0);
+    }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOldOrderCheckLogController.java

@@ -109,4 +109,17 @@ public class TopOldOrderCheckLogController extends BaseController {
         }
         return toAjax(iTopOldOrderCheckLogService.updateBatchDivideByEditBo(bo) ? 1 : 0);
     }
+
+    @ApiOperation("批量修改月份分成审核记录")
+    @PreAuthorize("@ss.hasPermi('system:log:edit')")
+    @Log(title = "批量修改月份分成审核记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateBatchDivideByMonthEditBo")
+    public AjaxResult<Void> updateBatchDivideByMonthEditBo(@RequestBody List<TopOldOrderCheckLogEditBo> bo) {
+        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        for(TopOldOrderCheckLogEditBo editBo : bo){
+            editBo.setLoginId(loginUser.getUser().getUserId());
+            editBo.setLoginName(loginUser.getUser().getUserName());
+        }
+        return toAjax(iTopOldOrderCheckLogService.updateBatchDivideByMonthEditBo(bo) ? 1 : 0);
+    }
 }

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

@@ -125,6 +125,7 @@ public class TopDivideLogVo {
 	/** 银行名称 */
 	@ApiModelProperty("银行名称")
 	private String toBankTypeName;
-
+	@ApiModelProperty("角色ID")
+	private Long roleId;
 
 }

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

@@ -50,7 +50,7 @@ public class TopOldOrderCheckLogEditBo {
     private Long updateTime;
 
     /** 审核来源 1退款 2机构分成应付 3业务员提成 */
-    @ApiModelProperty("审核来源 1退款 2机构分成应付 3业务员提成")
+    @ApiModelProperty("审核来源 1退款 2机构分成应付 3业务员提成 4佣金结算")
     private Integer checkFrom;
 
     /** 订单号 */
@@ -74,4 +74,7 @@ public class TopOldOrderCheckLogEditBo {
 
     @ApiModelProperty("审核角色名称")
     private String checkRoleName;
+
+    @ApiModelProperty("月份ID")
+    private Long divideLogId;
 }

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

@@ -47,6 +47,8 @@ public interface ITopOldOrderCheckLogService extends IService<TopOldOrderCheckLo
 
 	Boolean updateBatchDivideByEditBo(List<TopOldOrderCheckLogEditBo> bo);
 
+	Boolean updateBatchDivideByMonthEditBo(List<TopOldOrderCheckLogEditBo> bo);
+
 	/**
 	 * 校验并删除数据
 	 * @param ids 主键集合

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

@@ -6,8 +6,10 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.zhongzheng.common.core.domain.entity.TopSysRole;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.activity.domain.ActivityGoodsPrice;
 import com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo;
 import com.zhongzheng.modules.top.financial.domain.TopDivideLog;
 import com.zhongzheng.modules.top.financial.domain.TopDivideOrder;
@@ -25,6 +27,7 @@ import com.zhongzheng.modules.top.goods.service.ITopOldOrderCheckLogService;
 import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderCheckLogVo;
 import com.zhongzheng.modules.top.user.domain.TopSysUserRole;
+import com.zhongzheng.modules.top.user.service.ITopSysRoleService;
 import com.zhongzheng.modules.top.user.service.ITopSysUserRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -51,6 +54,9 @@ public class TopOldOrderCheckLogServiceImpl extends ServiceImpl<TopOldOrderCheck
     @Autowired
     private ITopSysUserRoleService topSysUserRoleService;
 
+    @Autowired
+    private ITopSysRoleService iTopSysRoleService;
+
     @Autowired
     private ITopOldOrderService iTopOldOrderService;
 
@@ -60,6 +66,7 @@ public class TopOldOrderCheckLogServiceImpl extends ServiceImpl<TopOldOrderCheck
     @Autowired
     private ITopDivideLogService iTopDivideLogService;
 
+
     @Override
     public TopOldOrderCheckLogVo queryById(Long id){
         TopOldOrderCheckLog db = this.baseMapper.selectById(id);
@@ -143,6 +150,12 @@ public class TopOldOrderCheckLogServiceImpl extends ServiceImpl<TopOldOrderCheck
         if (!roleIds.contains(checkLog.getRoleId()) && !bo.getLoginName().equals("admin") ) {
             throw new CustomException("当前账号没有审核权限");
         }
+        TopSysRole checkRole = iTopSysRoleService.getOne(new LambdaQueryWrapper<TopSysRole>()
+                .eq(TopSysRole::getRoleId, checkLog.getRoleId())
+                .last("limit 1"));
+        if(Validator.isNotEmpty(checkRole)&&"统计".equals(checkRole.getRoleName())&&bo.getCheckResult()==-1){
+            throw new CustomException("统计角色无法拒绝审核");
+        }
         switch (bo.getCheckResult()) {
             case 1://同意
                 consentCheck(checkLog, bo);
@@ -165,6 +178,26 @@ public class TopOldOrderCheckLogServiceImpl extends ServiceImpl<TopOldOrderCheck
         return true;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateBatchDivideByMonthEditBo(List<TopOldOrderCheckLogEditBo> bo) {
+        for(TopOldOrderCheckLogEditBo editBo : bo){
+            if(Validator.isEmpty(editBo.getDivideLogId())||Validator.isEmpty(editBo.getCheckFrom())||Validator.isEmpty(editBo.getCheckResult())){
+                throw new CustomException("缺少月份ID或其他参数");
+            }
+            TopDivideOrderQueryBo queryBo = new TopDivideOrderQueryBo();
+            queryBo.setDivideLogId(editBo.getDivideLogId());
+            queryBo.setOrderType(1);
+            List<TopDivideOrderVo> list = iTopDivideOrderService.queryList(queryBo);
+            for(TopDivideOrderVo vo : list){
+                editBo.setOrderSn(vo.getOrderSn());
+                updateDivideByEditBo(editBo);
+            }
+
+        }
+        return true;
+    }
+
     public void consentCheck(TopOldOrderCheckLog checkLog, TopOldOrderCheckLogEditBo bo) {
         List<TopOldOrderCheckLog> checkLogList = list(new LambdaQueryWrapper<TopOldOrderCheckLog>()
                         .eq(TopOldOrderCheckLog::getOrderSn, checkLog.getOrderSn())
@@ -215,28 +248,30 @@ public class TopOldOrderCheckLogServiceImpl extends ServiceImpl<TopOldOrderCheck
             if (ObjectUtils.isNotNull(check)) {
                 check.setCheckSign(1);//开启当前流程
                 updateById(check);
-                TopDivideOrderQueryBo orderQueryBo = new TopDivideOrderQueryBo();
-                orderQueryBo.setOrderSn(checkLog.getOrderSn());
-                orderQueryBo.setDivideType(checkLog.getCheckFrom()-1);
-                TopDivideOrderVo orderVo = iTopDivideOrderService.getByOrderSn(orderQueryBo);
-                if(Validator.isEmpty(orderVo)){
-                    throw new CustomException("月份账单数据缺失");
-                }
-                TopDivideOrderQueryBo queryBo = new TopDivideOrderQueryBo();
-                queryBo.setDivideLogId(orderVo.getDivideLogId());
-                List<TopDivideOrderVo> listOrder = iTopDivideOrderService.getFinishList(queryBo);
-                boolean allWaitPay = true;
-                for(TopDivideOrderVo divideOrderVo : listOrder){
-                    if(Validator.isNotEmpty(divideOrderVo.getCheckStatus())&&divideOrderVo.getCheckStatus()!=2){
-                        allWaitPay = false;
+                if(checkLog.getCheckFrom()==2||checkLog.getCheckFrom()==3){
+                    TopDivideOrderQueryBo orderQueryBo = new TopDivideOrderQueryBo();
+                    orderQueryBo.setOrderSn(checkLog.getOrderSn());
+                    orderQueryBo.setDivideType(checkLog.getCheckFrom()-1);
+                    TopDivideOrderVo orderVo = iTopDivideOrderService.getByOrderSn(orderQueryBo);
+                    if(Validator.isEmpty(orderVo)){
+                        throw new CustomException("月份账单数据缺失");
+                    }
+                    TopDivideOrderQueryBo queryBo = new TopDivideOrderQueryBo();
+                    queryBo.setDivideLogId(orderVo.getDivideLogId());
+                    List<TopDivideOrderVo> listOrder = iTopDivideOrderService.getFinishList(queryBo);
+                    boolean allWaitPay = true;
+                    for(TopDivideOrderVo divideOrderVo : listOrder){
+                        if(Validator.isNotEmpty(divideOrderVo.getCheckStatus())&&divideOrderVo.getCheckStatus()!=2){
+                            allWaitPay = false;
+                        }
+                    }
+                    if(allWaitPay){
+                        TopDivideLog divideLog = new TopDivideLog();
+                        divideLog.setId(orderVo.getDivideLogId());
+                        divideLog.setPayStatus(0);
+                        divideLog.setUpdateTime(DateUtils.getNowTime());
+                        iTopDivideLogService.updateById(divideLog);
                     }
-                }
-                if(allWaitPay){
-                    TopDivideLog divideLog = new TopDivideLog();
-                    divideLog.setId(orderVo.getDivideLogId());
-                    divideLog.setPayStatus(0);
-                    divideLog.setUpdateTime(DateUtils.getNowTime());
-                    iTopDivideLogService.updateById(divideLog);
                 }
             }
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderVo.java

@@ -282,4 +282,8 @@ public class TopOldOrderVo {
 	private Integer operationType;
 
 	private Long createTime;
+
+	/** 超收预期 1：7天，2:30天，3半年， 4：1年   */
+	@ApiModelProperty("超收预期 1：7天，2:30天，3半年， 4：1年")
+	private Long exceedType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderRecNoteAddBo.java

@@ -47,4 +47,7 @@ public class TopOrderRecNoteAddBo {
     private Integer status;
     @ApiModelProperty("机构ID")
     private String tenantId;
+    /** 超收预期 1：7天，2:30天，3半年， 4：1年   */
+    @ApiModelProperty("超收预期 1：7天，2:30天，3半年， 4：1年  ")
+    private Long exceedType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderRecNoteEditBo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -54,5 +55,9 @@ public class TopOrderRecNoteEditBo {
     private Integer status;
     @ApiModelProperty("机构ID")
     private String tenantId;
+    /** 超收预期 1：7天，2:30天，3半年， 4：1年   */
+    @ApiModelProperty("超收预期 1：7天，2:30天，3半年， 4：1年  ")
+    private Long exceedType;
+
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderRecNoteQueryBo.java

@@ -57,4 +57,7 @@ public class TopOrderRecNoteQueryBo extends BaseEntity {
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
 	private Integer status;
+	/** 超收预期 1：7天，2:30天，3半年， 4：1年   */
+	@ApiModelProperty("超收预期 1：7天，2:30天，3半年， 4：1年  ")
+	private Long exceedType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/domain/TopOrderRecNote.java

@@ -47,4 +47,6 @@ private static final long serialVersionUID=1L;
     /** 状态 1正常 0关闭 */
     private Integer status;
     private String tenantId;
+    /** 超收预期 1：7天，2:30天，3半年， 4：1年   */
+    private Long exceedType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/service/ITopOrderRecNoteService.java

@@ -43,6 +43,8 @@ public interface ITopOrderRecNoteService extends IService<TopOrderRecNote> {
 	 */
 	Boolean updateByEditBo(TopOrderRecNoteEditBo bo);
 
+	Boolean updateByBatchEditBo(List<TopOrderRecNoteEditBo> bo);
+
 	/**
 	 * 校验并删除数据
 	 * @param ids 主键集合

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/service/impl/TopOrderRecNoteServiceImpl.java

@@ -93,7 +93,7 @@ public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMappe
 
     @Override
     public Boolean insertByAddBo(TopOrderRecNoteAddBo bo) {
-        if(Validator.isEmpty(bo.getOrderSn())||Validator.isEmpty(bo.getTenantId())){
+        if(Validator.isEmpty(bo.getOrderSn())||Validator.isEmpty(bo.getTenantId())||Validator.isEmpty(bo.getExceedType())){
             throw new CustomException("参数缺失");
         }
         if (getOne(new LambdaQueryWrapper<TopOrderRecNote>().eq(TopOrderRecNote::getOrderSn, bo.getOrderSn()).eq(TopOrderRecNote::getTenantId, bo.getTenantId()).last("limit 1")) != null) {
@@ -132,6 +132,31 @@ public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMappe
         return this.updateById(update);
     }
 
+    @Override
+    public Boolean updateByBatchEditBo(List<TopOrderRecNoteEditBo> bo) {
+        for(TopOrderRecNoteEditBo vo : bo){
+            if(Validator.isEmpty(vo.getOrderSn())||Validator.isEmpty(vo.getExceedType())||Validator.isEmpty(vo.getTenantId())){
+                throw new CustomException("参数缺失");
+            }
+            this.remove(new LambdaQueryWrapper<TopOrderRecNote>().eq(TopOrderRecNote::getOrderSn,vo.getOrderSn()).eq(TopOrderRecNote::getTenantId,vo.getTenantId()));
+            if(Validator.isNotEmpty(vo.getStatus())&&vo.getStatus()==-1){
+                continue;
+            }
+            TopOrderRecNote add = BeanUtil.toBean(vo, TopOrderRecNote.class);
+            validEntityBeforeSave(add);
+            add.setCreateTime(DateUtils.getNowTime());
+            add.setUpdateTime(DateUtils.getNowTime());
+            if(vo.getNoteType()==1){
+                this.save(add);
+                pushOldNote(add.getOrderSn());
+            }else{
+                this.save(add);
+            }
+        }
+
+        return true;
+    }
+
     private boolean pushOldNote(String orderSn){
         TopOldOrder oldOrder = iTopOldOrderService.getOne(new LambdaQueryWrapper<TopOldOrder>()
                 .eq(TopOldOrder::getOrderSn, orderSn));

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOrderRecNoteVo.java

@@ -53,4 +53,8 @@ public class TopOrderRecNoteVo {
 	@ApiModelProperty("状态 1正常 0关闭")
 	private Integer status;
 	private String tenantId;
+	/** 超收预期 1：7天，2:30天，3半年， 4：1年   */
+	@Excel(name = "超收预期 1：7天，2:30天，3半年， 4：1年  ")
+	@ApiModelProperty("超收预期 1：7天，2:30天，3半年， 4：1年  ")
+	private Long exceedType;
 }

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

@@ -27,7 +27,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             dl.*,
             st.tenant_name,
                st.bill_type,
-               st.bill_day
+               st.bill_day,
+               (SELECT
+        cl.role_id
+        FROM
+        top_divide_order tdo
+        LEFT JOIN top_old_order_check_log cl ON tdo.order_sn = cl.order_sn
+        WHERE
+        cl.check_from = 2
+        AND cl.check_sign = 1
+        AND tdo.order_type = 1
+        AND tdo.divide_log_id = dl.id
+        LIMIT 1) as role_id,
+        (SELECT
+        r.role_name
+        FROM
+        top_divide_order tdo
+        LEFT JOIN top_old_order_check_log cl ON tdo.order_sn = cl.order_sn
+        LEFT JOIN top_sys_role r ON r.role_id = cl.role_id
+        WHERE
+        cl.check_from = 2
+        AND cl.check_sign = 1
+        AND tdo.order_type = 1
+        AND tdo.divide_log_id = dl.id
+        LIMIT 1) as role_name
         FROM
             top_divide_log dl
                 LEFT JOIN sys_tenant st ON dl.tenant_id = st.tenant_id
@@ -191,7 +214,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         dl.*,
         st.tenant_name,
-        st.bill_day
+        st.bill_day,
+        (SELECT
+        cl.role_id
+        FROM
+        top_divide_order tdo
+        LEFT JOIN top_old_order_check_log cl ON tdo.order_sn = cl.order_sn
+        WHERE
+        cl.check_from = 3
+        AND cl.check_sign = 1
+        AND tdo.order_type = 1
+        AND tdo.divide_log_id = dl.id
+        LIMIT 1) as role_id,
+        (SELECT
+        r.role_name
+        FROM
+        top_divide_order tdo
+        LEFT JOIN top_old_order_check_log cl ON tdo.order_sn = cl.order_sn
+        LEFT JOIN top_sys_role r ON r.role_id = cl.role_id
+        WHERE
+        cl.check_from = 3
+        AND cl.check_sign = 1
+        AND tdo.order_type = 1
+        AND tdo.divide_log_id = dl.id
+        LIMIT 1) as role_name
         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/TopOldOrderMapper.xml

@@ -403,7 +403,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             rn.day_time,
             rn.week_time,
             rn.month_time,
-            rn.last_time
+            rn.last_time,
+            rn.exceed_type
         FROM
             top_old_order too
                 LEFT JOIN sys_tenant st ON too.tenant_id = st.tenant_id

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

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
+        <result property="exceedType" column="exceed_type"/>
     </resultMap>