From 53f6910a3447244697c6429fab9802a4e051047d Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 6 Jul 2022 15:57:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=93=81?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E4=BD=BF=E7=94=A8=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/lili/common/enums/ResultCode.java | 2 ++ .../lili/modules/order/cart/service/CartServiceImpl.java | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) 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 e871846b..068d7ad5 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java @@ -293,6 +293,8 @@ public enum ResultCode { COUPON_MEMBER_NOT_EXIST(41015, "没有当前会员优惠券"), COUPON_MEMBER_STATUS_ERROR(41016, "当前会员优惠券已过期/作废无法变更状态！"), + SPECIAL_CANT_USE(41020, "特殊商品不能使用优惠券，不能使用"), + /** * 拼团 diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java index 51007a39..83dd4195 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java @@ -287,9 +287,10 @@ public class CartServiceImpl implements CartService { /** * 当购物车商品发生变更时，取消已选择当优惠券 + * * @param tradeDTO */ - private void remoteCoupon(TradeDTO tradeDTO){ + private void remoteCoupon(TradeDTO tradeDTO) { tradeDTO.setPlatformCoupon(null); tradeDTO.setStoreCoupons(new HashMap<>()); } @@ -526,6 +527,12 @@ public class CartServiceImpl implements CartService { AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser()); //获取购物车，然后重新写入优惠券 CartTypeEnum cartTypeEnum = getCartType(way); + + //积分商品不允许使用优惠券 + if (cartTypeEnum.equals(CartTypeEnum.POINTS)) { + throw new ServiceException(ResultCode.SPECIAL_CANT_USE); + } + TradeDTO tradeDTO = this.readDTO(cartTypeEnum); MemberCouponSearchParams searchParams = new MemberCouponSearchParams(); From 4d4b54ec36bd7a4dec193b975525f54075470801 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 6 Jul 2022 16:41:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=86=E9=94=80=E8=AE=A2=E5=8D=950?= =?UTF-8?q?=E5=85=83=E4=BD=A3=E9=87=91=E8=AE=B0=E5=BD=95=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=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 --- .../distribution/serviceimpl/DistributionOrderServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java index 96f2238c..6fb74ad7 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java @@ -94,6 +94,9 @@ public class DistributionOrderServiceImpl extends ServiceImpl Date: Wed, 6 Jul 2022 17:30:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=BC=96=E8=BE=91=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 --- .../modules/member/entity/dto/ManagerMemberEditDTO.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/ManagerMemberEditDTO.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/ManagerMemberEditDTO.java index c61792aa..2f83b11f 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dto/ManagerMemberEditDTO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/ManagerMemberEditDTO.java @@ -21,14 +21,9 @@ import java.util.Date; @Data public class ManagerMemberEditDTO { - @ApiModelProperty(value = "会员用户名,用户名不能进行修改", required = true) - @NotNull(message = "会员用户名不能为空") + @NotNull(message = "用户ID不能为空") private String id; - @ApiModelProperty(value = "会员用户名,用户名不能进行修改", required = true) - @NotNull(message = "会员用户名不能为空") - private String username; - @ApiModelProperty(value = "会员密码") private String password;