From 00ffd246a9cfaf48946147a0a50c15583cf5f2ff Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 6 Dec 2021 17:45:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=BB=A3=E7=A0=81=E6=A8=A1?= =?UTF-8?q?=E5=9D=97trade=E7=BB=9F=E4=B8=80=E6=9B=B4=E5=90=8D=E4=B8=BAorde?= =?UTF-8?q?r?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{trade => order}/AfterSaleBuyerController.java | 2 +- .../lili/controller/{trade => order}/CartController.java | 2 +- .../controller/{trade => order}/OrderBuyerController.java | 2 +- .../{trade => order}/OrderComplaintBuyerController.java | 2 +- .../{trade => order}/ReceiptBuyerController.java | 2 +- .../{trade => order}/RechargeTradeBuyerController.java | 2 +- .../{trade => order}/WalletLogBuyerController.java | 2 +- .../lili/controller/common}/IpInfoManagerController.java | 7 +++---- .../{system => member}/mapper/StoreLogisticsMapper.java | 2 +- .../{system => member}/service/StoreLogisticsService.java | 2 +- .../serviceimpl/StoreLogisticsServiceImpl.java | 6 +++--- .../{trade => order}/AfterSaleManagerController.java | 2 +- .../{trade => order}/AfterSaleReasonManagerController.java | 2 +- .../{trade => order}/OrderComplaintManagerController.java | 2 +- .../{trade => order}/OrderLogManagerController.java | 2 +- .../{trade => order}/OrderManagerController.java | 2 +- .../{trade => order}/PaymentLogManagerController.java | 2 +- .../{trade => order}/ReceiptManagerController.java | 2 +- .../{trade => order}/RechargeManagerController.java | 2 +- .../{trade => order}/RefundLogManagerController.java | 2 +- .../{trade => order}/WalletLogManagerController.java | 2 +- .../controller/{trade => member}/BillStoreController.java | 2 +- .../{trade => member}/MemberEvaluationStoreController.java | 2 +- .../{trade => order}/AfterSaleStoreController.java | 2 +- .../{trade => order}/OrderComplaintStoreController.java | 2 +- .../{trade => order}/OrderLogStoreController.java | 2 +- .../controller/{trade => order}/OrderStoreController.java | 4 ++-- .../{trade => order}/ReceiptStoreController.java | 2 +- .../lili/controller/settings/LogisticsStoreController.java | 2 +- 29 files changed, 34 insertions(+), 35 deletions(-) rename buyer-api/src/main/java/cn/lili/controller/{trade => order}/AfterSaleBuyerController.java (99%) rename buyer-api/src/main/java/cn/lili/controller/{trade => order}/CartController.java (99%) rename buyer-api/src/main/java/cn/lili/controller/{trade => order}/OrderBuyerController.java (99%) rename buyer-api/src/main/java/cn/lili/controller/{trade => order}/OrderComplaintBuyerController.java (99%) rename buyer-api/src/main/java/cn/lili/controller/{trade => order}/ReceiptBuyerController.java (97%) rename buyer-api/src/main/java/cn/lili/controller/{trade => order}/RechargeTradeBuyerController.java (98%) rename buyer-api/src/main/java/cn/lili/controller/{trade => order}/WalletLogBuyerController.java (97%) rename {manager-api/src/main/java/cn/lili/controller/member => common-api/src/main/java/cn/lili/controller/common}/IpInfoManagerController.java (89%) rename framework/src/main/java/cn/lili/modules/{system => member}/mapper/StoreLogisticsMapper.java (97%) rename framework/src/main/java/cn/lili/modules/{system => member}/service/StoreLogisticsService.java (96%) rename framework/src/main/java/cn/lili/modules/{system => member}/serviceimpl/StoreLogisticsServiceImpl.java (91%) rename manager-api/src/main/java/cn/lili/controller/{trade => order}/AfterSaleManagerController.java (99%) rename manager-api/src/main/java/cn/lili/controller/{trade => order}/AfterSaleReasonManagerController.java (98%) rename manager-api/src/main/java/cn/lili/controller/{trade => order}/OrderComplaintManagerController.java (99%) rename manager-api/src/main/java/cn/lili/controller/{trade => order}/OrderLogManagerController.java (98%) rename manager-api/src/main/java/cn/lili/controller/{trade => order}/OrderManagerController.java (99%) rename manager-api/src/main/java/cn/lili/controller/{trade => order}/PaymentLogManagerController.java (97%) rename manager-api/src/main/java/cn/lili/controller/{trade => order}/ReceiptManagerController.java (97%) rename manager-api/src/main/java/cn/lili/controller/{trade => order}/RechargeManagerController.java (97%) rename manager-api/src/main/java/cn/lili/controller/{trade => order}/RefundLogManagerController.java (98%) rename manager-api/src/main/java/cn/lili/controller/{trade => order}/WalletLogManagerController.java (97%) rename seller-api/src/main/java/cn/lili/controller/{trade => member}/BillStoreController.java (99%) rename seller-api/src/main/java/cn/lili/controller/{trade => member}/MemberEvaluationStoreController.java (98%) rename seller-api/src/main/java/cn/lili/controller/{trade => order}/AfterSaleStoreController.java (99%) rename seller-api/src/main/java/cn/lili/controller/{trade => order}/OrderComplaintStoreController.java (99%) rename seller-api/src/main/java/cn/lili/controller/{trade => order}/OrderLogStoreController.java (97%) rename seller-api/src/main/java/cn/lili/controller/{trade => order}/OrderStoreController.java (98%) rename seller-api/src/main/java/cn/lili/controller/{trade => order}/ReceiptStoreController.java (98%) diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/order/AfterSaleBuyerController.java similarity index 99% rename from buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java rename to buyer-api/src/main/java/cn/lili/controller/order/AfterSaleBuyerController.java index 6ede0418..4f420609 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/order/AfterSaleBuyerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java b/buyer-api/src/main/java/cn/lili/controller/order/CartController.java similarity index 99% rename from buyer-api/src/main/java/cn/lili/controller/trade/CartController.java rename to buyer-api/src/main/java/cn/lili/controller/order/CartController.java index 46b1107a..0e1cc019 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java +++ b/buyer-api/src/main/java/cn/lili/controller/order/CartController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java similarity index 99% rename from buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java rename to buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java index 4e945822..b1f1ecbd 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultUtil; diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/order/OrderComplaintBuyerController.java similarity index 99% rename from buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java rename to buyer-api/src/main/java/cn/lili/controller/order/OrderComplaintBuyerController.java index c05fd886..65528b0d 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/order/OrderComplaintBuyerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.AuthUser; diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/ReceiptBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/order/ReceiptBuyerController.java similarity index 97% rename from buyer-api/src/main/java/cn/lili/controller/trade/ReceiptBuyerController.java rename to buyer-api/src/main/java/cn/lili/controller/order/ReceiptBuyerController.java index 220e3520..c707c2ea 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/ReceiptBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/order/ReceiptBuyerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/order/RechargeTradeBuyerController.java similarity index 98% rename from buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java rename to buyer-api/src/main/java/cn/lili/controller/order/RechargeTradeBuyerController.java index ed017607..81c38bb2 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/order/RechargeTradeBuyerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/order/WalletLogBuyerController.java similarity index 97% rename from buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java rename to buyer-api/src/main/java/cn/lili/controller/order/WalletLogBuyerController.java index 79d987d9..70ebd2c0 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/order/WalletLogBuyerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.AuthUser; diff --git a/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java b/common-api/src/main/java/cn/lili/controller/common/IpInfoManagerController.java similarity index 89% rename from manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java rename to common-api/src/main/java/cn/lili/controller/common/IpInfoManagerController.java index 77881b55..3cd05c75 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java +++ b/common-api/src/main/java/cn/lili/controller/common/IpInfoManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.member; +package cn.lili.controller.common; import cn.lili.common.utils.IpHelper; import cn.lili.common.enums.ResultUtil; @@ -19,8 +19,8 @@ import javax.servlet.http.HttpServletRequest; * @since 2020-02-25 14:10:16 */ @RestController -@Api(tags = "管理端,IP接口") -@RequestMapping("/manager/common/ip") +@Api(tags = "获取IP信息以及天气") +@RequestMapping("/common/ip") public class IpInfoManagerController { @Autowired private IpHelper ipHelper; @@ -28,7 +28,6 @@ public class IpInfoManagerController { @RequestMapping(value = "/info", method = RequestMethod.GET) @ApiOperation(value = "IP及天气相关信息") public ResultMessage upload(HttpServletRequest request) { - String result = ipHelper.getIpCity(request); return ResultUtil.data(result); } diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/StoreLogisticsMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/StoreLogisticsMapper.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/system/mapper/StoreLogisticsMapper.java rename to framework/src/main/java/cn/lili/modules/member/mapper/StoreLogisticsMapper.java index 3c5e8a0a..b37dfa80 100644 --- a/framework/src/main/java/cn/lili/modules/system/mapper/StoreLogisticsMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/StoreLogisticsMapper.java @@ -1,4 +1,4 @@ -package cn.lili.modules.system.mapper; +package cn.lili.modules.member.mapper; import cn.lili.modules.store.entity.dos.StoreLogistics; import cn.lili.modules.system.entity.vo.StoreLogisticsVO; diff --git a/framework/src/main/java/cn/lili/modules/system/service/StoreLogisticsService.java b/framework/src/main/java/cn/lili/modules/member/service/StoreLogisticsService.java similarity index 96% rename from framework/src/main/java/cn/lili/modules/system/service/StoreLogisticsService.java rename to framework/src/main/java/cn/lili/modules/member/service/StoreLogisticsService.java index 971d1ceb..ea7914de 100644 --- a/framework/src/main/java/cn/lili/modules/system/service/StoreLogisticsService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/StoreLogisticsService.java @@ -1,4 +1,4 @@ -package cn.lili.modules.system.service; +package cn.lili.modules.member.service; import cn.lili.modules.store.entity.dos.StoreLogistics; import cn.lili.modules.system.entity.vo.StoreLogisticsVO; diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/StoreLogisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreLogisticsServiceImpl.java similarity index 91% rename from framework/src/main/java/cn/lili/modules/system/serviceimpl/StoreLogisticsServiceImpl.java rename to framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreLogisticsServiceImpl.java index 3f91a3cd..2f9ddeb0 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/StoreLogisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreLogisticsServiceImpl.java @@ -1,9 +1,9 @@ -package cn.lili.modules.system.serviceimpl; +package cn.lili.modules.member.serviceimpl; import cn.lili.modules.store.entity.dos.StoreLogistics; import cn.lili.modules.system.entity.vo.StoreLogisticsVO; -import cn.lili.modules.system.mapper.StoreLogisticsMapper; -import cn.lili.modules.system.service.StoreLogisticsService; +import cn.lili.modules.member.mapper.StoreLogisticsMapper; +import cn.lili.modules.member.service.StoreLogisticsService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java similarity index 99% rename from manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java rename to manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java index 72c3e1cd..42a16ecd 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/AfterSaleReasonManagerController.java similarity index 98% rename from manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java rename to manager-api/src/main/java/cn/lili/controller/order/AfterSaleReasonManagerController.java index 34008297..75a3a54a 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/order/AfterSaleReasonManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/OrderComplaintManagerController.java similarity index 99% rename from manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java rename to manager-api/src/main/java/cn/lili/controller/order/OrderComplaintManagerController.java index 68c7c69f..a2a64ecc 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/order/OrderComplaintManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.AuthUser; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/OrderLogManagerController.java similarity index 98% rename from manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java rename to manager-api/src/main/java/cn/lili/controller/order/OrderLogManagerController.java index 401461e2..2185ae34 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/order/OrderLogManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java similarity index 99% rename from manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java rename to manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java index 27c7faa1..2f7dedfc 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/PaymentLogManagerController.java similarity index 97% rename from manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java rename to manager-api/src/main/java/cn/lili/controller/order/PaymentLogManagerController.java index 48a58eb4..f122cd0c 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/order/PaymentLogManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.mybatis.util.PageUtil; import cn.lili.common.enums.ResultUtil; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/ReceiptManagerController.java similarity index 97% rename from manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java rename to manager-api/src/main/java/cn/lili/controller/order/ReceiptManagerController.java index 984ad00c..3d0026b1 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/order/ReceiptManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/RechargeManagerController.java similarity index 97% rename from manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java rename to manager-api/src/main/java/cn/lili/controller/order/RechargeManagerController.java index ea5939fa..282468b4 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/order/RechargeManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/RefundLogManagerController.java similarity index 98% rename from manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java rename to manager-api/src/main/java/cn/lili/controller/order/RefundLogManagerController.java index 597e69d5..86c4ab16 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/order/RefundLogManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/WalletLogManagerController.java similarity index 97% rename from manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java rename to manager-api/src/main/java/cn/lili/controller/order/WalletLogManagerController.java index 57157e87..dcac39a5 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/order/WalletLogManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java b/seller-api/src/main/java/cn/lili/controller/member/BillStoreController.java similarity index 99% rename from seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java rename to seller-api/src/main/java/cn/lili/controller/member/BillStoreController.java index 1fceef4b..260448b8 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/member/BillStoreController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.member; import cn.lili.common.context.ThreadContextHolder; import cn.lili.common.enums.ResultUtil; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java b/seller-api/src/main/java/cn/lili/controller/member/MemberEvaluationStoreController.java similarity index 98% rename from seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java rename to seller-api/src/main/java/cn/lili/controller/member/MemberEvaluationStoreController.java index 3c320774..b0b6a2c3 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/member/MemberEvaluationStoreController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.member; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java b/seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java similarity index 99% rename from seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java rename to seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java index 0acdff5b..84982de2 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java b/seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java similarity index 99% rename from seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java rename to seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java index 2be516ae..6c86d87c 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.AuthUser; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java b/seller-api/src/main/java/cn/lili/controller/order/OrderLogStoreController.java similarity index 97% rename from seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java rename to seller-api/src/main/java/cn/lili/controller/order/OrderLogStoreController.java index eb10a898..35407c52 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/order/OrderLogStoreController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java similarity index 98% rename from seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java rename to seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java index fe6cfec6..69f72897 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.context.ThreadContextHolder; import cn.lili.common.enums.ResultCode; @@ -12,7 +12,7 @@ import cn.lili.modules.order.order.entity.vo.OrderDetailVO; import cn.lili.modules.order.order.entity.vo.OrderSimpleVO; import cn.lili.modules.order.order.service.OrderPriceService; import cn.lili.modules.order.order.service.OrderService; -import cn.lili.modules.system.service.StoreLogisticsService; +import cn.lili.modules.member.service.StoreLogisticsService; import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java b/seller-api/src/main/java/cn/lili/controller/order/ReceiptStoreController.java similarity index 98% rename from seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java rename to seller-api/src/main/java/cn/lili/controller/order/ReceiptStoreController.java index 25af43dc..4bb02c3c 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/order/ReceiptStoreController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.trade; +package cn.lili.controller.order; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; diff --git a/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java index 188db0ce..bfb96840 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java @@ -6,7 +6,7 @@ import cn.lili.common.security.context.UserContext; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.store.entity.dos.StoreLogistics; import cn.lili.modules.system.entity.vo.StoreLogisticsVO; -import cn.lili.modules.system.service.StoreLogisticsService; +import cn.lili.modules.member.service.StoreLogisticsService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam;