no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/config/aop/ApiAspect.java

@@ -54,10 +54,6 @@ public class ApiAspect {
         Method sourceMethod = getSourceMethod(joinPoint);
         HttpServletRequest request = attributes.getRequest();
 
-        if(!"prd".equals(profiles) && "1519917103581302785".equals(CommonUtils.getUserId(request))){
-            log.info("-->[url:"+request.getRequestURI()+"]");
-        }
-
         ApiNotAuth apiNotAuth = sourceMethod.getAnnotation(ApiNotAuth.class);
         if(apiNotAuth != null){
             return;

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/constant/Constant.java

@@ -29,37 +29,37 @@ public class Constant {
     }
 
     public class RedisPrefix{
-        public final static String WORK_MINI_ACCESS_TOKEN = "jsm:sxb:work:mini:access:token";
-        public final static String TOKEN_WX = "jsm:sxb:token:wx";
-        public final static String TOKEN_APP_USER = "jsm:sxb:token:app:user:";
-        public final static String TOKEN_GREE = "jsm:sxb:token:gree";
-        public final static String LOCK_ORDER = "jsm:sxb:lock:order";
-        public final static String LOCK_ORDER_STOCK = "jsm:sxb:lock:stock";
-        public final static String SEC_IDENTIFIER = "jsm:sxb:sec:identifier";
-        public final static String LOCK_COUPON = "jsm:sxb:lock:coupon";
-        public final static String LOCK_GIFT = "jsm:sxb:lock:gift";
-        public final static String LOCK_COUPON_TRANSFER = "jsm:sxb:lock:coupon:transfer";
-        public final static String LOCK_COUPON_CHECK = "jsm:sxb:lock:coupon:check";
-        public final static String LOCK_AUTH = "jsm:sxb:lock:auth";
-        public final static String SMS = "jsm:sxb:sms";
-        public final static String VERIFICATION = "jsm:sxb:verification";
-        public final static String SMS_BIND_CODE= "jsm:sxb:sms:bind:";
-        public final static String TOKEN_TAX = "jsm:sxb:token:tax";
-        public final static String TOKEN_GONGDAN = "jsm:sxb:token:gongdan";
-        public final static String LOCK_EXCHANGE_CODE = "jsm:sxb:lock:exchangecode";
+        public final static String WORK_MINI_ACCESS_TOKEN = "zfire:overseas:work:mini:access:token";
+        public final static String TOKEN_WX = "zfire:overseas:token:wx";
+        public final static String TOKEN_APP_USER = "zfire:overseas:token:app:user:";
+        public final static String TOKEN_GREE = "zfire:overseas:token:gree";
+        public final static String LOCK_ORDER = "zfire:overseas:lock:order";
+        public final static String LOCK_ORDER_STOCK = "zfire:overseas:lock:stock";
+        public final static String SEC_IDENTIFIER = "zfire:overseas:sec:identifier";
+        public final static String LOCK_COUPON = "zfire:overseas:lock:coupon";
+        public final static String LOCK_GIFT = "zfire:overseas:lock:gift";
+        public final static String LOCK_COUPON_TRANSFER = "zfire:overseas:lock:coupon:transfer";
+        public final static String LOCK_COUPON_CHECK = "zfire:overseas:lock:coupon:check";
+        public final static String LOCK_AUTH = "zfire:overseas:lock:auth";
+        public final static String SMS = "zfire:overseas:sms";
+        public final static String VERIFICATION = "zfire:overseas:verification";
+        public final static String SMS_BIND_CODE= "zfire:overseas:sms:bind:";
+        public final static String TOKEN_TAX = "zfire:overseas:token:tax";
+        public final static String TOKEN_GONGDAN = "zfire:overseas:token:gongdan";
+        public final static String LOCK_EXCHANGE_CODE = "zfire:overseas:lock:exchangecode";
         //订单号每日流水
-        public final static String ORDER_NUM = "jsm:sxb:orderNo:";
-        public final static String MATERIAL_STOCK_LOCK = "jsm:sxb:lock:material:stock:";
-        public final static String LEASE_ORDER_LOCK = "jsm:sxb:lock:lease:order:";
-        public final static String ES_GOODS_LOCK = "jsm:sxb:lock:es:goods:";
+        public final static String ORDER_NUM = "zfire:overseas:orderNo:";
+        public final static String MATERIAL_STOCK_LOCK = "zfire:overseas:lock:material:stock:";
+        public final static String LEASE_ORDER_LOCK = "zfire:overseas:lock:lease:order:";
+        public final static String ES_GOODS_LOCK = "zfire:overseas:lock:es:goods:";
 
         // 接口令牌
-        public final static String INF_TOKEN = "jsm:sxb:token:inf";
+        public final static String INF_TOKEN = "zfire:overseas:token:inf";
 
         // 查询通联支付订单信息
-        public final static String QUERY_ALLINPAY_ORDER = "jsm:sxb:lock:a:query:order:";
-        public static final String PARTS_SALES = "jsm:sxb:lock:parts:sales:";
-        public static final String WRITE_SALES_ITEM = "jsm:sxb:parts:write:sales:item:";
+        public final static String QUERY_ALLINPAY_ORDER = "zfire:overseas:lock:a:query:order:";
+        public static final String PARTS_SALES = "zfire:overseas:lock:parts:sales:";
+        public static final String WRITE_SALES_ITEM = "zfire:overseas:parts:write:sales:item:";
     }
 
     //礼品卡支持的市

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -345,10 +345,10 @@ public class UserLogic {
      */
     public void userTypeInit2(User user) {
         String mobile = user.getMobile();
-        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
+//        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         List<UserWait> list = userWaitService.lambdaQuery()
                 .eq(UserWait::getMobile, mobile)
-                .eq(UserWait::getCompanyWechatId, currentCompanyWechat.getCurrentCompanyWechatId())
+//                .eq(UserWait::getCompanyWechatId, currentCompanyWechat.getCurrentCompanyWechatId())
                 .eq(UserWait::getIsAdd, false)
                 .list();
         if (CollectionUtils.isEmpty(list)) {
@@ -358,35 +358,36 @@ public class UserLogic {
         UserTypeEnum userTypeEnum = UserTypeEnum.valueOf(user.getType());
         for (UserWait userWait : list) {
             user.setWorkerNumber(userWait.getWorkerNumber());
+            user.setOpenId(userWait.getWorkerNumber());
             user.setNickName(userWait.getName());
             if (StringUtils.isBlank(user.getIdCard())) {
                 user.setIdCard(userWait.getIdcard());
             }
             //非师傅状态，只有有1个入驻师傅的就是师傅
-            if (userWait.getUserType().equals(UserTypeEnum.WORKER.getKey())) {
-
-                userTypeEnum = UserTypeEnum.WORKER;
-
-                if (!user.getType().equals(UserTypeEnum.WORKER.getKey())) {
-                    //新增网点师傅,先删后增
-                    websitUserService.lambdaUpdate()
-                            .eq(WebsitUser::getWebsitId, userWait.getWebsitId())
-                            .eq(WebsitUser::getUserId, user.getUserId())
-                            .remove();
-
-                    WebsitUser websitUser = new WebsitUser();
-                    websitUser.setUserId(user.getUserId());
-                    websitUser.setWebsitId(userWait.getWebsitId());
-                    websitUser.setExamineStatus(ExamineStatusEnum.OK.getKey());
-                    websitUser.setExamineTime(new Date());
-                    websitUser.setExamineRemark("初始化");
-                    websitUser.setBankAccount(userWait.getBankAccount());
-                    websitUser.setWorkerNumber(userWait.getWorkerNumber());
-                    websitUser.setCompanyWechatId(currentCompanyWechat.getCurrentCompanyWechatId());
-                    websitUser.setCompanyWechatName(currentCompanyWechat.getCompanyName());
-                    websitUser.insert();
-                }
-            }
+//            if (userWait.getUserType().equals(UserTypeEnum.WORKER.getKey())) {
+//
+//                userTypeEnum = UserTypeEnum.WORKER;
+//
+//                if (!user.getType().equals(UserTypeEnum.WORKER.getKey())) {
+//                    //新增网点师傅,先删后增
+//                    websitUserService.lambdaUpdate()
+//                            .eq(WebsitUser::getWebsitId, userWait.getWebsitId())
+//                            .eq(WebsitUser::getUserId, user.getUserId())
+//                            .remove();
+//
+//                    WebsitUser websitUser = new WebsitUser();
+//                    websitUser.setUserId(user.getUserId());
+//                    websitUser.setWebsitId(userWait.getWebsitId());
+//                    websitUser.setExamineStatus(ExamineStatusEnum.OK.getKey());
+//                    websitUser.setExamineTime(new Date());
+//                    websitUser.setExamineRemark("初始化");
+//                    websitUser.setBankAccount(userWait.getBankAccount());
+//                    websitUser.setWorkerNumber(userWait.getWorkerNumber());
+//                    websitUser.setCompanyWechatId(currentCompanyWechat.getCurrentCompanyWechatId());
+//                    websitUser.setCompanyWechatName(currentCompanyWechat.getCompanyName());
+//                    websitUser.insert();
+//                }
+//            }
         }
         user.setApplyType(userTypeEnum.getKey());
         user.setType(userTypeEnum.getKey());
@@ -582,7 +583,7 @@ public class UserLogic {
 
     private UserWxBean appUser(User user) {
         UserWxBean userWxBean = new UserWxBean();
-        String token = JwtUtils.createJWT(user.getUserId(), user.getNickName(), 7 * 24 * 60 * 60);
+        String token = JwtUtils.createJWT(user.getUserId(), user.getNickName(), 7 * 24 * 60 * 60 * 1000);
         BeanUtils.copyProperties(user, userWxBean);
         userWxBean.setToken(token);
         redisUtil.set(Constant.RedisPrefix.TOKEN_WX + token, userWxBean.getUserId(), 7 * 24 * 60 * 60);
@@ -1302,9 +1303,10 @@ public class UserLogic {
             throw new RemoteServiceException("短信验证码错误");
         }
 
-        final AdminCompanyWechat wechat = adminCompanyWechatService.lambdaQuery()
-                .last("limit 1")
-                .one();
+//        final AdminCompanyWechat wechat = adminCompanyWechatService.lambdaQuery()
+//                .last("limit 1")
+//                .one();
+        final AdminCompanyWechat wechat = null;
 
         User user = this.initAppUser(wechat, mobile);
 
@@ -1316,9 +1318,10 @@ public class UserLogic {
                 .eq(User::getMobile, mobile)
                 .eq(User::getType, UserTypeEnum.WORKER.getKey())
                 .last("limit 1")
-                .one();;
+                .one();
+        UserWait userWait = null;
         if (Objects.isNull(user)) {
-            UserWait userWait = userWaitService.lambdaQuery()
+            userWait = userWaitService.lambdaQuery()
                     .eq(UserWait::getMobile, mobile)
                     .eq(UserWait::getUserType, UserTypeEnum.WORKER.getKey())
                     .last("limit 1")
@@ -1338,14 +1341,14 @@ public class UserLogic {
 
         try {
             //如果用户不存在则新注册
-            if (Objects.isNull(user) ) {
+            if (Objects.isNull(user)) {
                 user = new User();
-                user.setUserId(IdWorker.getIdStr());
+                user.setUserId(userWait.getWorkerNumber());
                 user.setLastLoginTime(new Date());
                 user.setCreateTime(new Date());
                 user.setMobile(mobile);
-                user.setCompanyWechatId(wechat.getCompanyWechatId());
-                user.setCompanyName(wechat.getCompanyName());
+//                user.setCompanyWechatId(wechat.getCompanyWechatId());
+//                user.setCompanyName(wechat.getCompanyName());
                 userService.save(user);
             } else {
                 //如果用户存在，并更新相关信息

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/utils/CommonUtils.java

@@ -4,6 +4,7 @@ package com.gree.mall.miniapp.utils;
 import cn.hutool.core.util.StrUtil;
 import com.gree.mall.miniapp.constant.Constant;
 import com.gree.mall.miniapp.exception.RemoteServiceException;
+import com.gree.mall.miniapp.helper.ResponseHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.jdom.Document;
 import org.jdom.Element;
@@ -25,77 +26,77 @@ import java.util.Map;
 public class CommonUtils {
 
 
-    public static String getAPPID(HttpServletRequest request){
+    public static String getAPPID(HttpServletRequest request) {
         String header = request.getHeader(Constant.APPID);
-        if(StringUtils.isBlank(header)){
+        if (StringUtils.isBlank(header)) {
             header = Constant.DEF_APPID;
         }
-      //  header = Constant.DEF_APPID;
+        //  header = Constant.DEF_APPID;
         return header;
     }
 
-    public static List<String> initList(List<String> list,int size){
+    public static List<String> initList(List<String> list, int size) {
         int listSize = list.size();
-        if(listSize < size){
-            for(int i = listSize;i < size;i++){
+        if (listSize < size) {
+            for (int i = listSize; i < size; i++) {
                 list.add("");
             }
         }
         return list;
     }
 
-    public static String getStatusNameOfStudentExam(int status){
-        if(status == 1){
+    public static String getStatusNameOfStudentExam(int status) {
+        if (status == 1) {
             return "未完成";
-        }else if(status == 2){
+        } else if (status == 2) {
             return "已完成";
-        }else if(status == 0){
+        } else if (status == 0) {
             return "作废";
         }
         return "";
     }
 
     //(1.未考试 2.已及格,3.未及格)
-    public static String getExamStatusNameOfStudentExam(int examStatus){
-        if(examStatus == 1){
+    public static String getExamStatusNameOfStudentExam(int examStatus) {
+        if (examStatus == 1) {
             return "未考试";
-        }else if(examStatus == 2){
+        } else if (examStatus == 2) {
             return "已及格";
-        }else{
+        } else {
             return "未及格";
         }
     }
 
-    public static String getSourceName(int source){
-        if(source == 1){
+    public static String getSourceName(int source) {
+        if (source == 1) {
             return "后台新增";
-        }else{
+        } else {
             return "线上报名";
         }
     }
 
-    public static Boolean checkNotEmpty(Object... str){
-        for(Object s : str){
-            if(s instanceof String) {
-                String value = (String)s;
+    public static Boolean checkNotEmpty(Object... str) {
+        for (Object s : str) {
+            if (s instanceof String) {
+                String value = (String) s;
                 if (StringUtils.isBlank(value)) {
                     return false;
                 }
-            }else if(s == null) {
+            } else if (s == null) {
                 return false;
             }
         }
         return true;
     }
 
-    public static Boolean checkDate(String dateStr,String dateFormat){
-        if(StringUtils.isBlank(dateStr)){
+    public static Boolean checkDate(String dateStr, String dateFormat) {
+        if (StringUtils.isBlank(dateStr)) {
             return true;
         }
         SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
-        try{
+        try {
             sdf.parse(dateStr);
-        }catch(Exception e){
+        } catch (Exception e) {
             return false;
         }
         return true;
@@ -112,7 +113,7 @@ public class CommonUtils {
     /**
      * 从token获取userId
      */
-    public static String getUserId(HttpServletRequest request){
+    public static String getUserId(HttpServletRequest request) {
         try {
             String token = getToken(request);
             if (StringUtils.isBlank(token)) {
@@ -121,27 +122,27 @@ public class CommonUtils {
             if (StringUtils.isBlank(token)) {
                 token = request.getParameter("x-token");
             }
-            if(StringUtils.isBlank(token)){
+            if (StringUtils.isBlank(token)) {
                 return null;
             }
             return JwtUtils.validateJWT(token).getClaims().getId();
-        }catch(Exception e){
-            return "";
+        } catch (Exception e) {
+            throw new RemoteServiceException(ResponseHelper.ResponseCode_AUTH_ERROR, "token过期");
         }
     }
 
-    public static String getNickName(){
+    public static String getNickName() {
         HttpServletRequest request = RequestContextHolder.getRequestAttributes() != null ? ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest() : null;
         return getNickName(request);
     }
 
-    public static String getNickName(HttpServletRequest request){
-        try{
+    public static String getNickName(HttpServletRequest request) {
+        try {
             String token = getToken(request);
-            if(StringUtils.isBlank(token))
+            if (StringUtils.isBlank(token))
                 return null;
             return JwtUtils.validateJWT(token).getClaims().getSubject();
-        }catch(Exception e){
+        } catch (Exception e) {
             return "";
         }
     }
@@ -149,7 +150,7 @@ public class CommonUtils {
     /**
      * 获取token
      */
-    public static String getToken(HttpServletRequest request){
+    public static String getToken(HttpServletRequest request) {
         String token = request.getHeader("x-token");
         return token;
     }
@@ -158,20 +159,21 @@ public class CommonUtils {
     /**
      * 获取来源
      */
-    public static String getSource(HttpServletRequest request){
+    public static String getSource(HttpServletRequest request) {
         String token = request.getHeader("source");
         return token;
     }
 
     /**
      * 获取性别code
+     *
      * @param gender
      * @return
      */
-    public static String getGenderCode(String gender){
-        if(org.apache.commons.lang3.StringUtils.equals(gender,"男")){
+    public static String getGenderCode(String gender) {
+        if (org.apache.commons.lang3.StringUtils.equals(gender, "男")) {
             return "1";
-        }else if(org.apache.commons.lang3.StringUtils.equals(gender,"女")){
+        } else if (org.apache.commons.lang3.StringUtils.equals(gender, "女")) {
             return "2";
         }
         //未知
@@ -179,7 +181,7 @@ public class CommonUtils {
     }
 
     public static void downloadFile(String fileName, HttpServletResponse response) throws IOException {
-        InputStream inputStream  = CommonUtils.class.getResourceAsStream("/mapper/" + fileName);
+        InputStream inputStream = CommonUtils.class.getResourceAsStream("/mapper/" + fileName);
         response.setContentType("content-type:octet-stream");
         response.setHeader("Content-disposition", "attachment; filename=" + URLEncoder.encode(fileName, "UTF-8"));
         OutputStream outputStream = response.getOutputStream();
@@ -195,13 +197,14 @@ public class CommonUtils {
 
     /**
      * 检查下标对应的值不能为空
+     *
      * @param row
      * @param index
      * @return
      */
-    public static Integer checkRowEmpty(List<String> row, int[] index){
-        for(int i : index){
-            if(StringUtils.isBlank(row.get(i))){
+    public static Integer checkRowEmpty(List<String> row, int[] index) {
+        for (int i : index) {
+            if (StringUtils.isBlank(row.get(i))) {
                 return i;
             }
         }
@@ -261,12 +264,13 @@ public class CommonUtils {
 
     /**
      * 根据URL地址获取文件
-     * @param path URL网络地址
+     *
+     * @param path          URL网络地址
      * @param checkStr
      * @param replacePrefix
      * @return File
      */
-    public static File getFileByHttpURL(String path, String address, String checkStr, String replacePrefix){
+    public static File getFileByHttpURL(String path, String address, String checkStr, String replacePrefix) {
         String newUrl = path.split("[?]")[0];
         String[] suffix = newUrl.split("/");
         //得到最后一个分隔符后的名字
@@ -279,20 +283,20 @@ public class CommonUtils {
         File file = null;
         InputStream inputStream = null;
         OutputStream outputStream = null;
-        try{
-            file = new File(address+"/"+fileName);//创建临时文件
+        try {
+            file = new File(address + "/" + fileName);//创建临时文件
             URL urlFile = new URL(reqUrl);
             inputStream = urlFile.openStream();
             outputStream = new FileOutputStream(file);
 
             int bytesRead = 0;
             byte[] buffer = new byte[8192];
-            while ((bytesRead=inputStream.read(buffer,0,8192))!=-1) {
+            while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) {
                 outputStream.write(buffer, 0, bytesRead);
             }
-        }catch (Exception e) {
+        } catch (Exception e) {
             throw new RemoteServiceException(e.getMessage());
-        }finally {
+        } finally {
             try {
                 if (null != outputStream) {
                     outputStream.close();
@@ -311,30 +315,31 @@ public class CommonUtils {
 
     /**
      * 根据URL地址获取文件
+     *
      * @param path URL网络地址
      * @return File
      */
-    public static File getFileByHttpURL(String path, String address, String fileName){
+    public static File getFileByHttpURL(String path, String address, String fileName) {
         String newUrl = path.split("[?]")[0];
         String[] suffix = newUrl.split("/");
         //得到最后一个分隔符后的名字
         File file = null;
         InputStream inputStream = null;
         OutputStream outputStream = null;
-        try{
-            file = new File(address+"/"+fileName);//创建临时文件
+        try {
+            file = new File(address + "/" + fileName);//创建临时文件
             URL urlFile = new URL(path);
             inputStream = urlFile.openStream();
             outputStream = new FileOutputStream(file);
 
             int bytesRead = 0;
             byte[] buffer = new byte[8192];
-            while ((bytesRead=inputStream.read(buffer,0,8192))!=-1) {
+            while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) {
                 outputStream.write(buffer, 0, bytesRead);
             }
-        }catch (Exception e) {
+        } catch (Exception e) {
             throw new RemoteServiceException(e.getMessage());
-        }finally {
+        } finally {
             try {
                 if (null != outputStream) {
                     outputStream.close();
@@ -351,5 +356,4 @@ public class CommonUtils {
     }
 
 
-
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/utils/JwtUtils.java

@@ -27,7 +27,7 @@ public class JwtUtils {
      *
      * @param id
      * @param subject
-     * @param ttlMillis
+     * @param ttlMillis 毫秒
      * @return
      */
     public static String createJWT(String id, String subject, long ttlMillis) {
@@ -111,7 +111,8 @@ public class JwtUtils {
      */
     public static void main(String[] args) throws InterruptedException {
         //小明失效 10s
-        String sc = createJWT("1445319217002860546", "onB5y5T--4Zw8iMHp7l6G4hHW-gE", 7*24*60*60*1000);
+//        String sc = createJWT("1445319217002860546", "onB5y5T--4Zw8iMHp7l6G4hHW-gE", 7*24*60*60*1000);
+        String sc = "eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiIxOTYxMDA2MjYzODEzOTg0MjU4Iiwic3ViIjoi5byg54-K54-KIiwiaXNzIjoiUnVud2lzZSIsImlhdCI6MTc1NjUxNTcwMywiZXhwIjoxNzU2NTE2MzA4fQ.YhpeDnjpfMcM3A-glnjoiFHh-XqaejfqJFBqe0suU_4";
         System.out.println(sc);
         System.out.println(validateJWT(sc).getErrCode());
         System.out.println(validateJWT(sc).getClaims().getId());

mall-server-api/src/main/java/com/gree/mall/manager/constant/Constant.java

@@ -48,54 +48,54 @@ public class Constant {
     }
 
     public class RedisPrefix {
-        public final static String LOCK_LOGIN = "jsm:sxb:login:";
-        public final static String WORK_MINI_ACCESS_TOKEN = "jsm:sxb:work:mini:access:token";
-        public final static String TOKEN_WX = "jsm:sxb:token:wx";
+        public final static String LOCK_LOGIN = "zfire:overseas:login:";
+        public final static String WORK_MINI_ACCESS_TOKEN = "zfire:overseas:work:mini:access:token";
+        public final static String TOKEN_WX = "zfire:overseas:token:wx";
         public final static String TOKEN_MP_WX = "mp:token:wx";
-        public final static String TOKEN_TAX = "jsm:sxb:token:tax";
-        public final static String TOKEN_GONGDAN = "jsm:sxb:token:gongdan";
-        public final static String LOCK_ORDER = "jsm:sxb:lock:order";
-        public final static String LOCK_ORDER_STOCK = "jsm:sxb:lock:stock";
-        public final static String LOCK_WX_SYNC = "jsm:sxb:lock:wx:sync";
-        public final static String LOCK_SOP_SYNC = "jsm:sxb:lock:sop";
+        public final static String TOKEN_TAX = "zfire:overseas:token:tax";
+        public final static String TOKEN_GONGDAN = "zfire:overseas:token:gongdan";
+        public final static String LOCK_ORDER = "zfire:overseas:lock:order";
+        public final static String LOCK_ORDER_STOCK = "zfire:overseas:lock:stock";
+        public final static String LOCK_WX_SYNC = "zfire:overseas:lock:wx:sync";
+        public final static String LOCK_SOP_SYNC = "zfire:overseas:lock:sop";
         public final static String CHAT_MESSAGE_SEQ_KEY = "CHAT_MESSAGE_SEQ";
-        public final static String LOCK_EXCHANGE_CODE = "jsm:sxb:lock:exchangecode";
-        public final static String PARTS_BASE_MANAGE = "jsm:sxb:lock:parts:base:manage:";
-        public final static String MATERIAL_CATEGORY = "jsm:sxb:lock:material:category:";
-        public final static String MATERIAL_PURCHASE = "jsm:sxb:lock:material:purchase:";
-        public final static String MATERIAL_STOCK_LOCK = "jsm:sxb:lock:material:stock:";
-        public final static String MATERIAL_SALES = "jsm:sxb:lock:material:sales:";
-        public final static String GOODS_MATERIAL_PURCHASE = "jsm:sxb:lock:goods:material:purchase:";
-        public final static String GOODS_MATERIAL_PURCHASE_RET = "jsm:sxb:lock:goods:material:purchase:ret:";
-        public final static String MATERIAL_WORKER_INCR = "jsm:sxb:lock:material:worker:incr";
-        public final static String TRADE_RECORD_LOCK = "jsm:sxb:lock:trade:record:";
+        public final static String LOCK_EXCHANGE_CODE = "zfire:overseas:lock:exchangecode";
+        public final static String PARTS_BASE_MANAGE = "zfire:overseas:lock:parts:base:manage:";
+        public final static String MATERIAL_CATEGORY = "zfire:overseas:lock:material:category:";
+        public final static String MATERIAL_PURCHASE = "zfire:overseas:lock:material:purchase:";
+        public final static String MATERIAL_STOCK_LOCK = "zfire:overseas:lock:material:stock:";
+        public final static String MATERIAL_SALES = "zfire:overseas:lock:material:sales:";
+        public final static String GOODS_MATERIAL_PURCHASE = "zfire:overseas:lock:goods:material:purchase:";
+        public final static String GOODS_MATERIAL_PURCHASE_RET = "zfire:overseas:lock:goods:material:purchase:ret:";
+        public final static String MATERIAL_WORKER_INCR = "zfire:overseas:lock:material:worker:incr";
+        public final static String TRADE_RECORD_LOCK = "zfire:overseas:lock:trade:record:";
         //订单号每日流水
-        public final static String ORDER_NUM = "jsm:sxb:orderNo:";
+        public final static String ORDER_NUM = "zfire:overseas:orderNo:";
 
-        public final static String LOCK_WALLET = "jsm:sxb:orderNo:LOCK_WALLET";
+        public final static String LOCK_WALLET = "zfire:overseas:orderNo:LOCK_WALLET";
 
-        public final static String LOCK_GOODS_MATERIAL = "jsm:sxb:goods:material:";
+        public final static String LOCK_GOODS_MATERIAL = "zfire:overseas:goods:material:";
 
-        public final static String ORDER_ENGIN_BASE =  "jsm:sxb:lock:order:engin:base:";
+        public final static String ORDER_ENGIN_BASE =  "zfire:overseas:lock:order:engin:base:";
 
         // 接口令牌
-        public final static String INF_TOKEN = "jsm:sxb:token:inf";
+        public final static String INF_TOKEN = "zfire:overseas:token:inf";
 
         //维修日结汇总
-        public final static String LOCK_DAILY_BANKACCOUNT = "jsm:sxb:SETTLE:LOCK:BANKACCOUNT:";
-        public final static String LOCK_DAILY_SUMMARY = "jsm:sxb:SETTLE:LOCK:DAILY:SUMMARY";
-        public final static String BALANCE_SEL_MOBILE_SMS = "jsm:sxb:SETTLE:BALANCE:SMS";
-        public final static String ISSUE_SAL_MOBILE_SMS = "jsm:sxb:SETTLE:ISSUE:SMS";
-        public final static String LOCK_SUMMARY_ISSUE = "jsm:sxb:SETTLE:lock:issue:summary";
-        public static final String LOCK_MATERIAL_PURCHASE = "jsm:sxb:material:purchase:";
-
-        public final static String NEW_IN = "jsm:sxb:parts:new:in:";
-        public static final String OLD_OUT = "jsm:sxb:parts:old:out:";
-        public static final String NEW_REFUND = "jsm:sxb:parts:new:refund:";
-        public static final String PARTS_SALES = "jsm:sxb:lock:parts:sales:";
-        public static final String WRITE_SALES_ITEM = "jsm:sxb:parts:write:sales:item:";
-        public static final String NEW_CHANGE = "jsm:sxb:parts:change:sales:";
-        public static final String PARTS_REFUND = "jsm:sxb:lock:parts:refund";
+        public final static String LOCK_DAILY_BANKACCOUNT = "zfire:overseas:SETTLE:LOCK:BANKACCOUNT:";
+        public final static String LOCK_DAILY_SUMMARY = "zfire:overseas:SETTLE:LOCK:DAILY:SUMMARY";
+        public final static String BALANCE_SEL_MOBILE_SMS = "zfire:overseas:SETTLE:BALANCE:SMS";
+        public final static String ISSUE_SAL_MOBILE_SMS = "zfire:overseas:SETTLE:ISSUE:SMS";
+        public final static String LOCK_SUMMARY_ISSUE = "zfire:overseas:SETTLE:lock:issue:summary";
+        public static final String LOCK_MATERIAL_PURCHASE = "zfire:overseas:material:purchase:";
+
+        public final static String NEW_IN = "zfire:overseas:parts:new:in:";
+        public static final String OLD_OUT = "zfire:overseas:parts:old:out:";
+        public static final String NEW_REFUND = "zfire:overseas:parts:new:refund:";
+        public static final String PARTS_SALES = "zfire:overseas:lock:parts:sales:";
+        public static final String WRITE_SALES_ITEM = "zfire:overseas:parts:write:sales:item:";
+        public static final String NEW_CHANGE = "zfire:overseas:parts:change:sales:";
+        public static final String PARTS_REFUND = "zfire:overseas:lock:parts:refund";
     }
     public class ChatMessage {
         public final static String MSG_TYPE_DOC = "docmsg";

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.listvo.User2VO;
@@ -228,58 +229,62 @@ public class UserLogic {
             List<Object> row = (List<Object>) o;
             CommonUtils.initList2(row, 10);
             String name = (String) row.get(0);
-            String idcard = (String) row.get(1);
+//            String idcard = (String) row.get(1);
             String mobile = (String) row.get(2);
-            String userType = (String) row.get(3);
-            String websitId = (String) row.get(4);
+//            String userType = (String) row.get(3);
+//            String websitId = (String) row.get(4);
             String bankAccount = (String) row.get(5);
-            String workerNumber = (String) row.get(6);
-            if (StringUtils.isAnyBlank(name, mobile, userType)) {
+//            String workerNumber = (String) row.get(6);
+//            if (StringUtils.isAnyBlank(name, mobile, userType)) {
+//                throw new RemoteServiceException(errPrefix + "黄色区域为必填项");
+//            }
+            if (StringUtils.isAnyBlank(name, mobile)) {
                 throw new RemoteServiceException(errPrefix + "黄色区域为必填项");
             }
             if (mobile.length() != 11) {
                 throw new RemoteServiceException(errPrefix + "手机号格式不正确");
             }
-            UserTypeEnum userTypeEnum = BaseEnum.valueToEnum(UserTypeEnum.class, userType);
-            if (Objects.isNull(userTypeEnum) || userTypeEnum == UserTypeEnum.GENERAL) {
-                throw new RemoteServiceException(errPrefix + "用户类型填写不合规，请填写【师傅】或者【分销员】");
-            }
-            AdminWebsit adminWebsit = null;
-            if (userTypeEnum == UserTypeEnum.WORKER) {
-                if (StringUtils.isBlank(websitId)) {
-                    throw new RemoteServiceException(errPrefix + "网点编号不能为空");
-                }
-                adminWebsit = websitMap.get(websitId);
-                if (Objects.isNull(adminWebsit)) {
-                    throw new RemoteServiceException(errPrefix + "网点不存在");
-                }
-            }
-            if (StringUtils.isBlank(workerNumber)) {
-                throw new RemoteServiceException(errPrefix + "师傅编号不能为空");
-            }
+//            UserTypeEnum userTypeEnum = BaseEnum.valueToEnum(UserTypeEnum.class, userType);
+//            if (Objects.isNull(userTypeEnum) || userTypeEnum == UserTypeEnum.GENERAL) {
+//                throw new RemoteServiceException(errPrefix + "用户类型填写不合规，请填写【师傅】或者【分销员】");
+//            }
+//            AdminWebsit adminWebsit = null;
+//            if (userTypeEnum == UserTypeEnum.WORKER) {
+//                if (StringUtils.isBlank(websitId)) {
+//                    throw new RemoteServiceException(errPrefix + "网点编号不能为空");
+//                }
+//                adminWebsit = websitMap.get(websitId);
+//                if (Objects.isNull(adminWebsit)) {
+//                    throw new RemoteServiceException(errPrefix + "网点不存在");
+//                }
+//            }
+//            if (StringUtils.isBlank(workerNumber)) {
+//                throw new RemoteServiceException(errPrefix + "师傅编号不能为空");
+//            }
             UserWait userWait = new UserWait();
-            userWait.setUserType(userTypeEnum.getKey());
+//            userWait.setUserType(userTypeEnum.getKey());
+            userWait.setUserType(UserTypeEnum.WORKER.getKey());
             userWait.setMobile(mobile);
-            if (Objects.nonNull(adminWebsit)) {
-                userWait.setWebsitId(adminWebsit.getWebsitId());
-                userWait.setWebsitName(adminWebsit.getName());
+//            if (Objects.nonNull(adminWebsit)) {
+//                userWait.setWebsitId(adminWebsit.getWebsitId());
+//                userWait.setWebsitName(adminWebsit.getName());
                 //入驻已存在的师傅到网点
-                User worker = userService.lambdaQuery()
-                        .eq(User::getMobile, mobile)
-                        .eq(User::getType, UserTypeEnum.WORKER.getKey())
-                        .last("limit 1")
-                        .one();
-                if (Objects.nonNull(worker)) {
-                    this.saveWebsitUser(adminWebsit.getWebsitId(), worker, bankAccount, workerNumber, "系统导入初始化");
-                }
-            }
+//                User worker = userService.lambdaQuery()
+//                        .eq(User::getMobile, mobile)
+//                        .eq(User::getType, UserTypeEnum.WORKER.getKey())
+//                        .last("limit 1")
+//                        .one();
+//                if (Objects.nonNull(worker)) {
+//                    this.saveWebsitUser(adminWebsit.getWebsitId(), worker, bankAccount, workerNumber, "系统导入初始化");
+//                }
+//            }
 
             userWait.setName(name);
-            userWait.setIdcard(idcard);
-            userWait.setCompanyWechatId(adminUser.getCompanyWechatId());
-            userWait.setCompanyWechatName(adminUser.getCompanyName());
+//            userWait.setIdcard(idcard);
+//            userWait.setCompanyWechatId(adminUser.getCompanyWechatId());
+//            userWait.setCompanyWechatName(adminUser.getCompanyName());
             userWait.setBankAccount(bankAccount);
-            userWait.setWorkerNumber(workerNumber);
+            userWait.setWorkerNumber(IdWorker.getIdStr());
             userWaits.add(userWait);
         }
         userWaitService.saveBatch(userWaits);