Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/MaterialDataAdaptor.java

@@ -91,11 +91,7 @@ public class MaterialDataAdaptor {
         if (result.get("data") == null) {
             return null;
         }
-        List<JSONObject> dataList = DataApiUtils.getDataList(result);
-        if (CollectionUtils.isEmpty(dataList)) {
-            return null;
-        }
-        JSONObject jsonObject = dataList.get(0);
+        JSONObject jsonObject = DataApiUtils.getPageOne(result);
         if (jsonObject.isEmpty()) {
             return null;
         }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

@@ -216,9 +216,9 @@ public class MessageApiServiceImpl implements MessageApiService {
         Set<String> wxSet = Sets.newHashSet(
                 // 鸿星尔克
                 "e034e2bd5d0b44d3bf553c9f8204094c",
-                // 润臣测试环境
+                // 达摩科技
                 "b18ffdc9d0644912865a248859914d80",
-                // 尊兴
+                // 达摩科技-生产
                 "fb40256db41142a196b21ccf03e58507",
                 // 金华悦行
                 "ac451a350eed4a96958dd5c7377f8bd9");
@@ -254,7 +254,15 @@ public class MessageApiServiceImpl implements MessageApiService {
         log.info("职务名称：position:{}", position);
         clerkQwDTO.setClerkType(StringUtils.isBlank(position) ? 0 : position.contains("店长") ? 1 : 0);
         clerkQwDTO.setClerkGener(dto.getGender());
-        clerkQwDTO.setPhoneNumber(dto.getMobile());
+        if(StringUtils.isBlank(dto.getMobile()) && dto.getUserid().startsWith("51") && dto.getUserid().length()==12) {
+            clerkQwDTO.setPhoneNumber(dto.getUserid().substring(1));
+        }else {
+            clerkQwDTO.setPhoneNumber(dto.getMobile());
+        }
+        if(StringUtils.isBlank(clerkQwDTO.getPhoneNumber())) {
+            log.info("导购手机号不存在{}",dto.getUserid());
+            return ;
+        }
         clerkQwDTO.setNationcode(dto.getTelephone());
         // 调用换导购接口逻辑
         clerkService.syncClerkForQw(clerkQwDTO);