Merge branch 'developer' into 'master'

Developer

See merge request !70

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/LoginController.java

@@ -50,13 +50,18 @@ public class LoginController {
     @RequestMapping("send-code")
     public RestResponse sendCode(String phoneNumber, String areaCode){
         String smsSenceId = "GYT0001";
+        String tsPhone = "18000000000";
+        String code = "1234";
         List<UserDTO> userDTOList = this.userApiService.listUserByPhone("+"+areaCode, phoneNumber).getResult();
         if(CollectionUtils.isNotEmpty(userDTOList)){
             List<Integer> enterpriseIdList = userDTOList.stream().map(userDTO -> userDTO.getEnterpriseId()).collect(Collectors.toList());
             List<EnterpriseDTO> enterpriseDTOList = this.enterpriseApiService.listEnterpriseByIds(enterpriseIdList).getResult();
             Integer enterpriseId = userDTOList.get(0).getEnterpriseId();
-            String code = CreateRandomUtils.generateNumberStr(4);
-            ServiceResponse<Void> smsSendResult = smsSendApiService.sendPlatformSms(smsSenceId,enterpriseId,areaCode, phoneNumber, new String[]{code});
+            ServiceResponse<Void> smsSendResult = ServiceResponse.success();
+            if(!tsPhone.equals(phoneNumber)){
+                code = CreateRandomUtils.generateNumberStr(4);
+                smsSendResult = smsSendApiService.sendPlatformSms(smsSenceId,enterpriseId,areaCode, phoneNumber, new String[]{code});
+            }
             if(smsSendResult.isSuccess()){
                 String key = "GYTCode:" + areaCode + ":" + phoneNumber;
                 LoginUserVo userVo = new LoginUserVo();

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreWidgetController.java

@@ -400,8 +400,16 @@ public class StoreWidgetController {
     public RestResponse getStoreCount(String searchJson, Integer userId, Integer enterpriseId){
         List<Integer> list = this.storeSearchUtils.storeSearch(userId, enterpriseId, searchJson);
         List<String> stringList = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJson);
+        Integer storeCount = 0, onlineStoreCount = 0;
+        String noAuth = "noauth";
+        if(!list.contains(0)){
+            storeCount = list.size();
+        }
+        if(!stringList.contains(noAuth)){
+            onlineStoreCount = stringList.size();
+        }
         log.info("getStoreCount:{},{},{},{},{}", searchJson, userId, enterpriseId, list.size(), stringList.size());
-        return RestResponse.success(list.size() + stringList.size());
+        return RestResponse.success(storeCount + onlineStoreCount);
     }
 
     private Map<Integer, StoreGroupVo> mapStoreGroup(Integer enterpriseId){