Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-webapp-plug into developer

src/main/java/com/gic/plug/web/controller/goods/GoodsController.java

@@ -7,9 +7,11 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.goods.api.dto.GoodsSkuDTO;
 import com.gic.goods.api.service.GoodsApiService;
 import com.gic.plug.web.vo.goods.GoodsVO;
+import com.gic.search.business.api.constant.enums.OperateEnum;
 import com.gic.search.business.api.dto.DynamicSearchDTO;
 import com.gic.search.business.api.dto.ESResponseQueryBatchDTO;
 import com.gic.search.business.api.service.EsBusinessOperaApiService;
+import com.gic.search.business.api.utils.QueryConditionAssemblyUtil;
 import com.gic.widget.screening.api.service.EsScreeningSearchService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.curator.shaded.com.google.common.collect.Lists;
@@ -47,8 +49,8 @@ public class GoodsController {
      */
     @GetMapping("list-goods")
     public RestResponse ListGoods(@RequestParam(value = "currentPage", defaultValue = "1") Integer currentPage,
-                                 @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, Long goodsDomainId,String search) {
-        ServiceResponse<ESResponseQueryBatchDTO> serviceResponse = searchES(currentPage,pageSize,goodsDomainId,search);
+                                 @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, Long goodsDomainId,String search,String channelCode) {
+        ServiceResponse<ESResponseQueryBatchDTO> serviceResponse = searchES(currentPage,pageSize,goodsDomainId,search,channelCode);
         if (serviceResponse.isSuccess()) {
             return RestResponse.success(serviceResponse.getResult());
         }
@@ -62,8 +64,8 @@ public class GoodsController {
      */
     @GetMapping("list-sku")
     public RestResponse ListSku(@RequestParam(value = "currentPage", defaultValue = "1") Integer currentPage,
-                                 @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, Long goodsDomainId,String search) {
-        ServiceResponse<ESResponseQueryBatchDTO> serviceResponse = searchES(currentPage,pageSize,goodsDomainId,search);
+                                 @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, Long goodsDomainId,String search,String channelCode) {
+        ServiceResponse<ESResponseQueryBatchDTO> serviceResponse = searchES(currentPage,pageSize,goodsDomainId,search ,channelCode);
         if (!serviceResponse.isSuccess()) {
             return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
         }
@@ -102,7 +104,7 @@ public class GoodsController {
     }
 
 
-    private ServiceResponse<ESResponseQueryBatchDTO> searchES( Integer currentPage,Integer pageSize, Long goodsDomainId,String search) {
+    private ServiceResponse<ESResponseQueryBatchDTO> searchES( Integer currentPage,Integer pageSize, Long goodsDomainId,String search,String channelCode) {
         DynamicSearchDTO searchDTO = new DynamicSearchDTO();
         String esName = esScreeningSearchService.getCurrentEsName("goods-test-123456", "goods-search");
         searchDTO.setIndexName(esName);
@@ -111,10 +113,12 @@ public class GoodsController {
         searchDTO.setType("mapper_type");
         searchDTO.setBegin(currentPage);
         searchDTO.setRecordNumber(pageSize);
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("goodsCode", search);
-        jsonObject.put("goodsDomainId", goodsDomainId);
-        searchDTO.setSearchJson(jsonObject);
+        JSONObject goodsCodeJson = QueryConditionAssemblyUtil.createSimpleQueryNode("goodsCode", OperateEnum.OPERATE_LIKE, search);
+        JSONObject goodsNameJson = QueryConditionAssemblyUtil.createSimpleQueryNode("goodsName", OperateEnum.OPERATE_LIKE, search);
+        JSONObject goodsDomainIdJson = QueryConditionAssemblyUtil.createSimpleQueryNode("channelCodeDomainId", OperateEnum.OPERATE_EQ, channelCode+"-"+goodsDomainId);
+        JSONObject nameAndCodeJson = QueryConditionAssemblyUtil.addQueryNodeForSiblin(goodsCodeJson, goodsNameJson, OperateEnum.OPERATE_OR);
+        JSONObject json = QueryConditionAssemblyUtil.addQueryNodeForSiblin(nameAndCodeJson, goodsDomainIdJson, OperateEnum.OPERATE_AND);
+        searchDTO.setSearchJson(json);
         ServiceResponse<ESResponseQueryBatchDTO> serviceResponse = esBusinessOperaApiService.queryDataBatch(searchDTO, false, null);
         return serviceResponse;
     }

src/main/java/com/gic/plug/web/controller/goods/GoodsPropertyController.java

@@ -36,6 +36,8 @@ public class GoodsPropertyController {
         arrayList.add(Constant.PROPERTY_TYPE_TIME);
         arrayList.add(Constant.PROPERTY_TYPE_CURRENCY);
         arrayList.add(Constant.PROPERTY_TYPE_PERCENT);
+        arrayList.add(Constant.PROPERTY_TYPE_NUM);
+        arrayList.add(Constant.PROPERTY_TYPE_REAL_NUM);
         ServiceResponse<Page<PropertyDTO>> serviceResponse = propertyApiService.findPropertyExceptType(currentPage, pageSize, goodsDomainId, arrayList,search);
         if (!serviceResponse.isSuccess()) {
             return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());

src/main/java/com/gic/plug/web/controller/goods/GoodsSelectorController.java

@@ -33,6 +33,16 @@ public class GoodsSelectorController {
         return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
     }
 
+    @RequestMapping("get-goods-selector")
+    public RestResponse getGoodsSelector(Long goodsSelectorId) {
+        ServiceResponse<GoodsSelectorDTO> serviceResponse = goodsSelectorApiService.getGoodsSelector(goodsSelectorId);
+        if (serviceResponse.isSuccess()) {
+            GoodsSelectorVO goodsSelectorVO = EntityUtil.changeEntityByOrika(GoodsSelectorVO.class, serviceResponse.getResult());
+            return RestResponse.success(goodsSelectorVO);
+        }
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+    }
+
 
     @RequestMapping("goods-selector-edit-show-back")
     public RestResponse goodsSelectorEditShowBack(Long goodsSelectorId) {

src/main/java/com/gic/plug/web/vo/goods/GoodsSelectorVO.java

@@ -22,13 +22,6 @@ public class GoodsSelectorVO {
      */
     private String useType;
 
-    /**
-     * 搜索类型
-     * 1 skuCode
-     * 2 skuId
-     */
-    private Integer searchResultType;
-
     private Long findCount;
 
 
@@ -96,14 +89,6 @@ public class GoodsSelectorVO {
         this.useType = useType;
     }
 
-    public Integer getSearchResultType() {
-        return searchResultType;
-    }
-
-    public void setSearchResultType(Integer searchResultType) {
-        this.searchResultType = searchResultType;
-    }
-
     public Long getFindCount() {
         return findCount;
     }