From 60607153617aaed43e5119c6e5bcf467e3c5fe63 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Thu, 20 Jan 2022 17:09:59 +0800 Subject: [PATCH] adding productsearchTag select --- .../royalcanin/good/GoodController.java | 65 ++++++++++++------- .../royalcanin/good/service/GoodService.java | 3 +- .../MemberAddressUpdateEntity.java | 2 +- .../ProductSearchTagMapper.xml | 8 +-- 4 files changed, 47 insertions(+), 31 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java index f372c487..e9281a71 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java @@ -72,34 +72,49 @@ public class GoodController { int count = 0; String categoryName = ""; for (String categoryKey : paramMap.keySet()) { - switch (categoryKey) { - case "categoryName": - categoryName = "专区"; - break; - case "tagFunction": - categoryName = "功能"; - break; - case "tagUsedAge": - categoryName = "年龄"; - break; - case "tagBreed": - categoryName = "品种"; - break; + if(categoryKey == "categoryName" || categoryKey == "tagFunction" || categoryKey == "tagUsedAge" || categoryKey == "tagBreed") { + switch (categoryKey) { + case "categoryName": + categoryName = "专区"; + break; + case "tagFunction": + categoryName = "功能"; + break; + case "tagUsedAge": + categoryName = "年龄"; + break; + case "tagBreed": + categoryName = "品种"; + break; + } + brandNameList.add(categoryName); + count++; + for (String tagName : paramMap.get(categoryKey).split(",")) { + tagNameList.add(tagName); + } } - brandNameList.add(categoryName); - count ++ ; - for(String tagName : paramMap.get(categoryKey).split(",")){ - tagNameList.add(tagName); - } } - List productSearchTagList = productSearchTagService.findAllByCondition(brandNameList,productQueryEntity.getPetType(),tagNameList,productQueryEntity.getTagStatus()); - List tagCodeList = new ArrayList<>(); - for (ProductSearchTagEntity productSearchTagEntity:productSearchTagList){ - tagCodeList.add(productSearchTagEntity.getTagCode()); + if(count > 0) { + List productSearchTagList = productSearchTagService.findAllByCondition(brandNameList, productQueryEntity.getPetType(), tagNameList, productQueryEntity.getTagStatus()); + List tagCodeList = new ArrayList<>(); + for (ProductSearchTagEntity productSearchTagEntity : productSearchTagList) { + tagCodeList.add(productSearchTagEntity.getTagCode()); + } + String tagCode = String.join(",", tagCodeList); + productQueryEntity.setTags(tagCode); } - String tagCode = String.join(",",tagCodeList); - productQueryEntity.setTags(tagCode); - productQueryEntity.setCount(StringUtil.toString(count)); + if(productQueryEntity.getTagStatus() != null && productQueryEntity.getTagStatus() != "") { + if (productQueryEntity.getTagStatus().equals("1") || productQueryEntity.getTagStatus().equals("0")) { + productQueryEntity.setCount("4"); + }else{ + productQueryEntity.setCount("1"); + } + }else{ + productQueryEntity.setCount(StringUtil.toString(count)); + } + + + long startTime = System.currentTimeMillis(); String result = goodService.brandQuery(productQueryEntity); long acceptTime = System.currentTimeMillis() ; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java index ef4f9b6a..09e0a026 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java @@ -40,11 +40,12 @@ public class GoodService { public String brandQuery(ProductQueryEntity productQueryEntity) throws Exception { Map paramMap = MapRemoveNullUtil.setConditionMap(productQueryEntity); - paramMap.remove("petType"); +// paramMap.remove("petType"); paramMap.remove("categoryName"); paramMap.remove("tagUsedAge"); paramMap.remove("tagFunction"); paramMap.remove("tagBreed"); + paramMap.remove("tagStatus"); MapRemoveNullUtil.removeNullEntry(paramMap); paramMap.put("secret","H5@2021"); paramMap.put("channelId","15"); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressUpdateEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressUpdateEntity.java index a57784ad..762a47c7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressUpdateEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressUpdateEntity.java @@ -62,6 +62,6 @@ public class MemberAddressUpdateEntity { /** * 是否默认地址 */ - private boolean isDefault; + private String isDefault; } diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/productSearchTag/ProductSearchTagMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/productSearchTag/ProductSearchTagMapper.xml index c1abbe62..7e0f554b 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/productSearchTag/ProductSearchTagMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/productSearchTag/ProductSearchTagMapper.xml @@ -24,11 +24,11 @@ #{tagName} - - OR tagName not like '%湿粮%' + + AND tag_name not like '%湿粮%' - - OR tagName like '%湿粮%' + + AND tag_name like '%湿粮%' \ No newline at end of file