From 0ff0f266d406daff47faa792a162b74013300169 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 9 Nov 2021 15:17:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E7=AE=A1=E7=90=86=E7=B1=BB=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/controller/member/MemberAddressBuyerController.java | 2 +- .../{promotion => member}/service/MemberAddressService.java | 2 +- .../serviceimpl/MemberAddressServiceImpl.java | 4 ++-- .../cn/lili/modules/order/cart/service/CartServiceImpl.java | 1 + .../controller/member/MemberAddressManagerController.java | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) rename framework/src/main/java/cn/lili/modules/{promotion => member}/service/MemberAddressService.java (97%) rename framework/src/main/java/cn/lili/modules/{promotion => member}/serviceimpl/MemberAddressServiceImpl.java (97%) diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java index 8cdb835f..0ffc4c2d 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java @@ -5,7 +5,7 @@ import cn.lili.common.security.context.UserContext; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.MemberAddress; -import cn.lili.modules.promotion.service.MemberAddressService; +import cn.lili.modules.member.service.MemberAddressService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/MemberAddressService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberAddressService.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/promotion/service/MemberAddressService.java rename to framework/src/main/java/cn/lili/modules/member/service/MemberAddressService.java index dd330b5f..77193e0c 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/MemberAddressService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberAddressService.java @@ -1,4 +1,4 @@ -package cn.lili.modules.promotion.service; +package cn.lili.modules.member.service; import cn.lili.common.vo.PageVO; import cn.lili.modules.member.entity.dos.MemberAddress; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberAddressServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberAddressServiceImpl.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberAddressServiceImpl.java rename to framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberAddressServiceImpl.java index 85f7b69b..b773f6ee 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberAddressServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberAddressServiceImpl.java @@ -1,10 +1,10 @@ -package cn.lili.modules.promotion.serviceimpl; +package cn.lili.modules.member.serviceimpl; import cn.lili.common.security.context.UserContext; import cn.lili.common.vo.PageVO; import cn.lili.modules.member.entity.dos.MemberAddress; import cn.lili.modules.member.mapper.MemberAddressMapper; -import cn.lili.modules.promotion.service.MemberAddressService; +import cn.lili.modules.member.service.MemberAddressService; import cn.lili.mybatis.util.PageUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 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 68a94a20..e3b63d59 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 @@ -14,6 +14,7 @@ import cn.lili.modules.goods.entity.enums.GoodsStatusEnum; import cn.lili.modules.goods.service.GoodsService; import cn.lili.modules.goods.service.GoodsSkuService; import cn.lili.modules.member.entity.dos.MemberAddress; +import cn.lili.modules.member.service.MemberAddressService; import cn.lili.modules.order.cart.entity.dto.MemberCouponDTO; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.cart.entity.enums.CartTypeEnum; diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java index 83acd865..d75effd5 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java @@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.MemberAddress; -import cn.lili.modules.promotion.service.MemberAddressService; +import cn.lili.modules.member.service.MemberAddressService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; From 5cd0c9a205237326500d9cb79af0c78573d27fd8 Mon Sep 17 00:00:00 2001 From: chopper711 <1814994716@qq.com> Date: Wed, 10 Nov 2021 09:57:22 +0000 Subject: [PATCH 2/2] update README.md. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6e5ea9db..d37ed278 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ -##### 商城 公众号/小程序体验，扫描二维码 +##### 商城 公众号/小程序/APP 体验，扫描二维码 ![image-20210511171611793](https://pickmall.cn/assets/imgs/h5-qrcode.png)