From 8ca5dddd59f8bfb15c41aa356cacaccc6e65f231 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Wed, 19 Jan 2022 19:31:28 +0800 Subject: [PATCH 01/11] adding productsearchTag select --- .../SmartAuthenticationInterceptor.java | 4 +- .../royalcanin/good/GoodController.java | 34 ++++++++++ .../good/model/ProductQueryEntity.java | 17 +++++ .../royalcanin/good/service/GoodService.java | 5 ++ .../system/royalcanin/Order/OrderMapper.xml | 1 + .../src/main/resources/sql/smart-admin.sql | 64 +++++++++++++++++++ 6 files changed, 123 insertions(+), 2 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/interceptor/SmartAuthenticationInterceptor.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/interceptor/SmartAuthenticationInterceptor.java index c89f3f3e..d642ed80 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/interceptor/SmartAuthenticationInterceptor.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/interceptor/SmartAuthenticationInterceptor.java @@ -72,8 +72,8 @@ public class SmartAuthenticationInterceptor extends HandlerInterceptorAdapter { } Boolean noNeedLogin = request.getServletPath().contains("royalcanin"); Boolean noNeedLoginToo = request.getContextPath().contains("royalcanin"); - System.out.println("request.getContextPath() : " + request.getRequestURI()); - System.out.println("request.getRequestURI() : " + request.getRequestURI()); +// System.out.println("request.getContextPath() : " + request.getRequestURI()); +// System.out.println("request.getRequestURI() : " + request.getRequestURI()); if (noNeedLogin||noNeedLoginToo) { return true; } 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 b69fb256..86b56d5c 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 @@ -17,6 +17,9 @@ import net.lab1024.smartadmin.module.system.royalcanin.good.model.ProductMasterQ import net.lab1024.smartadmin.module.system.royalcanin.good.model.ProductQueryEntity; import net.lab1024.smartadmin.module.system.royalcanin.good.service.CartService; import net.lab1024.smartadmin.module.system.royalcanin.good.service.GoodService; +import net.lab1024.smartadmin.module.system.royalcanin.productSearchTag.model.ProductSearchTagEntity; +import net.lab1024.smartadmin.module.system.royalcanin.productSearchTag.service.ProductSearchTagService; +import net.lab1024.smartadmin.util.MapRemoveNullUtil; import net.lab1024.smartadmin.util.SmartJWTUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -25,7 +28,9 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; +import java.util.Map; @Api(tags = {SwaggerTagConst.Admin.MANAGER_MALL_API}) @OperateLog @@ -40,6 +45,9 @@ public class GoodController { @Autowired private CartService cartService; + @Autowired + private ProductSearchTagService productSearchTagService; + @Autowired private GoodService goodService; @@ -58,6 +66,32 @@ public class GoodController { @ApiOperation(value = "查询标品信息", notes = "查询标品信息") @PostMapping("royalcanin/product/query") public String transferBrand(ProductQueryEntity productQueryEntity) throws Exception { + Map paramMap = MapRemoveNullUtil.setConditionMap(productQueryEntity); + List brandNameList = new ArrayList<>(); + List tagNameList = new ArrayList<>(); + for (String key : paramMap.keySet()) { + if(key == "categoryName" ){ + for(String categoryname : paramMap.get(key).split(",")){ + if(categoryname.equals("体型犬粮")||categoryname.equals("功能犬粮")||categoryname.equals("品种犬粮")||categoryname.equals("犬湿粮")||categoryname.equals("功能猫粮")||categoryname.equals("品种猫粮")||categoryname.equals("营养猫粮")||categoryname.equals("猫湿粮")||categoryname.equals("优卡产品")) { + brandNameList.add(categoryname); + tagNameList.add(categoryname); + }else { + brandNameList.add(categoryname); + } + } + }else if (key == "tagUsedAge"||key == "tagFunction"||key == "tagBreed"){ + for(String tagName : paramMap.get(key).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()); + } + String tagCode = String.join(",",tagCodeList); + productQueryEntity.setTagCode(tagCode); 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/model/ProductQueryEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/ProductQueryEntity.java index 564e7215..287184e7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/ProductQueryEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/ProductQueryEntity.java @@ -10,18 +10,35 @@ import lombok.NoArgsConstructor; public class ProductQueryEntity { private String channelId; + private String secret; + private String page; + private String rows; + private String productCode; + private String name; + private String brandCode; + private String brandName; + private String petType; + private String categoryName; + private String tagUsedAge; + private String tagFunction; + private String tagBreed; + + private String tagStatus; + + private String tagCode; + private String isSales; } 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 e814966e..ef4f9b6a 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,6 +40,11 @@ public class GoodService { public String brandQuery(ProductQueryEntity productQueryEntity) throws Exception { Map paramMap = MapRemoveNullUtil.setConditionMap(productQueryEntity); + paramMap.remove("petType"); + paramMap.remove("categoryName"); + paramMap.remove("tagUsedAge"); + paramMap.remove("tagFunction"); + paramMap.remove("tagBreed"); MapRemoveNullUtil.removeNullEntry(paramMap); paramMap.put("secret","H5@2021"); paramMap.put("channelId","15"); diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/Order/OrderMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/Order/OrderMapper.xml index 3e8e22a5..7e1c1f13 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/Order/OrderMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/Order/OrderMapper.xml @@ -21,4 +21,5 @@ where order_no = #{out_trade_no} + \ No newline at end of file diff --git a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql index d1d5632e..51870844 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql +++ b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql @@ -1707,4 +1707,68 @@ CREATE TABLE IF NOT EXISTS `t_royalcanin_notify_operate_log` ( PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +CREATE TABLE `t_royalcanin_productsearchtag` ( + `id` int(50) NOT NULL, + `brand_code` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL, + `brand_name` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL, + `pet_type` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL, + `tag_name` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL, + `tag_type` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL, + `tag_code` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL, + `is_delete` INT(20) COLLATE utf8mb4_unicode_ci NOT NULL, + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + + + +INSERT INTO `t_royalcanin_productsearchtag` (`id`, `brand_code`, `brand_name`, `pet_type`, `tag_name`, `tag_type`, `tag_code`, `is_delete`, `create_time`) VALUES +(1019, '16518816', '品种', '1', '贵宾', '1017', '1017001', 0, '2022-01-19 16:41:55'), +(1020, '16518816', '品种', '1', '法斗', '1017', '1017002', 0, '2022-01-19 16:41:55'), +(1021, '16518816', '品种', '1', '德牧', '1017', '1017003', 0, '2022-01-19 16:41:55'), +(1022, '16518816', '品种', '1', '拉布拉多', '1017', '1017004', 0, '2022-01-19 16:41:55'), +(1023, '16518816', '品种', '1', '金毛', '1017', '1017005', 0, '2022-01-19 16:41:55'), +(1024, '16518816', '品种', '1', '比熊', '1017', '1017006', 0, '2022-01-19 16:41:55'), +(1025, '16518816', '品种', '1', '雪纳瑞', '1017', '1017007', 0, '2022-01-19 16:41:55'), +(1026, '16518816', '品种', '1', '约克夏', '1017', '1017008', 0, '2022-01-19 16:41:55'), +(1027, '16518816', '品种', '1', '吉娃娃', '1017', '1017009', 0, '2022-01-19 16:41:55'), +(1028, '16518816', '品种', '1', '柴犬', '1017', '1017010', 0, '2022-01-19 16:41:55'), +(1029, '16518816', '品种', '0', '巴哥', '1017', '1017011', 0, '2022-01-19 16:41:55'), +(1030, '16518816', '品种', '0', '英短', '1017', '1017012', 0, '2022-01-19 16:41:55'), +(1031, '16518816', '品种', '0', '美短', '1017', '1017013', 0, '2022-01-19 16:41:55'), +(1032, '16518816', '品种', '0', '布偶', '1017', '1017014', 0, '2022-01-19 16:41:55'), +(1033, '16518816', '品种', '0', '暹罗', '1017', '1017015', 0, '2022-01-19 16:41:55'), +(1034, '16518816', '品种', '0', '缅因', '1017', '1017016', 0, '2022-01-19 16:41:55'), +(1035, '16518816，555131355', '年龄', '1', '幼年', '1018', '1018001', 0, '2022-01-19 16:41:55'), +(1036, '16518816，555131355', '年龄', '1', '成年', '1018', '1018002', 0, '2022-01-19 16:41:55'), +(1037, '16518816', '年龄', '1', '老年', '1018', '1018003', 0, '2022-01-19 16:41:55'), +(1038, '16518816', '年龄', '0', '4-12月龄', '1018', '1018004', 0, '2022-01-19 16:41:55'), +(1039, '16518816', '年龄', '0', '1-7岁', '1018', '1018005', 0, '2022-01-19 16:41:55'), +(1040, '16518816', '年龄', '0', '>7岁', '1018', '1018006', 0, '2022-01-19 16:41:55'), +(1041, '16518816', '功能', '1', '被毛呵护', '1019', '1019001', 0, '2022-01-19 16:41:55'), +(1042, '16518816', '功能', '1', '绝育呵护', '1019', '1019002', 0, '2022-01-19 16:41:55'), +(1043, '16518816', '功能', '1', '皮肤呵护', '1019', '1019003', 0, '2022-01-19 16:41:55'), +(1044, '16518816', '功能', '1', '体重呵护', '1019', '1019004', 0, '2022-01-19 16:41:55'), +(1045, '16518816', '功能', '1', '消化呵护', '1019', '1019005', 0, '2022-01-19 16:41:55'), +(1046, '16518816', '功能', '0', '绝育呵护', '1019', '1019006', 0, '2022-01-19 16:41:55'), +(1047, '16518816', '功能', '0', '口腔护理', '1019', '1019007', 0, '2022-01-19 16:41:55'), +(1048, '16518816', '功能', '0', '美毛呵护', '1019', '1019008', 0, '2022-01-19 16:41:55'), +(1049, '16518816', '功能', '0', '去毛球', '1019', '1019009', 0, '2022-01-19 16:41:55'), +(1050, '16518816', '功能', '0', '体重呵护', '1019', '1019010', 0, '2022-01-19 16:41:55'), +(1059, '16518816', '年龄', '0', '<4月龄', '1018', '1018007', 0, '2022-01-19 16:41:55'), +(1060, '16518816', '年龄', '1', '离乳期', '1018', '1018008', 0, '2022-01-19 16:41:55'), +(1062, '16518816', '体型犬粮', '1', '体型犬粮', '1021', '1021001', 0, '2022-01-19 16:41:55'), +(1063, '16518816', '功能犬粮', '1', '功能犬粮', '1021', '1021002', 0, '2022-01-19 16:41:55'), +(1064, '16518816', '品种犬粮', '1', '品种犬粮', '1021', '1021003', 0, '2022-01-19 16:41:55'), +(1065, '16518816', '犬湿粮', '1', '犬湿粮', '1021', '1021004', 0, '2022-01-19 16:41:55'), +(1066, '16518816', '功能猫粮', '0', '功能猫粮', '1021', '1021005', 0, '2022-01-19 16:41:55'), +(1067, '16518816', '品种猫粮', '0', '品种猫粮', '1021', '1021006', 0, '2022-01-19 16:41:55'), +(1068, '16518816', '营养猫粮', '0', '营养猫粮', '1021', '1021007', 0, '2022-01-19 16:41:55'), +(1069, '16518816', '功能', '0', '消化优选', '1019', '1019011', 0, '2022-01-19 16:41:55'), +(1070, '16518816', '品种', '0', '波斯', '1017', '1017017', 0, '2022-01-19 16:41:55'), +(1071, '16518816', '品种', '0', '孟加拉豹猫', '1017', '1017018', 0, '2022-01-19 16:41:55'), +(1073, '16518816', '品种', '0', '斯芬克斯', '1017', '1017020', 0, '2022-01-19 16:41:55'), +(1083, '16518816', '猫湿粮', '0', '猫湿粮', '1021', '1021111', 0, '2022-01-19 16:41:55'), +(1084, '16518816', '品种', '1', '博美', '1017', '1017021', 0, '2022-01-19 16:41:55'), +(1086, '16518816', '优卡产品', '1', '优卡产品', '1021', '1021050', 0, '2022-01-19 16:41:55'); -- \ No newline at end of file From 3cde853f9e1c7bd3ae686de4a04d0c3dde4e0a7f Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Thu, 20 Jan 2022 15:32:03 +0800 Subject: [PATCH 02/11] adding productsearchTag select --- .../royalcanin/good/GoodController.java | 38 +++++++++++-------- .../good/model/ProductQueryEntity.java | 4 +- .../Dao/ProductSearchTagDao.java | 16 ++++++++ .../model/ProductSearchTagEntity.java | 27 +++++++++++++ .../service/ProductSearchTagService.java | 20 ++++++++++ .../ProductSearchTagMapper.xml | 34 +++++++++++++++++ .../src/main/resources/sql/smart-admin.sql | 18 ++++----- 7 files changed, 132 insertions(+), 25 deletions(-) create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/Dao/ProductSearchTagDao.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/model/ProductSearchTagEntity.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/service/ProductSearchTagService.java create mode 100644 smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/productSearchTag/ProductSearchTagMapper.xml 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 86b56d5c..f372c487 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 @@ -69,29 +69,37 @@ public class GoodController { Map paramMap = MapRemoveNullUtil.setConditionMap(productQueryEntity); List brandNameList = new ArrayList<>(); List tagNameList = new ArrayList<>(); - for (String key : paramMap.keySet()) { - if(key == "categoryName" ){ - for(String categoryname : paramMap.get(key).split(",")){ - if(categoryname.equals("体型犬粮")||categoryname.equals("功能犬粮")||categoryname.equals("品种犬粮")||categoryname.equals("犬湿粮")||categoryname.equals("功能猫粮")||categoryname.equals("品种猫粮")||categoryname.equals("营养猫粮")||categoryname.equals("猫湿粮")||categoryname.equals("优卡产品")) { - brandNameList.add(categoryname); - tagNameList.add(categoryname); - }else { - brandNameList.add(categoryname); - } - } - }else if (key == "tagUsedAge"||key == "tagFunction"||key == "tagBreed"){ - for(String tagName : paramMap.get(key).split(",")){ - tagNameList.add(tagName); - } + 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; } + 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()); } String tagCode = String.join(",",tagCodeList); - productQueryEntity.setTagCode(tagCode); + productQueryEntity.setTags(tagCode); + 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/model/ProductQueryEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/ProductQueryEntity.java index 287184e7..f00e63ef 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/ProductQueryEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/ProductQueryEntity.java @@ -37,8 +37,10 @@ public class ProductQueryEntity { private String tagStatus; - private String tagCode; + private String tags; private String isSales; + private String count; + } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/Dao/ProductSearchTagDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/Dao/ProductSearchTagDao.java new file mode 100644 index 00000000..dca1469d --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/Dao/ProductSearchTagDao.java @@ -0,0 +1,16 @@ +package net.lab1024.smartadmin.module.system.royalcanin.productSearchTag.Dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.lab1024.smartadmin.module.system.royalcanin.productSearchTag.model.ProductSearchTagEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Mapper +@Component +public interface ProductSearchTagDao extends BaseMapper { + + List findAllByCondition(@Param("brandNameList") List brandNameList,@Param("petType")String petType,@Param("tagNameList") List tagNameList,@Param("tagStatus")String tagStatus); +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/model/ProductSearchTagEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/model/ProductSearchTagEntity.java new file mode 100644 index 00000000..c55d84b6 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/model/ProductSearchTagEntity.java @@ -0,0 +1,27 @@ +package net.lab1024.smartadmin.module.system.royalcanin.productSearchTag.model; + + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("t_royalcanin_productSearchTag") +public class ProductSearchTagEntity { + + private String id ; + + private String brandCode; + + private String brandName; + + private String petType; + + private String tagName; + + private String tagType; + + private String tagCode; + + private String isDelete; + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/service/ProductSearchTagService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/service/ProductSearchTagService.java new file mode 100644 index 00000000..0b707e3e --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/service/ProductSearchTagService.java @@ -0,0 +1,20 @@ +package net.lab1024.smartadmin.module.system.royalcanin.productSearchTag.service; + +import net.lab1024.smartadmin.module.system.royalcanin.productSearchTag.Dao.ProductSearchTagDao; +import net.lab1024.smartadmin.module.system.royalcanin.productSearchTag.model.ProductSearchTagEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ProductSearchTagService { + + @Autowired + private ProductSearchTagDao productSearchTagDao; + + + public List findAllByCondition( List brandNameList,String petType,List tagNameList,String tagStatus){ + return productSearchTagDao.findAllByCondition(brandNameList,petType,tagNameList,tagStatus); + } +} 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 new file mode 100644 index 00000000..c1abbe62 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/productSearchTag/ProductSearchTagMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + \ No newline at end of file diff --git a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql index 51870844..f5941deb 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql +++ b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql @@ -1757,18 +1757,18 @@ INSERT INTO `t_royalcanin_productsearchtag` (`id`, `brand_code`, `brand_name`, ` (1050, '16518816', '功能', '0', '体重呵护', '1019', '1019010', 0, '2022-01-19 16:41:55'), (1059, '16518816', '年龄', '0', '<4月龄', '1018', '1018007', 0, '2022-01-19 16:41:55'), (1060, '16518816', '年龄', '1', '离乳期', '1018', '1018008', 0, '2022-01-19 16:41:55'), -(1062, '16518816', '体型犬粮', '1', '体型犬粮', '1021', '1021001', 0, '2022-01-19 16:41:55'), -(1063, '16518816', '功能犬粮', '1', '功能犬粮', '1021', '1021002', 0, '2022-01-19 16:41:55'), -(1064, '16518816', '品种犬粮', '1', '品种犬粮', '1021', '1021003', 0, '2022-01-19 16:41:55'), -(1065, '16518816', '犬湿粮', '1', '犬湿粮', '1021', '1021004', 0, '2022-01-19 16:41:55'), -(1066, '16518816', '功能猫粮', '0', '功能猫粮', '1021', '1021005', 0, '2022-01-19 16:41:55'), -(1067, '16518816', '品种猫粮', '0', '品种猫粮', '1021', '1021006', 0, '2022-01-19 16:41:55'), -(1068, '16518816', '营养猫粮', '0', '营养猫粮', '1021', '1021007', 0, '2022-01-19 16:41:55'), +(1062, '16518816', '专区', '1', '体型犬粮', '1021', '1021001', 0, '2022-01-19 16:41:55'), +(1063, '16518816', '专区', '1', '功能犬粮', '1021', '1021002', 0, '2022-01-19 16:41:55'), +(1064, '16518816', '专区', '1', '品种犬粮', '1021', '1021003', 0, '2022-01-19 16:41:55'), +(1065, '16518816', '专区', '1', '犬湿粮', '1021', '1021004', 0, '2022-01-19 16:41:55'), +(1066, '16518816', '专区', '0', '功能猫粮', '1021', '1021005', 0, '2022-01-19 16:41:55'), +(1067, '16518816', '专区', '0', '品种猫粮', '1021', '1021006', 0, '2022-01-19 16:41:55'), +(1068, '16518816', '专区', '0', '营养猫粮', '1021', '1021007', 0, '2022-01-19 16:41:55'), (1069, '16518816', '功能', '0', '消化优选', '1019', '1019011', 0, '2022-01-19 16:41:55'), (1070, '16518816', '品种', '0', '波斯', '1017', '1017017', 0, '2022-01-19 16:41:55'), (1071, '16518816', '品种', '0', '孟加拉豹猫', '1017', '1017018', 0, '2022-01-19 16:41:55'), (1073, '16518816', '品种', '0', '斯芬克斯', '1017', '1017020', 0, '2022-01-19 16:41:55'), -(1083, '16518816', '猫湿粮', '0', '猫湿粮', '1021', '1021111', 0, '2022-01-19 16:41:55'), +(1083, '16518816', '专区', '0', '猫湿粮', '1021', '1021111', 0, '2022-01-19 16:41:55'), (1084, '16518816', '品种', '1', '博美', '1017', '1017021', 0, '2022-01-19 16:41:55'), -(1086, '16518816', '优卡产品', '1', '优卡产品', '1021', '1021050', 0, '2022-01-19 16:41:55'); +(1086, '16518816', '专区', '1', '优卡产品', '1021', '1021050', 0, '2022-01-19 16:41:55'); -- \ No newline at end of file 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 03/11] 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 From 942dab06ce6b5259062240b120e84c788aed24e2 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Thu, 20 Jan 2022 18:54:15 +0800 Subject: [PATCH 04/11] adding productsearchTag select --- .../royalcanin/good/GoodController.java | 33 +++++++++++-------- .../royalcanin/good/service/GoodService.java | 1 - .../ProductSearchTagMapper.xml | 10 +++--- 3 files changed, 24 insertions(+), 20 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 e9281a71..7a1cb1c4 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 @@ -70,27 +70,27 @@ public class GoodController { List brandNameList = new ArrayList<>(); List tagNameList = new ArrayList<>(); int count = 0; - String categoryName = ""; for (String categoryKey : paramMap.keySet()) { - if(categoryKey == "categoryName" || categoryKey == "tagFunction" || categoryKey == "tagUsedAge" || categoryKey == "tagBreed") { + if(categoryKey == "categoryName" || categoryKey == "tagFunction" || categoryKey == "tagUsedAge" || categoryKey == "tagBreed" || categoryKey == "tagStatus") { switch (categoryKey) { case "categoryName": - categoryName = "专区"; + brandNameList.add("专区"); break; case "tagFunction": - categoryName = "功能"; + brandNameList.add("功能"); break; case "tagUsedAge": - categoryName = "年龄"; + brandNameList.add("年龄"); break; case "tagBreed": - categoryName = "品种"; + brandNameList.add("品种"); break; } - brandNameList.add(categoryName); count++; for (String tagName : paramMap.get(categoryKey).split(",")) { - tagNameList.add(tagName); + if (categoryKey != "tagStatus") { + tagNameList.add(tagName); + } } } } @@ -103,14 +103,19 @@ public class GoodController { String tagCode = String.join(",", tagCodeList); productQueryEntity.setTags(tagCode); } - if(productQueryEntity.getTagStatus() != null && productQueryEntity.getTagStatus() != "") { - if (productQueryEntity.getTagStatus().equals("1") || productQueryEntity.getTagStatus().equals("0")) { - productQueryEntity.setCount("4"); - }else{ + if(brandNameList.size() == 0 && productQueryEntity.getTagStatus() != null && productQueryEntity.getTagStatus() != "") { productQueryEntity.setCount("1"); - } }else{ - productQueryEntity.setCount(StringUtil.toString(count)); + if (productQueryEntity.getTagStatus() != null && productQueryEntity.getTagStatus() != "" && brandNameList.size() != 0) { + if(productQueryEntity.getCategoryName() != "" &&productQueryEntity.getCategoryName() != null) { + productQueryEntity.setCount(StringUtil.toString(count -1)); + }else{ + productQueryEntity.setCount(StringUtil.toString(count)); + } + }else{ + productQueryEntity.setCount(StringUtil.toString(count)); + } + } 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 09e0a026..a2021b3a 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,7 +40,6 @@ public class GoodService { public String brandQuery(ProductQueryEntity productQueryEntity) throws Exception { Map paramMap = MapRemoveNullUtil.setConditionMap(productQueryEntity); -// paramMap.remove("petType"); paramMap.remove("categoryName"); paramMap.remove("tagUsedAge"); paramMap.remove("tagFunction"); 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 7e0f554b..173afd8e 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 @@ -8,9 +8,6 @@ \ No newline at end of file From 4809866df63b679fb6d8838538d7fc09e3d8abf6 Mon Sep 17 00:00:00 2001 From: summation Date: Thu, 20 Jan 2022 19:22:35 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/ajax/getData.js | 13 + rc-busness/assets/css/global.less | 71 +- rc-busness/assets/css/openaddress.less | 299 ---- rc-busness/assets/pay/fail.png | Bin 0 -> 12262 bytes rc-busness/assets/pay/wx.png | Bin 0 -> 4200 bytes rc-busness/assets/pay/zfb.png | Bin 0 -> 3661 bytes rc-busness/pages/myorder/userrecord.vue | 1420 ++++++++--------- rc-busness/pages/personal/settlement.less | 414 +++++ rc-busness/pages/personal/settlement.vue | 441 +++-- rc-busness/pages/personal/userpay.vue | 767 +++------ .../pages/productdetails/productlist.vue | 12 +- rc-busness/pages/useraddress/openaddress.vue | 43 +- 12 files changed, 1699 insertions(+), 1781 deletions(-) create mode 100644 rc-busness/assets/pay/fail.png create mode 100644 rc-busness/assets/pay/wx.png create mode 100644 rc-busness/assets/pay/zfb.png create mode 100644 rc-busness/pages/personal/settlement.less diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js index 0c1a5e5d..2efb2607 100644 --- a/rc-busness/ajax/getData.js +++ b/rc-busness/ajax/getData.js @@ -615,3 +615,16 @@ export const getOrderList = (user, status) => { return fetch('/api/getOrderList', data) } + + + //购物车操作 + export const memberAddress = (type,data) => { + return fetch('memberAddress?type='+type, data, 'POST' ) + } + + + //支付宝支付二维码 + export const generateOrderAlipay = (data) => { + return fetch('generateOrderAlipay', data, 'POST' ) + } + \ No newline at end of file diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index 903d422d..cae698f4 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -596,4 +596,73 @@ img, picture { //margin-right:0; } } -} \ No newline at end of file +} +.rc_contline { + border-bottom: 3px solid #f6f6f6; + height: 0px; + margin: 0; + clear: both; +} + +.page_modules { + padding-top: 60px; +} + +.cont_modules { + margin: 0 auto; + max-width: 1400px; +} + +.inline_right { + display: flex; + justify-content: space-between; + width: 100%; +} + +.inline_mid { + display: flex; + justify-content: space-around; + width: 100%; +} + +.inline_left { + display: flex; + justify-content: space-evenly; + width: 100%; + +} + +.li_inline { + li { + display: inline-block; + vertical-align: middle; + } + +} + +.color_red { + color: #E2001A; +} + +.tc { + text-align: center; +} + +.tr { + text-align: right; +} +.el-dialog{ + width: 90%; + max-width: 440px; +} +#tns2-iw{ height: 90px;} +.rc-carousel:not(.rc-carousel--loaded){visibility:visible!important} +@media screen and (max-width: 768px) { + .el-message-box{ + width: 300px; + } + .el-dialog{ + width: 90%; + } + } + \ No newline at end of file diff --git a/rc-busness/assets/css/openaddress.less b/rc-busness/assets/css/openaddress.less index 08aa9e24..689de33e 100644 --- a/rc-busness/assets/css/openaddress.less +++ b/rc-busness/assets/css/openaddress.less @@ -1,310 +1,11 @@ - - -.rc-margin-bottom--lg{ - margin: 0; -} - - @media screen and (max-width:768px){ - .online{ - width:100%; - background:#d7d7d7; - margin-top:1.5rem; - height:.06rem; - &.bold{ - height:8px; - background:#f6f6f6; - } - } - .useredit{ - display: none; - } - .rc-button{ - display: flex; - align-items: center; - justify-content: center; - width: 375px; -height: 80px; -background: #FFFFFF; -box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); -opacity: 1; -border-radius: 0px; - } - .rc-footbutton { - width: 164px; -height: 48px; -border: 2px solid #E2001A; -opacity: 1; -border-radius: 30px; -background: #E2001A; -display: flex; -justify-content: center; -align-items: center; -font-size: 16px; -color: #FFFFFF; - - - } -.rc-max-width--xl{ - padding: 24px 20px 24px 20px; - .rc-title { - display: flex; - align-items: center; - color: #333333; - font-size: 14px; - em { - font-style: normal; - font-size: 14px; - } - span { - display: block; - margin-left: 8px; - } - } - .rc-center{ - padding-top: 24px; - } - -} - - .rc-address { - margin-top: 8px; - text-overflow: -o-ellipsis-lastline; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - line-clamp: 2; - -webkit-box-orient: vertical; - font-size: 14px; - color: #333333; - } - .rc-footer { - display: flex; - justify-content: space-between; - align-items: center; - margin-top: 20px; - display: flex; - align-items: center; - .rc-right { - span { - border-bottom: 1px solid #666666; - } - span:first-child { - margin-right: 16px; - } - } - img{ - width: 43px; - } - .rc-foot{ - display: flex; - align-items: center; - color: #333333; - font-size: 14px; - span{ - margin-left: 8px; - } - } - } - } @media screen and (min-width: 769px) - { -.usercontend { - display:inline-block; -} - .usercontshow{ - .rc-button{ - display: none; - } - } - - .usercontend{ - margin-top: 40px; - } - .online{ - display: none; - } - .rc-button{ - display: none; - } - .useredit{ - width: 680px; -height: 164px; -background: #FFFFFF; -border: 1px solid #D7D7D7; -opacity: 1; -border-radius: 3px; -display: flex; -align-items: center; -justify-content: center; -img{ - width: 31px; - height: 31px; -} -span{ - color: #333333; - font-size: 18px; -} - } - .usercontend{ - .useradd{ - width: 680px; -height: 164px; -background: #FFFFFF; -border-radius: 3px; -img{ - width: 31px; - height: 31px; - display: block; -} - } - -} - .rc-max-width--xl{ - - .rc-center{ - margin-top: 24px; - margin-left: 24px; - } - .rc-cat{ - width: 640px; - border: 1px solid #D7D7D7; - border-radius: 3px; - position: relative; - margin-left: 40px; - height: 164px; - } - .rc-title { - display: flex; - align-items: center; - color: #333333; - font-size: 20px; - em { - font-style: normal; - } - span { - display: block; - margin-left: 32px; - font-size: 20px; - } - } - .rc-footer { - display: flex; - justify-content: space-between; - align-items: center; - margin-top: 20px; - display: flex; - align-items: center; - .rc-right { - position: absolute; - right: 24px; - top: 24px; - span { - border-bottom: 1px solid #666666; - } - span:first-child { - margin-right: 16px; - } - } - img{ - width: 43px; - } - .rc-foot{ - display: flex; - align-items: center; - color: #333333; - font-size: 16px; - margin-top: 16px; - span{ - margin-left: 8px; - } - } - } - - } - .rc-max-width--xl{ - - - .rc-button { - height: 80px; - background: #ffffff; - box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); - opacity: 1; - display: flex; - align-items: center; - justify-content: center; - display: block; - - .rc-footbutton { - width: 164px; - height: 48px; - border: 2px solid #e2001a; - opacity: 1; - border-radius: 30px; - display: flex; - align-items: center; - background: #e2001a; - span { - display: block; - text-align: center; - color: white; - font-size: 16px; - width: 100%; - } - } - } - .rc-header { - display: flex; - align-items: center; - color: #333333; - em { - font-style: normal; - font-size: 14px; - } - span { - display: block; - margin-left: 8px; - } - } - .rc-address { - margin-top: 16px; - text-overflow: -o-ellipsis-lastline; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - line-clamp: 2; - -webkit-box-orient: vertical; - font-size: 20px; - color: #333333; - - } - .rc-footer { - display: flex; - justify-content: space-between; - align-items: center; - padding-bottom: 20px; - margin-top: 8px; - .rc-right { - span { - border-bottom: 1px solid #666666; - } - span:first-child { - margin-right: 16px; - } - } - } - - - } - } \ No newline at end of file diff --git a/rc-busness/assets/pay/fail.png b/rc-busness/assets/pay/fail.png new file mode 100644 index 0000000000000000000000000000000000000000..71821a9b81a294b89db107458d57e11eec7098cc GIT binary patch literal 12262 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 Jt7R>M{}0}}0Z;${ literal 0 HcmV?d00001 diff --git a/rc-busness/assets/pay/wx.png b/rc-busness/assets/pay/wx.png new file mode 100644 index 0000000000000000000000000000000000000000..7316a9d7a3e4c17069e575e72f511572643d9db1 GIT binary patch literal 4200 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 literal 0 HcmV?d00001 diff --git a/rc-busness/pages/myorder/userrecord.vue b/rc-busness/pages/myorder/userrecord.vue index 3b1991bb..aefb13d4 100644 --- a/rc-busness/pages/myorder/userrecord.vue +++ b/rc-busness/pages/myorder/userrecord.vue @@ -1,108 +1,101 @@ \ No newline at end of file diff --git a/rc-busness/pages/personal/settlement.less b/rc-busness/pages/personal/settlement.less new file mode 100644 index 00000000..72c8358a --- /dev/null +++ b/rc-busness/pages/personal/settlement.less @@ -0,0 +1,414 @@ +ul li ol li em strong i { + list-style: none; + font-style: normal; +} + +.rc-header { + width: 100%; +} + + + +.settlement { + padding-top: 100px; +} + + +.rc-main { + width: 92%; + margin: 0 auto; + max-width: 1400px; + + .rc-userbottomm { + display: none; + } + + .rc-border { + width: 100%; + border-bottom: 1px solid #d7d7d7; + margin-top: 32px; + } + + .rc-receiving { + width: 100%; + height: 80px; + display: flex; + flex-direction: column; + + em { + font-style: normal; + color: #e1001a; + font-size: 26px; + } + + span { + color: #666666; + font-size: 16px; + display: block; + margin-top: 25px; + } + } + + .delivery { + display: flex; + flex-direction: column; + height: 140px; + display: flex; + justify-content: center; + + .viewdetails { + display: flex; + align-items: center; + justify-content: flex-end; + + span { + color: #444444; + font-size: 18px; + display: block; + margin-right: 8px; + } + + img { + width: 8px; + height: 16px; + } + } + + .to-delivery { + display: flex; + align-items: center; + font-style: normal; + + span { + display: block; + // margin-left: 16px; + font-size: 18px; + color: #333333; + } + + i { + font-style: normal; + margin-left: 8px; + display: block; + font-size: 18px; + color: #999999; + } + } + + .bo-delivery { + span { + font-size: 16px; + color: #666666; + display: block; + margin-top: 16px; + } + } + } + + .address-list { + display: flex; + + .mypersonal { + display: flex; + flex-direction: column; + justify-content: center; + border: 1px solid #808285; + height: 118px; + width: 320px; + padding: 15px; + color: #333333; + margin: 20px 40px 20px 0; + position: relative; + cursor: pointer; + + &.active { + border: 1px solid #E2001A; + } + + .edit { + position: absolute; + top: 5px; + right: 8px; + display: none; + cursor: pointer; + } + + &:hover { + .edit { + display: block; + } + } + + .my-delivery { + display: flex; + align-items: center; + font-style: normal; + + span { + display: block; + margin-left: 3px; + + } + + i { + font-style: normal; + margin-left: 3px; + display: block; + } + } + + .per-delivery { + span { + color: #666666; + display: block; + margin-top: 5px; + } + } + } + } + + + .rc-usermain { + display: flex; + padding: 20px 0; + + .rc-image { + border: 1px solid #d8d8d8; + margin-right: 20px; + + img { + width: 96px; + height: 96px; + display: block; + } + } + + .rc-right { + .rc-usercenter { + display: flex; + justify-content: center; + flex-direction: column; + + h3, + .price { + font-style: normal; + display: block; + font-size: 18px; + font-weight: bold; + margin-top: 17px; + color: #e1001a; + } + } + + display: flex; + justify-content: space-between; + width: 100%; + } + + .rc-userright { + display: flex; + flex-direction: column; + color: #666666; + font-size: 16px; + + span { + display: block; + margin-top: 16px; + font-size: 16px; + } + } + + .rc-userbottom { + display: flex; + width: 60%; + justify-content: space-between; + align-items: center; + + .price { + font-style: normal; + color: #e1001a; + font-size: 20px; + font-weight: bold; + } + + } + } + + .rc-merchandise { + + padding: 15px 0; + + &::after { + display: block; + content: ''; + clear: both; + } + + ul { + width: 25%; + display: flex; + flex-direction: column; + justify-content: space-between; + line-height: 40px; + float: right; + + i { + font-style: normal; + color: #666666; + } + + li { + list-style: none; + font-style: normal; + display: flex; + justify-content: space-between; + + span { + color: #333333; + } + } + + li .red { + color: #e1001a; + font-size: 20px; + font-style: normal; + } + } + } + + .rc-payment { + width: 100%; + margin-top: 80px; + + .u-trackingnumber { + display: flex; + align-items: center; + + i { + font-size: 18px; + font-style: normal; + margin-right: 16px; + } + + img { + width: 8px; + height: 16px; + } + } + + ul { + width: 100%; + display: flex; + flex-direction: column; + justify-content: space-between; + line-height: 40px; + font-size: 18px; + + i { + font-style: normal; + color: #666666; + display: block; + } + + li { + list-style: none; + font-style: normal; + display: flex; + justify-content: space-between; + + span { + color: #333333; + } + } + } + } + + .rc-foot { + display: flex; + flex-direction: column; + + .rc-foo { + display: flex; + justify-content: flex-end; + flex-direction: column; + align-items: self-end; + + i { + font-style: normal; + color: #333333; + font-size: 20px; + margin-right: 20px; + } + + em { + font-style: normal; + color: #e1001a; + font-size: 26px; + } + + span { + display: block; + width: 164px; + margin-top: 36px; + background: #e2001a; + line-height: 48px; + text-align: center; + color: white; + font-size: 16px; + + height: 48px; + + border-radius: 30px; + } + } + } +} +.diallog_width{ + width: 100%; + max-width: 440px; +} +.el-dialog{ + width: 100%; +} +//手机端 +@media screen and (max-width: 768px) { + + .diallog_width{ + width: 100%; + + } + .rc-main { + .address-list { + display: contents; + + .mypersonal { + width: 100%; + height: auto; + } + } + .rc-usermain { + .rc-right { display: table} + } + .rc-merchandise{ + padding: 15px 0 120px; + ul{ + float: none; + width: 100%; + } + } + .rc-foot{ + .rc-foo{ + display: flex; + justify-content: space-around; + flex-direction: row; + align-items: self-end; + position: fixed; + bottom: 0; + background: #fff; + width: 100%; + padding: 10px; + } + } + } + +} \ No newline at end of file diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index 878947ec..a6ee2015 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -1,168 +1,145 @@ \ No newline at end of file diff --git a/rc-busness/pages/personal/userpay.vue b/rc-busness/pages/personal/userpay.vue index a3070243..6122d45f 100644 --- a/rc-busness/pages/personal/userpay.vue +++ b/rc-busness/pages/personal/userpay.vue @@ -1,578 +1,303 @@ \ No newline at end of file diff --git a/rc-busness/pages/productdetails/productlist.vue b/rc-busness/pages/productdetails/productlist.vue index b5e66b0f..862c457d 100644 --- a/rc-busness/pages/productdetails/productlist.vue +++ b/rc-busness/pages/productdetails/productlist.vue @@ -516,12 +516,12 @@ export default { this.$refs.userstandard[0].style.margin = 0 + "px"; }); this.userst(); - this.activeIndex = stype; - if (stype !== "" && stype !== undefined) { - this.onmessage(stype); - } else { - this.usetmessage(); - } + // this.activeIndex = stype; + // if (stype !== "" && stype !== undefined) { + // this.onmessage(stype); + // } else { + // this.usetmessage(); + // } }, methods: { async usersearch(stype, usertype) { diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue index e618473d..7a038389 100644 --- a/rc-busness/pages/useraddress/openaddress.vue +++ b/rc-busness/pages/useraddress/openaddress.vue @@ -1,12 +1,8 @@ + + \ No newline at end of file diff --git a/rc-busness/pages/personal/settlement.less b/rc-busness/pages/personal/settlement.less index 72c8358a..692f3bc5 100644 --- a/rc-busness/pages/personal/settlement.less +++ b/rc-busness/pages/personal/settlement.less @@ -366,6 +366,7 @@ ul li ol li em strong i { .diallog_width{ width: 100%; max-width: 440px; + margin: 0 auto; } .el-dialog{ width: 100%; diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index a6ee2015..c8d0fd6f 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -95,10 +95,10 @@
- + >
@@ -108,7 +108,8 @@ import Myheader from "~/components/header.vue"; import { userin, memberAddress, generateOrderWX } from "../../ajax/getData"; import tabs from "@/components/tabs.vue"; -// import myAddress from "../address/address.vue"; +import myAddress from "../address/address.vue"; + import itemMixin from "../../../smart-admin-web/src/components/main/components/side-menu/item-mixin"; export default { middleware: "metaTitle", @@ -311,7 +312,7 @@ export default { components: { Myheader, tabs, - // myAddress, + myAddress, }, }; diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index dc8b3529..2e853e76 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -1,256 +1,308 @@