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 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 list=yxStoreProductService.lambdaQuery() .eq(YxStoreProduct::getIsShow,ShopCommonEnum.SHOW_1.getValue()) .eq(YxStoreProduct::getCateId,yxStoreCategory.getId())