Merge remote-tracking branch 'origin/v0.1' into v0.1

application-webadmin/src/main/java/com/tourism/webadmin/app/wechat/controller/TakeOutProjectController.java

@@ -224,6 +224,10 @@ public class TakeOutProjectController {
             List<String> arrayList2 = UrlConvertUtils.urlConvert(applicationConfig.getHostIpPort(), restaurantInfoVo.getEnvironmentImage());
             restaurantInfoVo.setEnvironmentImageAfterConvert(arrayList2);
         }
+        if(StringUtils.isNotEmpty(restaurantInfoVo.getRestaurantBanner())) {
+            List<String> arrayList2 = UrlConvertUtils.urlConvert(applicationConfig.getHostIpPort(), restaurantInfoVo.getRestaurantBanner());
+            restaurantInfoVo.setRestaurantBannerAfterConvert(arrayList2);
+        }
         return ResponseResult.success(restaurantInfoVo);
     }
 

application-webadmin/src/main/java/com/tourism/webadmin/app/wechat/controller/WechatFoodIndexController.java

@@ -12,9 +12,11 @@ import com.tourism.common.core.object.MyPageData;
 import com.tourism.common.core.object.ResponseResult;
 import com.tourism.common.core.util.MyModelUtil;
 import com.tourism.common.core.util.MyPageUtil;
+import com.tourism.webadmin.app.wechat.dto.BestNewShopDto;
 import com.tourism.webadmin.app.wechat.dto.PageInfo;
 import com.tourism.webadmin.app.wechat.dto.ShopFoodDto;
 import com.tourism.webadmin.app.wechat.vo.shopfood.*;
+import com.tourism.webadmin.back.dto.RestaurantInfoDto;
 import com.tourism.webadmin.back.model.JobProject;
 import com.tourism.webadmin.back.model.RestaurantFoodInfo;
 import com.tourism.webadmin.back.model.RestaurantInfo;
@@ -89,7 +91,7 @@ public class WechatFoodIndexController {
 
 
     /**
-     * 超火美食首页3条
+     * 超火美食首页4条
      * @return 应答结果对象。
      */
     @GetMapping("/queryIndexHotFood")
@@ -98,8 +100,13 @@ public class WechatFoodIndexController {
         filter.setDataState(1);
         filter.setEnable(1);
         filter.setIsHotFood(1);
+
+        MyOrderParam myOrderParam = new MyOrderParam();
+        myOrderParam.add(new MyOrderParam.OrderInfo("totalSales",false,null));
+        String orderBy = MyOrderParam.buildOrderBy(myOrderParam, RestaurantInfo.class);
+
         PageMethod.startPage(1, 4, true);
-        List<RestaurantFoodInfo> foodInfoList = restaurantFoodInfoService.getRestaurantFoodInfoList(filter, null);
+        List<RestaurantFoodInfo> foodInfoList = restaurantFoodInfoService.getRestaurantFoodInfoList(filter, orderBy);
         MyPageData<RestaurantFoodInfoVo> pageData = MyPageUtil.makeResponseData(foodInfoList, RestaurantFoodInfoVo.class);
         List<RestaurantFoodInfoVo> list = pageData.getDataList();
         list.stream().forEach(o->{
@@ -144,7 +151,12 @@ public class WechatFoodIndexController {
         filter.setDataState(1);
         filter.setEnable(1);
         filter.setIsDeliciousShop(1);
-        List<RestaurantInfo> list = restaurantInfoService.getRestaurantInfoList(filter, null);
+
+        MyOrderParam myOrderParam = new MyOrderParam();
+        myOrderParam.add(new MyOrderParam.OrderInfo("recommendationRate",false,null));
+        String orderBy = MyOrderParam.buildOrderBy(myOrderParam, RestaurantInfo.class);
+
+        List<RestaurantInfo> list = restaurantInfoService.getRestaurantInfoList(filter, orderBy);
         List<RestaurantInfoVo> voList = MyPageUtil.makeResponseData(list,RestaurantInfoVo.class).getDataList();
         voList.stream().forEach(o-> {
             List<String> strings = UrlConvertUtils.urlConvert(applicationConfig.getHostIpPort(), o.getUrl());
@@ -159,46 +171,68 @@ public class WechatFoodIndexController {
      * @return 应答结果对象。
      */
     @GetMapping("/queryIndexSelectShop")
-    public ResponseResult<WechatSelectShopVo> queryIndexSelectShop() {
+    public ResponseResult<MyPageData<WechatSelectShopVo>> queryIndexSelectShop(BestNewShopDto bestNewShopVoDto) {
 
         RestaurantInfo filter = new RestaurantInfo();
         filter.setDataState(1);
         filter.setEnable(1);
-        filter.setIsSelectShop(1);
+
+        Integer orderNum = 0;
+        if (bestNewShopVoDto.getIsSelectShop()!=null &&bestNewShopVoDto.getIsSelectShop()==1){
+            filter.setIsSelectShop(1);
+            orderNum = 1;
+        }
+        if (bestNewShopVoDto.getIsBestNewShop()!=null &&bestNewShopVoDto.getIsBestNewShop()==1){
+            filter.setIsBestNewShop(1);
+            orderNum = 2;
+        }
+
         //店铺
-        List<RestaurantInfo> list = restaurantInfoService.getRestaurantInfoList(filter, null);
-        List<WechatSelectShopVo> wechatSelectShopVos = MyModelUtil.copyCollectionTo(list, WechatSelectShopVo.class);
-        if (wechatSelectShopVos == null || wechatSelectShopVos.isEmpty()) {
+        if (bestNewShopVoDto.getPageNum() != null && bestNewShopVoDto.getPageSize() != null && bestNewShopVoDto.getCount() != null) {
+            PageMethod.startPage(bestNewShopVoDto.getPageNum(), bestNewShopVoDto.getPageSize(), bestNewShopVoDto.getCount());
+        }
+
+        MyOrderParam myOrderParam = new MyOrderParam();
+        if (orderNum==1) myOrderParam.add(new MyOrderParam.OrderInfo("totalSales",false,null));
+        if (orderNum==2) myOrderParam.add(new MyOrderParam.OrderInfo("createTime",false,null));
+        String orderBy = MyOrderParam.buildOrderBy(myOrderParam, RestaurantInfo.class);
+
+        List<RestaurantInfo> list = restaurantInfoService.getRestaurantInfoList(filter, orderBy);
+        MyPageData<WechatSelectShopVo> pageData = MyPageUtil.makeResponseData(list, WechatSelectShopVo.class);
+        if (pageData.getDataList() == null || pageData.getDataList().isEmpty()) {
             return ResponseResult.success(null);
         }
-        WechatSelectShopVo shopVo = wechatSelectShopVos.get(0);
-        String[] tags = shopVo.getTag().split("&");
-        shopVo.setTags(tags);
-                //json->图片
-        List<String> strings = UrlConvertUtils.urlConvert(applicationConfig.getHostIpPort(), shopVo.getUrl());
-        shopVo.setUrlAfterConvert(strings);
-        //美食列表
-        PageMethod.startPage(1,3,null);
-        RestaurantFoodInfo filter1 = new RestaurantFoodInfo();
-        filter1.setEnable(1);
-        filter1.setDataState(1);
-        filter1.setRestaurantId(shopVo.getId());
-        List<RestaurantFoodInfo> infoList = restaurantFoodInfoService.getRestaurantFoodInfoList(filter1, null);
-        List<SelectShopFoodVo> foodVos = MyPageUtil.makeResponseData(infoList, SelectShopFoodVo.class).getDataList();
-        
-        foodVos.stream().forEach(o->{
+        List<WechatSelectShopVo> dataList = pageData.getDataList();
+        for (WechatSelectShopVo shopVo : dataList) {
+            String[] tags = shopVo.getTag().split("&");
+            shopVo.setTags(tags);
+            //json->图片
+            List<String> strings = UrlConvertUtils.urlConvert(applicationConfig.getHostIpPort(), shopVo.getUrl());
+            shopVo.setUrlAfterConvert(strings);
+            //美食列表
+            PageMethod.startPage(1,3,null);
+            RestaurantFoodInfo filter1 = new RestaurantFoodInfo();
+            filter1.setEnable(1);
+            filter1.setDataState(1);
+            filter1.setRestaurantId(shopVo.getId());
+            List<RestaurantFoodInfo> infoList = restaurantFoodInfoService.getRestaurantFoodInfoList(filter1, null);
+            List<SelectShopFoodVo> foodVos = MyPageUtil.makeResponseData(infoList, SelectShopFoodVo.class).getDataList();
+
+            foodVos.stream().forEach(o->{
+
+                List<String> strings1 = UrlConvertUtils.urlConvert(applicationConfig.getHostIpPort(), o.getUrl());
+                o.setUrlAfterConvert(strings1);
+            });
+            foodVos.sort(new Comparator<SelectShopFoodVo>() {
+                @Override
+                public int compare(SelectShopFoodVo o1, SelectShopFoodVo o2) {
+                    return o2.getSales().compareTo(o1.getSales());
+                }
+            });
+            shopVo.setFoodList(foodVos);
+        }
 
-            List<String> strings1 = UrlConvertUtils.urlConvert(applicationConfig.getHostIpPort(), o.getUrl());
-            o.setUrlAfterConvert(strings1);
-        });
-        foodVos.sort(new Comparator<SelectShopFoodVo>() {
-            @Override
-            public int compare(SelectShopFoodVo o1, SelectShopFoodVo o2) {
-                return o2.getSales().compareTo(o1.getSales());
-            }
-        });
-        shopVo.setFoodList(foodVos);
-        return ResponseResult.success(shopVo);
+        return ResponseResult.success(pageData);
     }
 
 

application-webadmin/src/main/java/com/tourism/webadmin/app/wechat/dto/BestNewShopDto.java

@@ -0,0 +1,35 @@
+package com.tourism.webadmin.app.wechat.dto;
+
+import com.tourism.common.core.validator.ConstDictRef;
+import com.tourism.webadmin.back.model.constant.IsBestNewShop;
+import com.tourism.webadmin.back.model.constant.IsSelectShop;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * BestNewShopDto。
+ *
+ * @author huangwen
+ * @date 2024/11/2
+ */
+@Schema(description = "BestNewShopDto")
+@Data
+public class BestNewShopDto extends PageInfo {
+
+    /**
+     * 精选好店 标记 1是 2 不是。
+     * NOTE: 可支持等于操作符的列表数据过滤。
+     */
+    @Schema(description = "精选好店 标记 1是 2 不是。可支持等于操作符的列表数据过滤。")
+    @ConstDictRef(constDictClass = IsSelectShop.class, message = "数据验证失败，精选好店 标记 1是 2 不是为无效值！")
+    private Integer isSelectShop;
+
+    /**
+     * 优选新店 标记 1是 2 不是。
+     * NOTE: 可支持等于操作符的列表数据过滤。
+     */
+    @Schema(description = "优选新店 标记 1是 2 不是。可支持等于操作符的列表数据过滤。")
+    @ConstDictRef(constDictClass = IsBestNewShop.class, message = "数据验证失败，优选新店 标记 1是 2 不是为无效值！")
+    private Integer isBestNewShop;
+
+}

application-webadmin/src/main/java/com/tourism/webadmin/app/wechat/vo/shopfood/WechatBestNewShopVo.java

@@ -21,7 +21,7 @@ public class WechatBestNewShopVo {
      * 主键id。
      */
     @Schema(description = "主键id")
-    private Long id;
+    private String id;
 
     /**
      * 店铺名称。