From ecd40523d4a7d1c7d6df060b53d19265b5a31111 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 4 Aug 2022 11:17:14 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=20=E6=BC=94=E7=A4=BA=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E9=99=90=E5=88=B6=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/member/serviceimpl/MemberServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index 86031a0c..0194434b 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.text.CharSequenceUtil; import cn.lili.cache.Cache; import cn.lili.cache.CachePrefix; +import cn.lili.common.aop.annotation.DemoSite; import cn.lili.common.context.ThreadContextHolder; import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.SwitchEnum; @@ -264,6 +265,7 @@ public class MemberServiceImpl extends ServiceImpl impleme } @Override + @DemoSite public Member modifyPass(String oldPassword, String newPassword) { AuthUser tokenUser = UserContext.getCurrentUser(); if (tokenUser == null) { From 98b863be6f510d3e508b987404686ef024b16aed Mon Sep 17 00:00:00 2001 From: Chopper Date: Fri, 5 Aug 2022 17:14:20 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E9=AA=8C=E8=AF=81=E5=AD=98=E5=9C=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java | 1 - 1 file changed, 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java index 0400c246..567594bf 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java @@ -49,7 +49,6 @@ public class StoreEditDTO { @ApiModelProperty(value = "公司地址地区") private String companyAddressPath; - @Mobile @ApiModelProperty(value = "公司电话") private String companyPhone; From c38a8c0475d63409869650f8654d91aa325e8239 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 8 Aug 2022 09:14:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/modules/system/serviceimpl/RegionServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java index dfb8863e..cccf1860 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java @@ -75,7 +75,7 @@ public class RegionServiceImpl extends ServiceImpl impleme Region region = this.getOne(lambdaQueryWrapper, false); if (region != null) { sql.append(region.getPath()).append(",").append(region.getId()); - return sql.toString().replace(",0,",""); + return sql.toString().replace(",0,", ""); } return null; } @@ -92,9 +92,9 @@ public class RegionServiceImpl extends ServiceImpl impleme @Override public Map getRegion(String cityCode, String townName) { //获取地址信息 - Region region = this.baseMapper.selectOne(new QueryWrapper() + Region region = this.getOne(new QueryWrapper() .eq("city_code", cityCode) - .eq("name", townName)); + .eq("name", townName), false); if (region != null) { //获取它的层级关系 String path = region.getPath(); From 72c58059bd4a70603ba441a7b916940743becfe9 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 9 Aug 2022 16:08:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=88=9B=E5=BB=BA=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/lili/common/enums/ResultCode.java | 14 ++++++++------ .../modules/store/entity/dto/StoreEditDTO.java | 1 - .../promotion/CouponActivityManagerController.java | 7 ++++++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java index 068d7ad5..8ce9a886 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java @@ -278,11 +278,6 @@ public enum ResultCode { COUPON_RECEIVE_ERROR(41005, "当前优惠券已经被领取完了，下次要早点来哦"), COUPON_NUM_INSUFFICIENT_ERROR(41006, "优惠券剩余领取数量不足"), COUPON_NOT_EXIST(41007, "当前优惠券不存在"), - COUPON_DO_NOT_RECEIVER(41030, "当前优惠券不允许主动领取"), - COUPON_ACTIVITY_NOT_EXIST(410022, "当前优惠券活动不存在"), - COUPON_SAVE_ERROR(41020, "保存优惠券失败"), - COUPON_ACTIVITY_SAVE_ERROR(41023, "保存优惠券活动失败"), - COUPON_DELETE_ERROR(41021, "删除优惠券失败"), COUPON_LIMIT_NUM_LESS_THAN_0(41008, "领取限制数量不能为负数"), COUPON_LIMIT_GREATER_THAN_PUBLISH(41009, "领取限制数量超出发行数量"), COUPON_DISCOUNT_ERROR(41010, "优惠券折扣必须小于10且大于0"), @@ -293,8 +288,15 @@ public enum ResultCode { COUPON_MEMBER_NOT_EXIST(41015, "没有当前会员优惠券"), COUPON_MEMBER_STATUS_ERROR(41016, "当前会员优惠券已过期/作废无法变更状态！"), - SPECIAL_CANT_USE(41020, "特殊商品不能使用优惠券，不能使用"), + SPECIAL_CANT_USE(41019, "特殊商品不能使用优惠券，不能使用"), + COUPON_SAVE_ERROR(41020, "保存优惠券失败"), + COUPON_DELETE_ERROR(41021, "删除优惠券失败"), + COUPON_ACTIVITY_NOT_EXIST(41022, "当前优惠券活动不存在"), + COUPON_ACTIVITY_SAVE_ERROR(41023, "保存优惠券活动失败"), + COUPON_ACTIVITY_MAX_NUM(41024, "优惠券活动赠券数量最多为3"), + + COUPON_DO_NOT_RECEIVER(41030, "当前优惠券不允许主动领取"), /** * 拼团 diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java index 567594bf..4c460945 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java @@ -1,6 +1,5 @@ package cn.lili.modules.store.entity.dto; -import cn.lili.common.validation.Mobile; import cn.lili.common.validation.Phone; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java index 635d9ff1..e2c4cbf6 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java @@ -6,6 +6,7 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dos.CouponActivity; +import cn.lili.modules.promotion.entity.dos.CouponActivityItem; import cn.lili.modules.promotion.entity.dto.CouponActivityDTO; import cn.lili.modules.promotion.entity.vos.CouponActivityVO; import cn.lili.modules.promotion.service.CouponActivityService; @@ -49,8 +50,12 @@ public class CouponActivityManagerController { @ApiOperation(value = "添加优惠券活动") @PostMapping - @PutMapping(consumes = "application/json", produces = "application/json") public ResultMessage addCouponActivity(@RequestBody(required = false) CouponActivityDTO couponActivityDTO) { + for (CouponActivityItem couponActivityItem : couponActivityDTO.getCouponActivityItems()) { + if (couponActivityItem.getNum() > 3) { + throw new ServiceException(ResultCode.COUPON_ACTIVITY_MAX_NUM); + } + } if (couponActivityService.savePromotions(couponActivityDTO)) { return ResultUtil.data(couponActivityDTO); } From 8d95319e39fb5be39a20d231d4743738bd876f34 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 11 Aug 2022 10:16:53 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=89=8D=E7=BC=80=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/lili/timetask/TimedTaskJobHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/consumer/src/main/java/cn/lili/timetask/TimedTaskJobHandler.java b/consumer/src/main/java/cn/lili/timetask/TimedTaskJobHandler.java index 3bf9d017..b8983582 100644 --- a/consumer/src/main/java/cn/lili/timetask/TimedTaskJobHandler.java +++ b/consumer/src/main/java/cn/lili/timetask/TimedTaskJobHandler.java @@ -71,7 +71,7 @@ public class TimedTaskJobHandler { try { everyHourExecutes.get(i).execute(); } catch (Exception e) { - log.error("每分钟任务异常", e); + log.error("每小时任务异常", e); } } return ReturnT.SUCCESS; @@ -94,7 +94,7 @@ public class TimedTaskJobHandler { try { everyDayExecutes.get(i).execute(); } catch (Exception e) { - log.error("每分钟任务异常", e); + log.error("每日任务异常", e); } } return ReturnT.SUCCESS;