合伙人账号注册去掉18位限制+部分角色功能权限修改

core-service/src/main/java/com/winsun/item/modular/system/controller/LoginPwdController.java

@@ -664,9 +664,9 @@ public class LoginPwdController extends BaseController {
         if (StringUtils.isBlank(idCard)) {
         if (StringUtils.isBlank(idCard)) {
             return ResponseData.error("身份证号码不能为空！");
             return ResponseData.error("身份证号码不能为空！");
         }
         }
-        if (!IDCardUtil.IDCardValidate(idCard)) {
-            return ResponseData.error("身份证号码有误！");
-        }
+//        if (!IDCardUtil.IDCardValidate(idCard)) {
+//            return ResponseData.error("身份证号码有误！");
+//        }
         if (StringUtils.isBlank(stuCard)) {
         if (StringUtils.isBlank(stuCard)) {
             return ResponseData.error("请上传学生证！");
             return ResponseData.error("请上传学生证！");
         }
         }

old-user/src/main/java/com/winsun/controller/ChooseController.java

@@ -311,6 +311,7 @@ public class ChooseController {
             RhPhone rhPhone = new RhPhone();
             RhPhone rhPhone = new RhPhone();
             rhPhone.setPhone(data);
             rhPhone.setPhone(data);
             try {
             try {
+                log.info("新用户完成存融合清单:"+rhPhone);
                 rhPhoneMapper.insert(rhPhone);
                 rhPhoneMapper.insert(rhPhone);
             }catch (Exception e){
             }catch (Exception e){
                 e.printStackTrace();
                 e.printStackTrace();

service-manager/src/main/java/com/winsun/controller/OrderController.java

@@ -1532,7 +1532,7 @@ public class OrderController extends BaseController {
         }
         }
         ShiroUser user = getShiroUser();
         ShiroUser user = getShiroUser();
         // 当前是否有数据权限
         // 当前是否有数据权限
-        boolean hasDataPermission = user.getRoleNames().stream().anyMatch(data -> StringUtils.equalsAny(data, "活动上单员", "数据管理员", "超级管理员"));
+        boolean hasDataPermission = user.getRoleNames().stream().anyMatch(data -> StringUtils.equalsAny(data, "县分管理员（订单）", "数据管理员", "超级管理员"));
         if (!hasDataPermission) {
         if (!hasDataPermission) {
             return ResponseData.error("无数据权限！");
             return ResponseData.error("无数据权限！");
         }
         }

task/src/main/java/com/winsun/TimingTask/OrderTask.java

@@ -235,11 +235,11 @@ public class OrderTask {
                     insertRhPhone(order.getBusinessNumber());
                     insertRhPhone(order.getBusinessNumber());
                     // 存销售清单
                     // 存销售清单
                     insertCompleteOrder(order);
                     insertCompleteOrder(order);
-                    appMapper.inserOrderHis(order.getId(), "订单已完成"+Map.get("orderState").toString(), new Date(), "定时器查询");
+                    appMapper.inserOrderHis(order.getId(), "订单已完成，省合伙人返回状态码："+Map.get("orderState").toString(), new Date(), "定时器查询");
                 }
                 }
                 if(Map.get("orderState").toString().equals("10") || Map.get("orderState").toString().equals("11")){
                 if(Map.get("orderState").toString().equals("10") || Map.get("orderState").toString().equals("11")){
                     dataMapping.put("order_status", "异常单");
                     dataMapping.put("order_status", "异常单");
-                    appMapper.inserOrderHis(order.getId(), "订单受理失败，已设为异常单"+Map.get("orderState").toString(), new Date(), "定时器查询");
+                    appMapper.inserOrderHis(order.getId(), "订单受理失败，已设为异常单，省合伙人返回状态码："+Map.get("orderState").toString(), new Date(), "定时器查询");
                 }
                 }
                 orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
                 orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
                 log.info(order.getXbOrderId()+"订单已更新");
                 log.info(order.getXbOrderId()+"订单已更新");
@@ -298,6 +298,7 @@ public class OrderTask {
             RhPhone rhPhone = new RhPhone();
             RhPhone rhPhone = new RhPhone();
             rhPhone.setPhone(data);
             rhPhone.setPhone(data);
             try {
             try {
+                log.info("新用户完成存融合清单:"+rhPhone);
                 rhPhoneMapper.insert(rhPhone);
                 rhPhoneMapper.insert(rhPhone);
             }catch (Exception e){
             }catch (Exception e){
                 e.printStackTrace();
                 e.printStackTrace();