什么时候是个头，是个头

soss-admin/src/main/java/com/soss/web/controller/coffee/ApplicationController.java

@@ -54,7 +54,7 @@ public class ApplicationController {
         data.put("seqNo",key);
         jsonObject.put("data",data);
         jiGuangPushService.push(keys[0],jsonObject);
-        stringRedisTemplate.delete(key);
+       // stringRedisTemplate.delete(key);
         return AjaxResult.success("处理成功",s);
     }
     @RequestMapping("/jgRegister")

soss-admin/src/main/java/com/soss/web/controller/coffee/WeixinController.java

@@ -89,10 +89,10 @@ public class WeixinController {
     public AjaxResult getArea(@RequestParam(required = false) String lng,@RequestParam(required = false)String lat){
         List<JSONObject> area = weixinService.getArea(lng,lat);
         return AjaxResult.success(area);
-
     }
 
 
+
     @GetMapping(value = "/infoByShop")
     public AjaxResult infoByShop(String shopId)
     {

soss-common/src/main/java/com/soss/common/core/domain/entity/SysRole.java

@@ -111,8 +111,6 @@ public class SysRole extends BaseEntity
         this.roleName = roleName;
     }
 
-    @NotBlank(message = "权限字符不能为空")
-    @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
     public String getRoleKey()
     {
         return roleKey;

soss-framework/src/main/java/com/soss/framework/web/service/WeixinServiceImpl.java

@@ -68,6 +68,7 @@ import java.text.DecimalFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
 
 @Service
 public class WeixinServiceImpl  {
@@ -591,7 +592,11 @@ public class WeixinServiceImpl  {
                                     JSONObject zooe = zooeObject.getJSONObject(j);
                                     if(shop1.getZone().equals(zooe.getString("value"))){
                                         zoneBoo = false;
-                                        zooe.getJSONArray("shops").add(shop1);
+                                        JSONArray shopInfos = zooe.getJSONArray("shops");
+                                        shopInfos.add(shop1);
+                                        ArrayList<Shop> shopList = (ArrayList<Shop>) shopInfos.toJavaList(Shop.class);
+                                        List<Shop> collect = shopList.stream().sorted((a, b) -> a.getDistance().compareTo(b.getDistance())).collect(Collectors.toList());
+                                        zooe.put("shops",collect);
                                     }
                                 }
                                 if(zoneBoo){

soss-system/src/main/java/com/soss/system/domain/vo/customer/CustomerQueryVo.java

@@ -12,9 +12,9 @@ public class CustomerQueryVo extends BaseEntity {
 
     private String userInfo;
 
-    private Data createAtStart;
+    private String createAtStart;
 
-    private Data createAtEnd;
+    private String createAtEnd;
     //1 有购买 2无购买 3有复购
     private String  buyRecords;