店铺列表新增排序字段

src/main/java/com/cdf/controller/back/ShopBackController.java

@@ -51,6 +51,8 @@ public class ShopBackController {
         if(param.getDeptId() !=null){
             wrapper.eq(Shop::getDeptId,param.getDeptId());
         }
+        wrapper.orderByAsc(Shop::getSort);
+        wrapper.orderByAsc(Shop::getCreateTime);
         Page<Shop> page = shopService.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         List<ShopVo> pageVo = new ArrayList<>();
         for (Shop shop : page.getRecords()) {

src/main/java/com/cdf/controller/service/FdkkSceneController.java

@@ -0,0 +1,23 @@
+package com.cdf.controller.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cdf.httpClient.client.FdkkClient;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+
+@RestController
+@RequestMapping("/service/scene")
+public class FdkkSceneController {
+
+    @Resource
+    private FdkkClient fdkkClient;
+
+    @GetMapping("/getInfo")
+    public JSONObject getInfo(@RequestParam(required = false) String num){
+        HashMap<String, String> map = new HashMap<>();
+        map.put("num",num);
+        return fdkkClient.getInfo(map);
+    }
+}

src/main/java/com/cdf/controller/service/FdkkSceneSceneController.java

@@ -1,34 +0,0 @@
-package com.cdf.controller.service;
-
-import com.cdf.aop.SysLog;
-import com.cdf.common.ResultData;
-import com.cdf.httpClient.client.FdkkClient;
-import com.cdf.httpClient.request.FdkkHotRequest;
-import com.cdf.httpClient.request.FdkkUploadRequest;
-import com.cdf.httpClient.response.FdkkResponse;
-import com.cdf.service.impl.FdkkSceneEditService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.HashMap;
-
-@RestController
-@RequestMapping("/service/scene")
-public class FdkkSceneSceneController {
-
-    @Resource
-    private FdkkClient fdkkClient;
-
-    @GetMapping("/getInfo")
-    public ResultData getInfo(@RequestParam(required = false) String num){
-        HashMap<String, String> map = new HashMap<>();
-        map.put("num",num);
-        FdkkResponse info = fdkkClient.getInfo(map);
-        return ResultData.ok(info.getMsg(),info.getData());
-    }
-
-
-}

src/main/java/com/cdf/entity/Shop.java

@@ -59,5 +59,8 @@ public class Shop implements Serializable {
     @TableField("initial_screen")
     private String initialScreen;  //初始画面
 
+    @TableField("sort")
+    private Integer sort;
+
 
 }

src/main/java/com/cdf/httpClient/client/FdkkClient.java

@@ -107,7 +107,7 @@ public interface FdkkClient {
      */
     @Get("/service/scene/getInfo")
     @Address(source = FdkkSceneAddressSource.class)
-    FdkkResponse getInfo(@Query Map<String,String> param);
+    JSONObject getInfo(@Query Map<String,String> param);
 
     @Post("{url}")
     @Address(source = FdkkSceneAddressSource.class)