From 010132f237e045917e1022d6d35408fc7549891d Mon Sep 17 00:00:00 2001
From: sj <1304317391@qq.com>
Date: Mon, 14 Nov 2022 16:26:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=8F=8A=E5=AD=90=E9=9B=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/service/dto/YxStoreCouponUserDto.java        | 8 +++++---
 .../service/impl/YxStoreCouponUserServiceImpl.java        | 4 ++--
 .../modules/product/rest/StoreProductController.java      | 5 +++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDto.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDto.java
index fb530966..67660cb2 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDto.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDto.java
@@ -42,10 +42,12 @@ public class YxStoreCouponUserDto implements Serializable {
     private Date addTime;
 
     // 优惠券结束时间
-    private Date endTime;
+    private Date useEndTime;
 
-    // 使用时间
-    private Date useTime;
+    // 优惠券结束时间
+    private Date useStartTime;
+//    // 使用时间
+//    private Date useTime;
 
     // 获取方式
     private String type;
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java
index 21eaddd0..0339849f 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java
@@ -341,8 +341,8 @@ public class YxStoreCouponUserServiceImpl extends BaseServiceImpl<YxStoreCouponU
             map.put("优惠券的面值", yxStoreCouponUser.getCouponPrice());
             map.put("最低消费多少金额可用优惠券", yxStoreCouponUser.getUseMinPrice());
             map.put("优惠券创建时间", yxStoreCouponUser.getAddTime());
-            map.put("优惠券结束时间", yxStoreCouponUser.getEndTime());
-            map.put("使用时间", yxStoreCouponUser.getUseTime());
+            map.put("优惠券使用结束时间", yxStoreCouponUser.getUseEndTime());
+            map.put("使用开始时间", yxStoreCouponUser.getUseEndTime());
             map.put("获取方式", yxStoreCouponUser.getType());
             map.put("状态（0：未使用，1：已使用, 2:已过期）", yxStoreCouponUser.getStatus());
             map.put("是否有效", yxStoreCouponUser.getIsFail());
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java
index 31c54036..c44fb568 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java
@@ -126,8 +126,9 @@ public class StoreProductController {
             String newHtml = "";
             Map<String,Object> map = new HashMap<>();
                 newHtml = String.join("", Collections.nCopies(1,html));
-                map.put("value",yxStoreCategory.getId());
-                map.put("label",newHtml + yxStoreCategory.getCateName());
+                //为了前端级联选择器好显示，这里分类名也字段名为storeName
+                map.put("id",yxStoreCategory.getId());
+                map.put("storeName",newHtml + yxStoreCategory.getCateName());
                 List<YxStoreProduct> list=yxStoreProductService.lambdaQuery()
                                 .eq(YxStoreProduct::getIsShow,ShopCommonEnum.SHOW_1.getValue())
                                 .eq(YxStoreProduct::getCateId,yxStoreCategory.getId())