1.修改/chanting/store/getstore

ruoyi-admin/src/main/java/com/ruoyi/app/mendian/PosStoreController.java

@@ -155,66 +155,63 @@ public class PosStoreController extends BaseController {
     @Anonymous
     @GetMapping("/getstore")
     public AjaxResult getstore(@RequestHeader(defaultValue = "") String token, @RequestParam Integer id) {
+        List<PosCollect> list = new ArrayList<>();
         if (!"".equals(token)) {
             JwtUtil jwtUtil = new JwtUtil();
             String usid = jwtUtil.getusid(token);
             QueryWrapper<PosCollect> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("user_id", usid);
             queryWrapper.eq("md_id", id);
-            List<PosCollect> list = posCollectService.list(queryWrapper);
-            PosStore posStore = posStoreService.getById(id);
-            JSONObject org = new JSONObject();
-            org.put("id", posStore.getId());
-            org.put("posName", posStore.getPosName());
-            org.put("image", posStore.getImage());
-            org.put("posPrice", posStore.getPosPrice());
-            org.put("area", posStore.getArea());
-            org.put("address", posStore.getAddress());
-            org.put("longitude", posStore.getLongitude());
-            org.put("latitude", posStore.getLatitude());
-            org.put("briefIntroduction", posStore.getBriefIntroduction());
-            org.put("type", posStore.getType());
-            org.put("hygienePermit", posStore.getHygienePermit());
-            org.put("hygieneLicence", posStore.getHygieneLicence());
-            org.put("openBusiness", posStore.getOpenBusiness());
-            org.put("windingUp", posStore.getWindingUp());
-            org.put("sort", posStore.getSort());
-            org.put("userId", posStore.getUserId());
-            org.put("juli", posStore.getJuli());
-            org.put("cretim", posStore.getCretim());
-            org.put("zhitsj", posStore.getJuli());
-            org.put("tgpaixv", posStore.getCretim());
-            org.put("state", posStore.getState());
-            org.put("serverType", posStore.getServerType());
-            org.put("telephone", posStore.getTelephone());
-            org.put("Collect", !list.isEmpty() ? 1 : 0);
-            org.put("logo", posStore.getLogo());
-            org.put("isNightMarket", posStore.getIsNightMarket());
-            org.put("nightMarketId", posStore.getNightMarketId());
-
-            QueryWrapper<OperatingHours> wrapper = new QueryWrapper<>();
-            wrapper.eq("md_id", posStore.getId());
-            List<OperatingHours> hourslist = operatingHoursService.list(wrapper);
-            DateUtil dateUtil = new DateUtil();
-            Boolean dayang = false;
-            //在营业时间范围内返回true
-            for (int i = 0; i < hourslist.size(); i++) {
-                Boolean sbsj = dateUtil.isLegalTime(hourslist.get(i).getStartTime(), hourslist.get(i).getEndTime());
-                if (sbsj == true) {
-                    dayang = true;
-                }
-            }
-            //不在时间范围内标识为打烊
-            if (dayang == false) {
-                org.put("state", 1);
+            list = posCollectService.list(queryWrapper);
+        }
+        PosStore posStore = posStoreService.getById(id);
+        JSONObject org = new JSONObject();
+        org.put("id", posStore.getId());
+        org.put("posName", posStore.getPosName());
+        org.put("image", posStore.getImage());
+        org.put("posPrice", posStore.getPosPrice());
+        org.put("area", posStore.getArea());
+        org.put("address", posStore.getAddress());
+        org.put("longitude", posStore.getLongitude());
+        org.put("latitude", posStore.getLatitude());
+        org.put("briefIntroduction", posStore.getBriefIntroduction());
+        org.put("type", posStore.getType());
+        org.put("hygienePermit", posStore.getHygienePermit());
+        org.put("hygieneLicence", posStore.getHygieneLicence());
+        org.put("openBusiness", posStore.getOpenBusiness());
+        org.put("windingUp", posStore.getWindingUp());
+        org.put("sort", posStore.getSort());
+        org.put("userId", posStore.getUserId());
+        org.put("juli", posStore.getJuli());
+        org.put("cretim", posStore.getCretim());
+        org.put("zhitsj", posStore.getJuli());
+        org.put("tgpaixv", posStore.getCretim());
+        org.put("state", posStore.getState());
+        org.put("serverType", posStore.getServerType());
+        org.put("telephone", posStore.getTelephone());
+        org.put("Collect", !list.isEmpty() ? 1 : 0);
+        org.put("logo", posStore.getLogo());
+        org.put("isNightMarket", posStore.getIsNightMarket());
+        org.put("nightMarketId", posStore.getNightMarketId());
+
+        QueryWrapper<OperatingHours> wrapper = new QueryWrapper<>();
+        wrapper.eq("md_id", posStore.getId());
+        List<OperatingHours> hourslist = operatingHoursService.list(wrapper);
+        DateUtil dateUtil = new DateUtil();
+        Boolean dayang = false;
+        //在营业时间范围内返回true
+        for (int i = 0; i < hourslist.size(); i++) {
+            Boolean sbsj = dateUtil.isLegalTime(hourslist.get(i).getStartTime(), hourslist.get(i).getEndTime());
+            if (sbsj == true) {
+                dayang = true;
             }
-            org.put("businessHours", hourslist);
-            return success(org);
-        } else {
-            PosStore posStore = posStoreService.getById(id);
-            return success(posStore);
         }
-
+        //不在时间范围内标识为打烊
+        if (dayang == false) {
+            org.put("state", 1);
+        }
+        org.put("businessHours", hourslist);
+        return success(org);
 
     }
 
@@ -227,7 +224,7 @@ public class PosStoreController extends BaseController {
                                    @RequestParam String area,
                                    @RequestParam Integer juli,
                                    @RequestParam(defaultValue = "") Integer sort,
-                                   @RequestParam(defaultValue = "zh-TW",required = false) String language) {
+                                   @RequestParam(defaultValue = "zh-TW", required = false) String language) {
         List<PosStore> list;
         if (sort == null) {
             list = posStoreMapper.getmdlist(longitude, latitude, (page - 1) * 20, "%" + area + "%", juli);