From 3eab5df6b619f5b72bf6608cb1f47f6d202dffa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Tue, 5 Mar 2024 11:22:51 +0800 Subject: [PATCH] bug --- .../activeOneCoupon/dtos/ActiveOneCouponDTO.java | 1 + .../activeOneCoupon/entity/ActiveOneCoupon.java | 10 +++++++++- .../activeOneCoupon/entity/ActiveOneCouponChild.java | 9 +++++++++ .../service/impl/ActiveOneCouponServiceImpl.java | 6 ++++-- .../activeOneCoupon/vo/ActiveOneCouponVO.java | 1 + .../service/impl/CardFavorableRecordServiceImpl.java | 2 +- .../store/controller/BackendStoreController.java | 6 ++++++ .../src/main/resources/mapper/MtUserGradeMapper.xml | 2 +- 8 files changed, 32 insertions(+), 5 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/dtos/ActiveOneCouponDTO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/dtos/ActiveOneCouponDTO.java index 86663ffcb..291393210 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/dtos/ActiveOneCouponDTO.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/dtos/ActiveOneCouponDTO.java @@ -12,6 +12,7 @@ public class ActiveOneCouponDTO extends ActiveOneCoupon implements Serializable private List cardFavorableIds; //兑换券ids private List cardExchangeIds; + private Integer condition; //会员等级ids private Integer[] gradeIds; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/entity/ActiveOneCoupon.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/entity/ActiveOneCoupon.java index e5323c305..ad3ae86c2 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/entity/ActiveOneCoupon.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/entity/ActiveOneCoupon.java @@ -4,7 +4,9 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; @@ -17,24 +19,30 @@ import java.io.Serializable; */ @SuppressWarnings("serial") @Data +@TableName("active_one_coupon") public class ActiveOneCoupon extends Model { //主键id @TableId(type = IdType.AUTO) private Integer id; + private Integer storeId; private String activeName; //会员等级id private String gradeId; - private Integer condition; //会员等级名字 private String gradeName; + + private Integer conditions; + //创建者 private String createBy; //创建时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") private Date createTime; //更新者 private String updateBy; //更新时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") private Date updateTime; /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/entity/ActiveOneCouponChild.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/entity/ActiveOneCouponChild.java index 09fb5af89..253492a0a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/entity/ActiveOneCouponChild.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/entity/ActiveOneCouponChild.java @@ -1,7 +1,12 @@ package com.fuint.business.marketingActivity.activeOneCoupon.entity; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; @@ -14,8 +19,10 @@ import java.io.Serializable; */ @SuppressWarnings("serial") @Data +@TableName("active_one_coupon_child") public class ActiveOneCouponChild extends Model { //主键id + @TableId(type = IdType.AUTO) private Integer id; private Integer storeId; //消费有礼活动id @@ -31,10 +38,12 @@ public class ActiveOneCouponChild extends Model { //创建者 private String createBy; //创建时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") private Date createTime; //更新者 private String updateBy; //更新时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") private Date updateTime; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java index d83b50c42..b300f8f7b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java @@ -82,7 +82,8 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl cardFavorableIds = activeOneCouponDTO.getCardFavorableIds(); @@ -137,7 +138,7 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl userLists = userService.getUserCountList(ljUserVo); ljUserVos.setCountAll(userLists.size()); - ljUserVo.setDays(record.getCondition()); + ljUserVo.setDays(record.getConditions()); List userListss = userService.getUserLists(ljUserVo); ljUserVos.setCount(userListss.size()); if (ObjectUtils.isNotEmpty(ljUserVos.getCountAll()) && ObjectUtils.isNotEmpty(ljUserVos.getCount()) && ljUserVos.getCountAll()!=0){ @@ -145,6 +146,7 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl queryWrapper1 = new LambdaQueryWrapper<>(); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/vo/ActiveOneCouponVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/vo/ActiveOneCouponVO.java index 32f110fca..0d806355f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/vo/ActiveOneCouponVO.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/vo/ActiveOneCouponVO.java @@ -34,4 +34,5 @@ public class ActiveOneCouponVO extends ActiveOneCoupon implements Serializable { private List activeOneCouponChildren; private List cardFavorableList; private List cardExchangeList; + private List userVos; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java index 64d617658..704f9d0ba 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java @@ -351,7 +351,7 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl userLists = userService.getUserLists(ljUserVo); ljUserVosList.addAll(userLists); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/controller/BackendStoreController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/controller/BackendStoreController.java index d3fc6466a..35e6e37ff 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/controller/BackendStoreController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/controller/BackendStoreController.java @@ -337,4 +337,10 @@ public class BackendStoreController extends BaseController { public ResponseObject loginVerification(@RequestBody String flag) { return getSuccessResult(storeService.loginVerification(flag)); } + + @GetMapping("getById/id") + public ResponseObject getById(@PathVariable("id") Integer id) { + //return getSuccessResult(storeService.loginVerification(flag)); + return null; + } } diff --git a/fuintBackend/fuint-repository/src/main/resources/mapper/MtUserGradeMapper.xml b/fuintBackend/fuint-repository/src/main/resources/mapper/MtUserGradeMapper.xml index 272a4983f..3e0a69e75 100644 --- a/fuintBackend/fuint-repository/src/main/resources/mapper/MtUserGradeMapper.xml +++ b/fuintBackend/fuint-repository/src/main/resources/mapper/MtUserGradeMapper.xml @@ -3,6 +3,6 @@