merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/domain/InformRemindRelevance.java

@@ -37,4 +37,6 @@ private static final long serialVersionUID=1L;
     private Long updateTime;
 
     private Long tenantId;
+    /** 关联类型：1云学堂后台 2中正总平台 */
+    private Long relevanceType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopInformRemindRelevance.java

@@ -38,4 +38,6 @@ private static final long serialVersionUID=1L;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
+    /** 关联类型：1云学堂后台 2中正总平台 */
+    private Integer relevanceType;
 }

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

@@ -128,9 +128,6 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     @Autowired
     private ITopInformSysUserService topInformSysUserService;
 
-    @Autowired
-    private IInformRemindRelevanceService informRemindRelevanceService;
-
     @Autowired
     private IInformRemindService informRemindService;
 
@@ -339,6 +336,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                         .last("limit 1"));
                         TopSysRole role = topSysRoleService.getById(checkLog.getRoleId());
                         item.setRefundName(role.getRoleName());
+                        item.setRefundRoleId(role.getRoleId());
                     }
                 }
                 //学员审核情况
@@ -1659,39 +1657,48 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
 
 
     public void informRemind(List<String> userNames) {
-        //学员退学提醒
-        List<InformRemindRelevance> remindRelevances = informRemindRelevanceService.list(new LambdaQueryWrapper<InformRemindRelevance>().eq(InformRemindRelevance::getType, 1));
+        //学员退学提醒 通知教务
+        List<TopInformRemindRelevance> remindRelevances = topInformRemindRelevanceService.list(new LambdaQueryWrapper<TopInformRemindRelevance>().eq(TopInformRemindRelevance::getType, 1));
         InformRemindVo informRemindVo = informRemindService.queryByName("学员退学提醒");
-        for (InformRemindRelevance remindVo : remindRelevances) {
-            SysUser sysUser = sysUserService.getById(remindVo.getRelevanceId());
-            if (ObjectUtil.isNull(sysUser)) {
-                continue;
-            }
-            if (informRemindVo.getWayStatus().equals(1)) {
-                InformSysUserAddBo informUserAddBo = new InformSysUserAddBo();
-                informUserAddBo.setUserId(sysUser.getUserId());
-                informUserAddBo.setSendStatus(1);
-                informUserAddBo.setSendTime(DateUtils.getNowTime());
-                informUserAddBo.setCreateTime(DateUtils.getNowTime());
-                informUserAddBo.setUpdateTime(DateUtils.getNowTime());
-                informUserAddBo.setRemindId(informRemindVo.getId());
-                informUserAddBo.setSystemStatus(1);
-                informUserAddBo.setRemind("学员退学提醒，请尽快处理");
-                informUserAddBo.setText(String.format("学员【%s】已退学，请及时处理", userNames.stream().collect(Collectors.joining())));
-                informSysUserService.insertByAddBo(informUserAddBo);
-            }
-            if (informRemindVo.getNoteStatus().equals(1) && StringUtils.isNotBlank(sysUser.getPhonenumber())) {
-                //短信提醒
-//                InformSysUserAddBo informUserAddBo = new InformSysUserAddBo();
-//                informUserAddBo.setSendStatus(1);
-//                informUserAddBo.setSendTime(DateUtils.getNowTime());
-//                informUserAddBo.setCreateTime(DateUtils.getNowTime());
-//                informUserAddBo.setUpdateTime(DateUtils.getNowTime());
-//                informUserAddBo.setRemindId(informRemindVo.getId());
-//                informUserAddBo.setSystemStatus(3);
-//                informUserAddBo.setRemind("学员退学提醒，请尽快处理");
-//                informUserAddBo.setText(String.format("学员【%s】已退学，请及时处理",userNames.stream().collect(Collectors.joining())));
-
+        for (TopInformRemindRelevance remindVo : remindRelevances) {
+            if (remindVo.getRelevanceType() == 1){
+                //云学堂系统
+                SysUser sysUser = sysUserService.getById(remindVo.getRelevanceId());
+                if (ObjectUtil.isNull(sysUser)) {
+                    continue;
+                }
+                if (informRemindVo.getWayStatus().equals(1)) {
+                    InformSysUserAddBo informUserAddBo = new InformSysUserAddBo();
+                    informUserAddBo.setUserId(sysUser.getUserId());
+                    informUserAddBo.setSendStatus(1);
+                    informUserAddBo.setSendTime(DateUtils.getNowTime());
+                    informUserAddBo.setCreateTime(DateUtils.getNowTime());
+                    informUserAddBo.setUpdateTime(DateUtils.getNowTime());
+                    informUserAddBo.setRemindId(informRemindVo.getId());
+                    informUserAddBo.setSystemStatus(1);
+                    informUserAddBo.setRemind("学员退学提醒，请尽快处理");
+                    informUserAddBo.setText(String.format("学员【%s】已退学，请及时处理", userNames.stream().collect(Collectors.joining())));
+                    informSysUserService.insertByAddBo(informUserAddBo);
+                }
+            }else {
+                //总正总平台
+                TopSysUser sysUser = topSysUserService.getById(remindVo.getRelevanceId());
+                if (ObjectUtil.isNull(sysUser)) {
+                    continue;
+                }
+                if (informRemindVo.getWayStatus().equals(1)) {
+                    TopInformSysUserAddBo informUserAddBo = new TopInformSysUserAddBo();
+                    informUserAddBo.setUserId(sysUser.getUserId());
+                    informUserAddBo.setSendStatus(1);
+                    informUserAddBo.setSendTime(DateUtils.getNowTime());
+                    informUserAddBo.setCreateTime(DateUtils.getNowTime());
+                    informUserAddBo.setUpdateTime(DateUtils.getNowTime());
+                    informUserAddBo.setRemindId(informRemindVo.getId());
+                    informUserAddBo.setSystemStatus(1);
+                    informUserAddBo.setRemind("学员退学提醒，请尽快处理");
+                    informUserAddBo.setText(String.format("学员【%s】已退学，请及时处理", userNames.stream().collect(Collectors.joining())));
+                    topInformSysUserService.insertByAddBo(informUserAddBo);
+                }
             }
         }
 
@@ -2061,6 +2068,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             default:
                 break;
         }
+        //消息通知
+        informRemindOrderCheck(String.format("【%s】订单审核%s【%s】", bo.getOrderSn(), bo.getCheckResult() == 1?"已通过":"已拒绝",bo.getLoginName()));
         return true;
     }
 
@@ -2244,8 +2253,6 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 check.setCheckSign(1);//开启当前流程
                 topOldOrderCheckLogService.updateById(check);
             }
-            //消息通知
-            informRemindOrderCheck(String.format("【%s】订单已通过【%s】审核", bo.getOrderSn(), bo.getLoginName()));
         }
         TopOldOrder oldOrder = baseMapper.getOrderBySn(bo.getOrderSn());
         if (oldOrder.getOrderFrom() != 1) {
@@ -2588,6 +2595,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
 
     //完单校验
     private void validFinish(TopFinishOrderBo bo) {
+        if ("admin".equals(bo.getLoginName())){
+            return;
+        }
         //校验当前角色审核权限
         List<TopSysUserRole> userRoleList = topSysUserRoleService.list(new LambdaQueryWrapper<TopSysUserRole>().eq(TopSysUserRole::getUserId, bo.getLoginId()));
         if (CollectionUtils.isEmpty(userRoleList) && !bo.getLoginName().equals("admin")) {
@@ -2600,8 +2610,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                         .eq(TopOldOrderCheck::getStatus, 1)
                         .last("limit 1"));
 
-        if (!"admin".equals(bo.getLoginName()) || ObjectUtil.isNull(orderCheck) ||
-                (roleIds.stream().noneMatch(x -> x.equals(orderCheck.getCheckRole())))) {
+        if (ObjectUtil.isNull(orderCheck) || (roleIds.stream().noneMatch(x -> x.equals(orderCheck.getCheckRole())))) {
             throw new CustomException("当前账号没有审核权限");
         }
     }
@@ -3013,8 +3022,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                         }
 
                         if ((ObjectUtils.isNull(x.getMinValue()) && ObjectUtils.isNull(x.getMaxValue()))
-                                || (price.compareTo(x.getMinValue()) > 0 && price.compareTo(x.getMaxValue()) < 0)
-                                || (price.compareTo(x.getMinValue()) == 0 && price.compareTo(x.getMaxValue()) == 0)) {
+                                || (price.compareTo(x.getMinValue()) > 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) < 0))
+                                || (price.compareTo(x.getMinValue()) == 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) == 0))){
                             tpItems.add(x);
                         }
                     }

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

@@ -237,6 +237,9 @@ public class TopOldOrderVo {
 	@ApiModelProperty("退款审核角色名称")
 	private String refundName;
 
+	@ApiModelProperty("退款审核角色ID")
+	private Long refundRoleId;
+
 	@ApiModelProperty("审核进度")
 	private List<TopOldOrderCheckLogVo> checkLogVos;