Merge branch 'dev'

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -1741,15 +1741,32 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 .or()
                 .eq(User::getIdCard,EncryptHandler.encrypt(bo.getAccount())));
         User user = getOne(queryWrapper);
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        Integer share = 1;
+        if (StringUtils.isNotBlank(tenantId)){
+            SysTenant sysTenant = iSysTenantService.getById(Long.valueOf(tenantId));
+            if (ObjectUtils.isNotNull(sysTenant)){
+                share = sysTenant.getShareClass();
+            }
+        }
+        
         if(Validator.isEmpty(user)){
             iUserLoginErrorService.saveErrorLog(bo.getAccount());
             //判断旧系统是否有账号
-            oldAccountLogin(bo,1);
+            if (share > 0){
+                oldAccountLogin(bo,1);
+            }else {
+                throw new CustomException("登录信息错误");
+            }
         }
         else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
         {
             //判断旧系统是否有账号
-            oldAccountLogin(bo,1);
+            if (share > 0){
+                oldAccountLogin(bo,1);
+            }else {
+                throw new CustomException("对不起，您的账号：已停用");
+            }
         }
         String password = null;
         if(bo.getPwd().length()>20){
@@ -1769,7 +1786,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         {
             iUserLoginErrorService.saveErrorLog(bo.getAccount());
             //判断旧系统是否有账号
-            oldAccountLogin(bo,1);
+            if (share > 0){
+                oldAccountLogin(bo,1);
+            }else {
+                throw new CustomException("登录信息错误");
+            }
         }
         //如果活动分销码变动
         if (StringUtils.isNotBlank(bo.getShareActivityCode())){

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

@@ -5494,7 +5494,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                     .ne(TopOldOrderGoods::getCheckStatus, -1));
                     if (CollectionUtils.isNotEmpty(list)) {
                         list.forEach(x -> userCard.add(x.getUserCard()));
-                        Set<String> collect1 = list.stream().filter(x -> x.getCheckStatus() == 0).map(TopOldOrderGoods::getOrderSn).collect(Collectors.toSet());
+                        Set<String> collect1 = list.stream().filter(x -> x.getCheckStatus() == 0 && ObjectUtils.isNotNull(x.getRelSignId())).map(TopOldOrderGoods::getOrderSn).collect(Collectors.toSet());
                         userCheckOrderSn.addAll(collect1);
                     }
                 } else {

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -73,8 +73,10 @@ import com.zhongzheng.modules.inform.vo.InformRemindBusinessVo;
 import com.zhongzheng.modules.inform.vo.InformRemindVo;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
+import com.zhongzheng.modules.system.domain.SysConfig;
 import com.zhongzheng.modules.system.domain.SysTask;
 import com.zhongzheng.modules.system.domain.SysTenant;
+import com.zhongzheng.modules.system.service.ISysConfigService;
 import com.zhongzheng.modules.system.service.ISysTaskService;
 import com.zhongzheng.modules.system.service.ISysTenantService;
 import com.zhongzheng.modules.system.vo.SysTaskVo;
@@ -194,6 +196,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     @Autowired
     private ISysTenantService iSysTenantService;
     @Autowired
+    private ISysConfigService iSysConfigService;
+    @Autowired
     private ISysTaskService iSysTaskService;
 
     @Value("${aliyun.sms.cancellationReminder}")
@@ -856,9 +860,15 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         }
 
         //考试前7个工作日不可取消预约
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysConfig config = iSysConfigService.getSysConfigByKeyTenant("subscribe.astrict", Long.valueOf(tenantId));
+        Integer day = 7;
+        if (ObjectUtil.isNotNull(config)){
+            day = Integer.valueOf(config.getConfigValue());
+        }
         Long examTime = userSubscribeVo.getApplySiteExamTime();
         //向前推7个工作日
-        Long applyEndTime = getApplyEndTime(examTime, 7);
+        Long applyEndTime = getApplyEndTime(examTime, day);
         if (DateUtils.getNowTime() >= applyEndTime){
             throw new CustomException("考前7个工作日不可取消预约！");
         }
@@ -2275,7 +2285,13 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                     .last("limit 1"));
             if (ObjectUtils.isNotNull(siteTime)){
                 Long examTime = siteTime.getExamTime();
-                Long applyEndTime = getApplyEndTime(examTime, 7);
+                String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+                SysConfig config = iSysConfigService.getSysConfigByKeyTenant("subscribe.astrict", Long.valueOf(tenantId));
+                Integer day = 7;
+                if (ObjectUtil.isNotNull(config)){
+                    day = Integer.valueOf(config.getConfigValue());
+                }
+                Long applyEndTime = getApplyEndTime(examTime, day);
                 if (DateUtils.getNowTime() >= applyEndTime){
                     throw new CustomException("该考试场次已停止预约，请选择其他场次");
                 }

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

@@ -487,7 +487,7 @@
             AND too.buy_time <![CDATA[ <= ]]> #{endTime}
         </if>
         <if test="keyNo != null and keyNo != ''">
-            AND (st.tenant_name like concat('%', #{keyNo}, '%') or too.create_no like concat('%', #{keyNo}, '%'))
+            AND (too.create_username like concat('%', #{keyNo}, '%') or too.create_no like concat('%', #{keyNo}, '%'))
         </if>
         <if test="creditStatus != null and creditStatus != ''">
             AND too.credit_status = #{creditStatus}