Merge remote-tracking branch 'origin/dev' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java

@@ -202,7 +202,9 @@ public class OrderCancelBiz {
                                         setViolateAmount(deduction.getAmount());
                                         setViolateDesc(deduction.getName());
                                     }};
-                                    orderTemplateBiz.handleCostDetailExtend(cnsv);
+
+                                    cnsv.initParamJson();
+                                    //orderTemplateBiz.handleCostDetailExtend(cnsv);
                                     orvd.handelCostDetailExtend(cnsv);
                                     orderRentVehicleBiz.updateSelectiveByIdRe(orvd);
                                 }

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SearchBiz.java

@@ -66,7 +66,7 @@ public class SearchBiz {
     /**
      * 业务个数
      */
-    private static final int SERVICE_COUNT = 5;
+    private static final int SERVICE_COUNT = 6;
 
     private final ThreadPoolTaskExecutor threadPoolTaskExecutor;
 

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/SearchController.java

@@ -2,14 +2,14 @@ package com.xxfc.platform.uccn.rest;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.uccn.biz.SearchBiz;
+import com.xxfc.platform.uccn.comstnt.ServiceConstant;
 import com.xxfc.platform.uccn.vo.SearchResultVo;
+import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
+import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author libin
@@ -23,11 +23,49 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "官网*综合搜索")
 public class SearchController {
 
-     private final SearchBiz searchBiz;
+    private final SearchBiz searchBiz;
+
+    private final VehicleModelController vehicleModelController;
+
+    private final GwTourController gwTourController;
+
+    private final CampsiteUccnController campsiteUccnController;
+
+    private final ArticleController articleController;
+
+    private final SummitActivityController summitActivityController;
+
+    private final BranchCompanyController branchCompanyController;
 
     @GetMapping
-    public ObjectRestResponse<SearchResultVo> search(@RequestParam(value = "keyword",required = false) String keyWord ){
-        SearchResultVo searchResultVo = searchBiz.searchWithKeyWords(keyWord);
-        return ObjectRestResponse.succ(searchResultVo);
+    public ObjectRestResponse search(@RequestParam(value = "type", required = false,defaultValue = "") String type,
+                                     @RequestParam(value = "keyword", required = false) String keyWord,
+                                     @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
+                                     @RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit) {
+        switch (type) {
+            case ServiceConstant.VEHICLE:
+                VehicleModelQueryCondition vehicleModelQueryCondition = new VehicleModelQueryCondition();
+                vehicleModelQueryCondition.setPage(page);
+                vehicleModelQueryCondition.setLimit(limit);
+                vehicleModelQueryCondition.setVehicleName(keyWord);
+                return vehicleModelController.findVehicleModelPageUnauthfind(vehicleModelQueryCondition);
+            case ServiceConstant.BRANCH_COMPANY:
+                BranchCompanyFindDTO branchCompanyFindDTO = new BranchCompanyFindDTO();
+                branchCompanyFindDTO.setPage(page);
+                branchCompanyFindDTO.setLimit(limit);
+                branchCompanyFindDTO.setName(keyWord);
+                return branchCompanyController.listBranchCompanyWithPage(branchCompanyFindDTO);
+            case ServiceConstant.TROUR:
+                return gwTourController.getGoodList(page, limit, null, keyWord);
+            case ServiceConstant.CAMPSITE:
+                return campsiteUccnController.findCampsiteShopPageByType(null, page, limit, keyWord);
+            case ServiceConstant.NEWS:
+                return articleController.getArticleList(page, limit, null, keyWord);
+            case ServiceConstant.ACTIVITY:
+                return summitActivityController.findSummitActivityWithPage(page, limit, null, keyWord);
+            default:
+                SearchResultVo searchResultVo = searchBiz.searchWithKeyWords(keyWord);
+                return ObjectRestResponse.succ(searchResultVo);
+        }
     }
 }