From b839bd7b77f73c03aa70233c3a896c6cb41852f0 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 19 May 2021 20:21:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8A=9B=E5=87=BA=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=90=97=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- framework/src/main/java/cn/lili/common/enums/ResultCode.java | 3 +-- .../cn/lili/modules/order/cart/service/CartServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 3 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 0abac758..8dd3af54 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java @@ -124,8 +124,7 @@ public enum ResultCode { * 购物车 */ CART_ERROR(30001, "读取结算页的购物车异常"), - GOODS_NOT_SUPPORT(30002, "以下商品不支持当前收货地址："), - SHIPPING_NOT_APPLY(30005, "当前选择地址暂不支持配送！"), + SHIPPING_NOT_APPLY(30005, "购物商品不支持当前收货地址配送"), /** * 订单 */ 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 7d05f2e6..8e1434b8 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 @@ -528,7 +528,7 @@ public class CartServiceImpl implements CartService { break forTemplates; } } - throw new ServiceException(ResultCode.GOODS_NOT_SUPPORT, cartSkuVO.getGoodsSku().getGoodsName()); + throw new ServiceException(ResultCode.SHIPPING_NOT_APPLY, cartSkuVO.getGoodsSku().getGoodsName()); } } From 1eee2eb5b14c12694a9f3f174de1917a08caa922 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 20 May 2021 09:50:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=B2=E5=88=A0=E9=99=A4=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java index a23defa1..0b45e62a 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java @@ -236,6 +236,9 @@ public class GoodsServiceImpl extends ServiceImpl implements @Override public Integer goodsNum(GoodsStatusEnum goodsStatusEnum, GoodsAuthEnum goodsAuthEnum) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + + queryWrapper.eq(Goods::getDeleteFlag,false); + if (goodsStatusEnum != null) { queryWrapper.eq(Goods::getMarketEnable, goodsStatusEnum.name()); } From 5c41b06381f2d970196135163d8fbebc404dbf71 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 20 May 2021 10:09:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=90=8D=E7=A7=B0=E5=B1=95=E7=A4=BA=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 --- .../lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java index 078405c5..50a5db0a 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java @@ -260,7 +260,7 @@ public class OrderServiceImpl extends ServiceImpl implements this.sendUpdateStatusMessage(orderMessage); String message = "订单付款，付款方式[" + PaymentMethodEnum.valueOf(paymentMethod).paymentName() + "]"; - OrderLog orderLog = new OrderLog(orderSn, "-1", UserEnums.SYSTEM.name(), "系统操作", message); + OrderLog orderLog = new OrderLog(orderSn, "-1", UserEnums.SYSTEM.getRole(), "系统操作", message); orderLogService.save(orderLog);