From e9878fcaa1ff65b44694a1326d94f18dda1ff6e9 Mon Sep 17 00:00:00 2001 From: liubozhi Date: Mon, 21 Apr 2025 17:04:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/systemtest/api/amount/AddrApi.java | 8 ++-- .../cloud/systemtest/api/amount/PayApi.java | 4 +- .../systemtest/api/amount/ProductApi.java | 4 +- .../cloud/systemtest/api/login/UserApi.java | 2 +- .../systemtest/api/marketing/CouponApi.java | 12 ++--- .../systemtest/api/marketing/DiscountApi.java | 6 +-- .../api/marketing/DistributionProdApi.java | 18 ++++---- .../systemtest/api/marketing/GroupApi.java | 36 +++++++-------- .../systemtest/api/marketing/SeckillApi.java | 16 +++---- .../systemtest/api/order/MyOrderApi.java | 2 +- .../cloud/systemtest/api/order/OrderApi.java | 6 +-- .../api/order/ShopOrderRefundApi.java | 2 +- .../systemtest/api/order/StationApi.java | 10 ++-- .../api/platform/PlatformProductApi.java | 2 +- .../api/platform/ScoreOrderApi.java | 4 +- .../systemtest/api/platform/UserLevelApi.java | 4 +- .../api/platform/UserRightsApi.java | 4 +- .../systemtest/api/store/SameCityApi.java | 4 +- .../api/store/ShopRefundAddrApi.java | 4 +- .../api/supplier/SupplierOrderApi.java | 2 +- .../api/supplier/SupplierProductApi.java | 4 +- .../admin/CompanyAuditingController.java | 2 +- .../controller/admin/HotSearchController.java | 2 +- .../controller/admin/IndexImgController.java | 2 +- .../admin/ShopCompanyController.java | 11 ++--- .../admin/ShopDetailController.java | 4 +- .../ShopOfflineHandleEventController.java | 10 ++-- .../admin/ShopRechargeController.java | 2 +- .../admin/ShopRefundAddrController.java | 2 +- .../admin/ShopRenovationController.java | 10 ++-- .../admin/ShopRenovationUpDelController.java | 14 +++--- .../admin/ShopTemplateController.java | 14 +++--- .../admin/ShopTemplateUpDelController.java | 4 +- .../admin/ShopWalletController.java | 12 ++--- .../admin/ShopWithdrawCashController.java | 2 +- .../controller/app/HotSearchController.java | 2 +- .../controller/app/IndexImgController.java | 2 +- .../app/ShopCollectionController.java | 10 ++-- .../controller/app/ShopDetailController.java | 12 ++--- .../app/ShopRenovationController.java | 10 ++-- .../multishop/ApplyShopUserController.java | 2 +- .../multishop/CompanyAuditingController.java | 4 +- .../multishop/ShopApplyController.java | 4 +- .../multishop/ShopBankCardController.java | 14 +++--- .../multishop/ShopCompanyController.java | 4 +- .../multishop/ShopDetailController.java | 4 +- .../multishop/ShopRechargeController.java | 4 +- .../ShopSubstituteSalesController.java | 2 +- .../multishop/ShopUserController.java | 2 +- .../multishop/ShopUserRegisterController.java | 2 +- .../multishop/ShopWithdrawCashController.java | 4 +- .../platform/CompanyAuditingController.java | 2 +- .../platform/ShopAuditingController.java | 2 +- .../platform/ShopBankCardController.java | 6 +-- .../platform/ShopDetailController.java | 4 +- .../supplier/ApplyShopUserController.java | 2 +- .../admin/SupplierCompanyController.java | 8 ++-- .../platform/SupplierDetailController.java | 2 +- .../supplier/CompanyAuditingController.java | 2 +- .../supplier/SupplierBankCardController.java | 6 +-- .../supplier/SupplierCompanyController.java | 2 +- .../supplier/SupplierDetailController.java | 2 +- .../SupplierWithdrawCashController.java | 2 +- .../auth/controller/LoginController.java | 4 +- .../auth/controller/PasswordController.java | 4 +- .../controller/StationLoginController.java | 2 +- .../auth/controller/WxMnpController.java | 4 +- .../controller/admin/PasswordController.java | 6 +-- .../cloud/biz/controller/OssController.java | 2 +- .../controller/QrcodeTicketController.java | 6 +-- .../admin/AttachFileController.java | 4 +- .../admin/AttachFileGroupController.java | 2 +- .../controller/admin/NotifyLogController.java | 8 ++-- .../admin/NotifyTemplateRemindController.java | 2 +- .../controller/app/AttachFileController.java | 4 +- .../controller/app/NotifyLogController.java | 6 +-- .../app/NotifyTemplateRemindController.java | 2 +- .../multishop/AttachFileController.java | 10 ++-- .../controller/multishop/SmsController.java | 12 ++--- .../platform/AttachFileController.java | 6 +-- .../platform/NotifyLogController.java | 2 +- .../platform/NotifyTemplateController.java | 2 +- .../platform/NotifyTemplateTagController.java | 2 +- .../supplier/AttachFileController.java | 10 ++-- .../controller/supplier/SmsController.java | 14 +++--- .../security/adapter/AuthConfigAdapter.java | 2 +- .../admin/CustomerAnalysisController.java | 14 +++--- .../admin/ProductAnalyseController.java | 4 +- .../controller/multishop/FormController.java | 6 +-- .../multishop/ProductAnalyseController.java | 4 +- .../platform/FlowAnalysisController.java | 14 +++--- .../controller/platform/FormController.java | 8 ++-- .../platform/ProductAnalyseController.java | 10 ++-- .../platform/UserVisitAnalysisController.java | 6 +-- .../supplier/ProductAnalyseController.java | 8 ++-- .../admin/GroupActivityController.java | 8 ++-- .../app/GroupActivityController.java | 4 +- .../controller/app/GroupOrderController.java | 2 +- .../controller/app/GroupTeamController.java | 4 +- .../multishop/ImMsgBizSkillsController.java | 2 +- .../platform/ImMsgBizSkillsController.java | 2 +- .../controller/app/ComboSpuController.java | 2 +- .../controller/app/ComboSpuSkuController.java | 2 +- .../controller/multishop/ComboController.java | 2 +- .../controller/admin/CouponController.java | 14 +++--- .../controller/app/CouponController.java | 12 ++--- .../controller/app/MyCouponController.java | 8 ++-- .../controller/platform/CouponController.java | 2 +- .../controller/admin/DiscountController.java | 6 +-- .../controller/app/DiscountController.java | 2 +- .../controller/app/SpuDiscountController.java | 2 +- .../DistributionUserIncomeController.java | 6 +-- .../app/DistributionConfigController.java | 2 +- .../app/DistributionMsgController.java | 2 +- .../app/DistributionQrCodeController.java | 2 +- .../DistributionRecruitConfigController.java | 2 +- .../app/DistributionRegisterController.java | 6 +-- .../app/DistributionSpuController.java | 2 +- .../app/DistributionUserBindController.java | 6 +-- .../app/DistributionUserController.java | 6 +-- .../app/DistributionUserIncomeController.java | 4 +- .../app/DistributionUserWalletController.java | 2 +- .../DistributionWithdrawCashController.java | 4 +- .../multishop/DistributionSpuController.java | 8 ++-- .../DistributionAuditingController.java | 2 +- .../platform/DistributionMsgController.java | 2 +- .../platform/DistributionSpuController.java | 4 +- .../DistributionUserBanController.java | 2 +- .../DistributionUserBindController.java | 2 +- .../platform/DistributionUserController.java | 8 ++-- .../DistributionUserIncomeController.java | 4 +- .../DistributionUserWalletBillController.java | 4 +- .../DistributionUserWalletController.java | 4 +- .../DistributionWithdrawCashController.java | 4 +- .../controller/admin/AreaController.java | 10 ++-- .../admin/DeliveryCompanyController.java | 2 +- .../admin/OrderDeliveryController.java | 2 +- .../admin/OutletConfigController.java | 8 ++-- .../controller/admin/PrinterController.java | 8 ++-- .../controller/app/AreaController.java | 4 +- .../app/DeliveryCompanyController.java | 2 +- .../controller/app/MyDeliveryController.java | 6 +-- .../controller/app/StationController.java | 16 +++---- .../app/TranscityFreeController.java | 2 +- .../app/TransfeeFreeController.java | 2 +- .../multishop/SameCityController.java | 4 +- .../multishop/StationController.java | 14 +++--- .../platform/DeliveryCompanyController.java | 2 +- .../platform/StationController.java | 4 +- .../supplier/OrderDeliveryController.java | 2 +- .../supplier/OutletConfigController.java | 8 ++-- .../supplier/PrinterController.java | 6 +-- .../controller/admin/OrderController.java | 2 +- .../controller/app/MyOrderController.java | 2 +- .../app/MyStationOrderController.java | 2 +- .../controller/app/OrderRefundController.java | 2 +- .../multishop/AllotOrderController.java | 2 +- .../multishop/OrderVirtualInfoController.java | 4 +- .../controller/platform/OrderController.java | 2 +- .../supplier/AllotOrderController.java | 2 +- .../controller/supplier/OrderController.java | 2 +- .../supplier/PurchaseOrderController.java | 2 +- .../app/AllinpayMemberController.java | 46 +++++++++---------- .../app/AllinpayOrderController.java | 14 +++--- .../multishop/AllinpayCompanyController.java | 34 +++++++------- .../multishop/AllinpayOrderController.java | 14 +++--- .../multishop/RechargePayController.java | 2 +- .../platform/AccountDetailController.java | 18 ++++---- .../platform/AllinpayMemberController.java | 4 +- .../supplier/AllinpayCompanyController.java | 28 +++++------ .../controller/user/PayController.java | 4 +- .../controller/admin/CategoryController.java | 2 +- .../controller/admin/SpuController.java | 10 ++-- .../app/SpuCollectionController.java | 6 +-- .../controller/multishop/SkuController.java | 2 +- .../multishop/StockBillLogItemController.java | 2 +- .../multishop/TakeStockSpuController.java | 2 +- .../platform/CategoryController.java | 2 +- .../controller/platform/SpuController.java | 2 +- .../controller/supplier/SpuController.java | 10 ++-- .../supplier/StockBillLogItemController.java | 2 +- .../admin/OrderRefundSearchController.java | 2 +- .../admin/OrderSearchController.java | 2 +- .../admin/ProductSearchController.java | 16 +++---- .../app/ProductSearchController.java | 8 ++-- .../multishop/AllotOrderSearchController.java | 2 +- .../OrderInvoiceSearchController.java | 2 +- .../PurchaseOrderSearchController.java | 2 +- .../platform/OrderSearchController.java | 6 +-- .../platform/ProductSearchController.java | 6 +-- .../supplier/AllotOrderSearchController.java | 2 +- .../OrderInvoiceSearchController.java | 2 +- .../supplier/OrderSearchController.java | 2 +- .../supplier/ProductSearchController.java | 4 +- .../PurchaseOrderSearchController.java | 2 +- .../admin/SeckillCategoryController.java | 4 +- .../controller/admin/SeckillController.java | 18 ++++---- .../app/SeckillCategoryController.java | 2 +- .../controller/app/SeckillController.java | 4 +- .../app/SeckillOrderController.java | 4 +- .../platform/SeckillTimeController.java | 2 +- .../app/CostPerPopupController.java | 2 +- .../controller/app/UserAddrController.java | 2 +- .../app/UserBalanceLogController.java | 2 +- .../app/UserBalancePayController.java | 4 +- .../user/controller/app/UserController.java | 14 +++--- .../app/UserExtensionController.java | 4 +- .../app/UserGrowthLogController.java | 2 +- .../controller/app/UserLevelController.java | 20 ++++---- .../app/UserRechargeController.java | 2 +- .../app/UserRechargeCouponController.java | 2 +- .../controller/app/UserScoreController.java | 8 ++-- .../app/UserScoreLogController.java | 4 +- .../app/UserWithdrawCashController.java | 10 ++-- .../multishop/CostPerPopupController.java | 2 +- .../controller/multishop/UserController.java | 14 +++--- .../platform/CostPerPopupController.java | 2 +- .../controller/platform/UserController.java | 16 +++---- .../platform/UserGrowthLogController.java | 2 +- .../platform/UserLevelController.java | 12 ++--- .../platform/UserLevelLogController.java | 4 +- .../platform/UserRechargeController.java | 6 +-- .../platform/UserRightsController.java | 2 +- .../platform/UserScoreLogController.java | 2 +- .../platform/UserTagController.java | 8 ++-- .../platform/UserTagUserController.java | 6 +-- 226 files changed, 645 insertions(+), 646 deletions(-) diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/AddrApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/AddrApi.java index b4f6dd9..83cbd64 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/AddrApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/AddrApi.java @@ -14,22 +14,22 @@ import java.util.List; */ public class AddrApi { public static void addAddr(UserAddrDTO userAddrDTO){ - String url = Constant.API_URL + "/tmerclub_user/user_addr"; + String url = Constant.API_URL + "/tmerclub_user/userAddr"; HttpUtil.post(url, userAddrDTO, UrlEnum.API); } public static List dvyList(){ - String url = Constant.API_URL + "/tmerclub_user/user_addr/list"; + String url = Constant.API_URL + "/tmerclub_user/userAddr/list"; List list = HttpUtil.get(url, List.class, UrlEnum.API); return JSON.parseArray(JSON.toJSONString(list), UserAddrVO.class); } // public static UserAddrVO addrInfo(Long addrId) { -// String url = Constant.API_URL + "/tmerclub_user/user_addr?addrId=" + addrId; +// String url = Constant.API_URL + "/tmerclub_user/userAddr?addrId=" + addrId; // return HttpUtil.get(url, UserAddrVO.class, UrlEnum.API); // } public static void updateAddr(UserAddrDTO userAddrDTO){ - String url = Constant.API_URL + "/tmerclub_user/user_addr"; + String url = Constant.API_URL + "/tmerclub_user/userAddr"; HttpUtil.put(url, userAddrDTO, UrlEnum.API); } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/PayApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/PayApi.java index 1b2e608..5a3c95d 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/PayApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/PayApi.java @@ -20,7 +20,7 @@ public class PayApi { } public static void balancePay(Long payId){ - String uri = Constant.API_URL+"/tmerclub_user/user_balance/balance_pay"; + String uri = Constant.API_URL+"/tmerclub_user/userBalance/balancePay"; HttpUtil.post(uri,payId, UrlEnum.API); } @@ -33,7 +33,7 @@ public class PayApi { } public static Long payBalance(PayInfoDTO payParam){ - String uri = Constant.API_URL+"/tmerclub_payment/pay/pay_balance"; + String uri = Constant.API_URL+"/tmerclub_payment/pay/payBalance"; Long payId = HttpUtil.post(uri,payParam, UrlEnum.API,Long.class); return payId; } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/ProductApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/ProductApi.java index f067273..6edc0a7 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/ProductApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/ProductApi.java @@ -104,7 +104,7 @@ public class ProductApi { * 商家获取最新下架信息 */ public static OfflineHandleEventVO shopGetOfflineHandleEvent(Long productId) { - String url = Constant.API_URL + "/tmerclub_product/mp/spu/get_offline_handle_event/" + productId; + String url = Constant.API_URL + "/tmerclub_product/mp/spu/getOfflineHandleEvent/" + productId; return HttpUtil.get(url, OfflineHandleEventVO.class, UrlEnum.SHOP); } @@ -112,7 +112,7 @@ public class ProductApi { * 商家申请上架，提交审核 */ public static void apply(OfflineHandleEventDTO offlineHandleEventDTO) { - String url = Constant.API_URL + "/tmerclub_product/mp/spu/audit_apply"; + String url = Constant.API_URL + "/tmerclub_product/mp/spu/auditApply"; HttpUtil.post(url, offlineHandleEventDTO, UrlEnum.SHOP); } } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/login/UserApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/login/UserApi.java index 1c19cd5..c536c0e 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/login/UserApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/login/UserApi.java @@ -13,7 +13,7 @@ public class UserApi { * 获取用户信息 */ public static UserApiVO getUserInfo() { - String url = Constant.API_URL + "/tmerclub_user/user/ma/user_detail_info"; + String url = Constant.API_URL + "/tmerclub_user/user/ma/getUserDetailInfo"; return HttpUtil.get(url, UserApiVO.class, UrlEnum.API); } } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/CouponApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/CouponApi.java index 987146c..456ba4e 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/CouponApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/CouponApi.java @@ -70,7 +70,7 @@ public class CouponApi { * 商家获取最新下架信息 */ public static OfflineHandleEventVO shopGetOfflineHandleEvent(Long couponId) { - String url = Constant.API_URL + "/tmerclub_marketing/mp/coupon/get_offline_handle_event/" + couponId; + String url = Constant.API_URL + "/tmerclub_marketing/mp/coupon/getOfflineHandleEvent/" + couponId; return HttpUtil.get(url, OfflineHandleEventVO.class, UrlEnum.SHOP); } @@ -78,7 +78,7 @@ public class CouponApi { * 商家申请上架，提交审核 */ public static void apply(OfflineHandleEventDTO offlineHandleEventDTO) { - String url = Constant.API_URL + "/tmerclub_marketing/mp/coupon/audit_apply"; + String url = Constant.API_URL + "/tmerclub_marketing/mp/coupon/auditApply"; HttpUtil.post(url, offlineHandleEventDTO, UrlEnum.SHOP); } @@ -86,7 +86,7 @@ public class CouponApi { * 平台获取最新下架信息 */ public static OfflineHandleEventVO platformGetOfflineHandleEvent(Long couponId) { - String url = Constant.API_URL + "/tmerclub_marketing/mp/coupon/get_offline_handle_event/" + couponId; + String url = Constant.API_URL + "/tmerclub_marketing/mp/coupon/getOfflineHandleEvent/" + couponId; return HttpUtil.get(url, OfflineHandleEventVO.class, UrlEnum.PLATFORM); } @@ -142,7 +142,7 @@ public class CouponApi { * 用户领取优惠券 */ public static void receive(Long couponId) { - String url = Constant.API_URL + "/tmerclub_marketing/my_coupon/receive"; + String url = Constant.API_URL + "/tmerclub_marketing/myCoupon/receive"; HttpUtil.post(url, couponId, UrlEnum.API); } @@ -150,7 +150,7 @@ public class CouponApi { * 用户获取优惠券列表 */ public static List getUserCouponPage() { - String url = Constant.API_URL + "/tmerclub_marketing/my_coupon/get_page?pageSize=10&pageNum=1&status=1&type=0"; + String url = Constant.API_URL + "/tmerclub_marketing/myCoupon/get_page?pageSize=10&pageNum=1&status=1&type=0"; return JSON.parseArray(JSON.toJSONString(Json.parseObject(JSON.toJSONString(HttpUtil.get(url, PageVO.class, UrlEnum.API)), PageVO.class).getList()), CouponAppVO.class); } @@ -158,7 +158,7 @@ public class CouponApi { * 用户删除优惠券 */ public static void deleteUserCoupon(Long couponUserId) { - String url = Constant.API_URL + "/tmerclub_marketing/my_coupon/delete_coupon/" + couponUserId; + String url = Constant.API_URL + "/tmerclub_marketing/myCoupon/delete_coupon/" + couponUserId; HttpUtil.delete(url, UrlEnum.API); } } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/DiscountApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/DiscountApi.java index b4d9ad3..8f2d904 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/DiscountApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/DiscountApi.java @@ -81,7 +81,7 @@ public class DiscountApi { * 商家获取最新下架信息 */ public static OfflineHandleEventVO shopGetOfflineHandleEvent(Long discountId) { - String url = Constant.API_URL + "/tmerclub_marketing/mp/discount/get_offline_handle_event/" + discountId; + String url = Constant.API_URL + "/tmerclub_marketing/mp/discount/getOfflineHandleEvent/" + discountId; return HttpUtil.get(url, OfflineHandleEventVO.class, UrlEnum.SHOP); } @@ -89,7 +89,7 @@ public class DiscountApi { * 商家申请上架，提交审核 */ public static void applyDiscount(OfflineHandleEventDTO offlineHandleEventDTO) { - String url = Constant.API_URL + "/tmerclub_marketing/mp/discount/audit_apply"; + String url = Constant.API_URL + "/tmerclub_marketing/mp/discount/auditApply"; HttpUtil.post(url, offlineHandleEventDTO, UrlEnum.SHOP); } @@ -97,7 +97,7 @@ public class DiscountApi { * 平台获取最新下架信息 */ public static OfflineHandleEventVO platformGetOfflineHandleEvent(Long discountId) { - String url = Constant.API_URL + "/tmerclub_marketing/mp/discount/get_offline_handle_event/" + discountId; + String url = Constant.API_URL + "/tmerclub_marketing/mp/discount/getOfflineHandleEvent/" + discountId; return HttpUtil.get(url, OfflineHandleEventVO.class, UrlEnum.PLATFORM); } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/DistributionProdApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/DistributionProdApi.java index 40406d2..cc69727 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/DistributionProdApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/DistributionProdApi.java @@ -21,7 +21,7 @@ public class DistributionProdApi { * 获取分销商品列表 */ public static List getDistributionProdPage(Boolean isMainShop) { - String url = Constant.API_URL + "/tmerclub_search/mp/search/page_distribution_spu?pageSize=10&pageNum=1&distributionSpu=true&spuName=&distributionState="; + String url = Constant.API_URL + "/tmerclub_search/mp/search/pageDistributionSpu?pageSize=10&pageNum=1&distributionSpu=true&spuName=&distributionState="; if(isMainShop) { return JSON.parseArray(JSON.toJSONString(Json.parseObject(JSON.toJSONString(HttpUtil.get(url, EsPageVO.class, UrlEnum.SHOP)), EsPageVO.class).getList()), SpuAdminVO.class); } else { @@ -33,7 +33,7 @@ public class DistributionProdApi { * 新增分销商品 */ public static void save(DistributionSpuDTO distributionSpuDTO, Boolean isMainShop) { - String url = Constant.API_URL + "/tmerclub_marketing/m/distribution_spu"; + String url = Constant.API_URL + "/tmerclub_marketing/m/distributionSpu"; if(isMainShop) { HttpUtil.post(url, distributionSpuDTO, UrlEnum.SHOP); } else { @@ -45,7 +45,7 @@ public class DistributionProdApi { * 修改分销商品 */ public static void update(DistributionSpuDTO distributionSpuDTO) { - String url = Constant.API_URL + "/tmerclub_marketing/m/distribution_spu"; + String url = Constant.API_URL + "/tmerclub_marketing/m/distributionSpu"; HttpUtil.put(url, distributionSpuDTO, UrlEnum.SHOP); } @@ -53,7 +53,7 @@ public class DistributionProdApi { * 删除分销商品 */ public static void delete(Long distributionSpuId, Boolean isMainShop) { - String url = Constant.API_URL + "/tmerclub_marketing/m/distribution_spu?distributionSpuId=" + distributionSpuId; + String url = Constant.API_URL + "/tmerclub_marketing/m/distributionSpu?distributionSpuId=" + distributionSpuId; if(isMainShop) { HttpUtil.delete(url, UrlEnum.SHOP); } else { @@ -65,7 +65,7 @@ public class DistributionProdApi { * 平台违规下架活动 */ public static void offline(OfflineHandleEventDTO offlineHandleEventDTO) { - String url = Constant.API_URL + "/tmerclub_marketing/p/distribution_spu/offline"; + String url = Constant.API_URL + "/tmerclub_marketing/p/distributionSpu/offline"; HttpUtil.post(url, offlineHandleEventDTO, UrlEnum.PLATFORM); } @@ -73,7 +73,7 @@ public class DistributionProdApi { * 商家获取最新下架信息 */ public static OfflineHandleEventVO shopGetOfflineHandleEvent(Long distributionSpuId) { - String url = Constant.API_URL + "/tmerclub_marketing/m/distribution_spu/get_offline_handle_event?distributionSpuId=" + distributionSpuId; + String url = Constant.API_URL + "/tmerclub_marketing/m/distributionSpu/getOfflineHandleEvent?distributionSpuId=" + distributionSpuId; return HttpUtil.get(url, OfflineHandleEventVO.class, UrlEnum.SHOP); } @@ -81,7 +81,7 @@ public class DistributionProdApi { * 商家申请上架，提交审核 */ public static void apply(OfflineHandleEventDTO offlineHandleEventDTO) { - String url = Constant.API_URL + "/tmerclub_marketing/m/distribution_spu/audit_apply"; + String url = Constant.API_URL + "/tmerclub_marketing/m/distributionSpu/auditApply"; HttpUtil.post(url, offlineHandleEventDTO, UrlEnum.SHOP); } @@ -89,7 +89,7 @@ public class DistributionProdApi { * 平台获取最新下架信息 */ public static OfflineHandleEventVO platformGetOfflineHandleEvent(Long distributionSpuId) { - String url = Constant.API_URL + "/tmerclub_marketing/p/distribution_spu/get_offline_handle_event?distributionSpuId=" + distributionSpuId; + String url = Constant.API_URL + "/tmerclub_marketing/p/distributionSpu/getOfflineHandleEvent?distributionSpuId=" + distributionSpuId; return HttpUtil.get(url, OfflineHandleEventVO.class, UrlEnum.PLATFORM); } @@ -97,7 +97,7 @@ public class DistributionProdApi { * 平台审核平台活动 */ public static void audit(OfflineHandleEventDTO offlineHandleEventDTO) { - String url = Constant.API_URL + "/tmerclub_marketing/p/distribution_spu/audit"; + String url = Constant.API_URL + "/tmerclub_marketing/p/distributionSpu/audit"; HttpUtil.post(url, offlineHandleEventDTO, UrlEnum.PLATFORM); } } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/GroupApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/GroupApi.java index d158f65..48fdd07 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/GroupApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/GroupApi.java @@ -27,7 +27,7 @@ public class GroupApi { * 新增拼团活动 */ public static void save(GroupActivityDTO groupActivityDTO) { - String url = Constant.API_URL + "/tmerclub_group/mp/group_activity"; + String url = Constant.API_URL + "/tmerclub_group/mp/groupActivity"; HttpUtil.post(url, groupActivityDTO, UrlEnum.SHOP ); } @@ -35,7 +35,7 @@ public class GroupApi { * 商家获取拼团活动列表 */ public static List getGroupActivityPage() { - String url = Constant.API_URL + "/tmerclub_group/mp/group_activity/page?pageSize=10&pageNum=1&activityName=&spuName=&status="; + String url = Constant.API_URL + "/tmerclub_group/mp/groupActivity/page?pageSize=10&pageNum=1&activityName=&spuName=&status="; return JSON.parseArray(JSON.toJSONString(Json.parseObject(JSON.toJSONString(HttpUtil.get(url, PageVO.class, UrlEnum.SHOP)), PageVO.class).getList()), GroupActivityVO.class); } @@ -43,7 +43,7 @@ public class GroupApi { *通过id获取拼团活动 */ public static GroupActivityVO getGroupActivity(Long groupActivityId) { - String url = Constant.API_URL + "/tmerclub_group/mp/group_activity?groupActivityId=" + groupActivityId; + String url = Constant.API_URL + "/tmerclub_group/mp/groupActivity?groupActivityId=" + groupActivityId; return HttpUtil.get(url, GroupActivityVO.class, UrlEnum.SHOP); } @@ -51,7 +51,7 @@ public class GroupApi { * 修改拼团活动 */ public static void updateGroupActivity(GroupActivityDTO groupActivityDTO) { - String url = Constant.API_URL + "/tmerclub_group/mp/group_activity"; + String url = Constant.API_URL + "/tmerclub_group/mp/groupActivity"; HttpUtil.put(url, groupActivityDTO, UrlEnum.SHOP); } @@ -59,7 +59,7 @@ public class GroupApi { * 启用拼团活动 */ public static void activeGroupActivity(GroupActivityDTO groupActivityDTO) { - String url = Constant.API_URL + "/tmerclub_group/mp/group_activity/active"; + String url = Constant.API_URL + "/tmerclub_group/mp/groupActivity/active"; HttpUtil.put(url, groupActivityDTO, UrlEnum.SHOP); } @@ -67,7 +67,7 @@ public class GroupApi { * 失效拼团活动 */ public static void invalidActivity(GroupActivityDTO groupActivityDTO) { - String url = Constant.API_URL + "/tmerclub_group/mp/group_activity/invalid"; + String url = Constant.API_URL + "/tmerclub_group/mp/groupActivity/invalid"; HttpUtil.put(url, groupActivityDTO, UrlEnum.SHOP); } @@ -75,7 +75,7 @@ public class GroupApi { * 删除拼团活动 */ public static void deleteGroupActivity(Long groupActivityId) { - String url = Constant.API_URL + "/tmerclub_group/mp/group_activity?groupActivityId=" + groupActivityId; + String url = Constant.API_URL + "/tmerclub_group/mp/groupActivity?groupActivityId=" + groupActivityId; HttpUtil.delete(url, UrlEnum.SHOP); } @@ -83,7 +83,7 @@ public class GroupApi { * 平台违规下架平台活动 */ public static void offline(OfflineHandleEventDTO offlineHandleEventDTO) { - String url = Constant.API_URL + "/tmerclub_group/mp/group_activity/offline"; + String url = Constant.API_URL + "/tmerclub_group/mp/groupActivity/offline"; HttpUtil.post(url, offlineHandleEventDTO, UrlEnum.PLATFORM); } @@ -91,7 +91,7 @@ public class GroupApi { * 商家获取最新下架信息 */ public static OfflineHandleEventVO shopGetOfflineHandleEvent(Long groupActivityId) { - String url = Constant.API_URL + "/tmerclub_group/mp/group_activity/get_offline_handle_event/" + groupActivityId; + String url = Constant.API_URL + "/tmerclub_group/mp/groupActivity/getOfflineHandleEvent/" + groupActivityId; return HttpUtil.get(url, OfflineHandleEventVO.class, UrlEnum.SHOP); } @@ -99,7 +99,7 @@ public class GroupApi { * 商家申请上架，提交审核 */ public static void applyGroupActivity(OfflineHandleEventDTO offlineHandleEventDTO) { - String url = Constant.API_URL + "/tmerclub_group/mp/group_activity/audit_apply"; + String url = Constant.API_URL + "/tmerclub_group/mp/groupActivity/auditApply"; HttpUtil.post(url, offlineHandleEventDTO, UrlEnum.SHOP); } @@ -107,7 +107,7 @@ public class GroupApi { * 平台获取最新下架信息 */ public static OfflineHandleEventVO platformGetOfflineHandleEvent(Long groupActivityId) { - String url = Constant.API_URL + "/tmerclub_group/mp/group_activity/get_offline_handle_event/" + groupActivityId; + String url = Constant.API_URL + "/tmerclub_group/mp/groupActivity/getOfflineHandleEvent/" + groupActivityId; return HttpUtil.get(url, OfflineHandleEventVO.class, UrlEnum.PLATFORM); } @@ -115,7 +115,7 @@ public class GroupApi { * 平台审核平台活动 */ public static void auditGroupActivity(OfflineHandleEventDTO offlineHandleEventDTO) { - String url = Constant.API_URL + "/tmerclub_group/mp/group_activity/audit"; + String url = Constant.API_URL + "/tmerclub_group/mp/groupActivity/audit"; HttpUtil.post(url, offlineHandleEventDTO, UrlEnum.PLATFORM); } @@ -123,7 +123,7 @@ public class GroupApi { * 用户获取团购商品信息 */ public static AppGroupActivityVO getGroupActivityInfo(Long productId) { - String url = Constant.API_URL + "/tmerclub_group/ua/group_activity/info?spuId=" + productId; + String url = Constant.API_URL + "/tmerclub_group/ua/groupActivity/info?spuId=" + productId; return HttpUtil.get(url, AppGroupActivityVO.class, UrlEnum.API); } @@ -131,7 +131,7 @@ public class GroupApi { * 用户开团 */ public static void openGroup(GroupOrderDTO groupOrderDTO) { - String url = Constant.API_URL + "/tmerclub_group/group_order/confirm"; + String url = Constant.API_URL + "/tmerclub_group/groupOrder/confirm"; HttpUtil.post(url, groupOrderDTO, UrlEnum.API); } @@ -139,7 +139,7 @@ public class GroupApi { * 开团用户提交拼团订单 */ public static List submitGroupOrder(SubmitGroupOrderDTO submitGroupOrderDTO) { - String url = Constant.API_URL + "/tmerclub_group/group_order/submit"; + String url = Constant.API_URL + "/tmerclub_group/groupOrder/submit"; return HttpUtil.post(url, submitGroupOrderDTO, UrlEnum.API, List.class); } @@ -147,7 +147,7 @@ public class GroupApi { * 用户获取可参团列表 */ public static List getJoinGroupList(Long groupActivityId) { - String url = Constant.API_URL + "/tmerclub_group/ua/group_activity/join_group_list?groupActivityId=" + groupActivityId; + String url = Constant.API_URL + "/tmerclub_group/ua/groupActivity/joinGroupList?groupActivityId=" + groupActivityId; return HttpUtil.get(url, List.class, UrlEnum.API_OTHER); } @@ -155,7 +155,7 @@ public class GroupApi { * 用户立即参团 */ public static void joinGroup(GroupOrderDTO groupOrderDTO) { - String url = Constant.API_URL + "/tmerclub_group/group_order/confirm"; + String url = Constant.API_URL + "/tmerclub_group/groupOrder/confirm"; HttpUtil.post(url, groupOrderDTO, UrlEnum.API_OTHER); } @@ -163,7 +163,7 @@ public class GroupApi { * 参团用户提交拼团订单 */ public static List submitJoinGroupOrder(SubmitGroupOrderDTO submitGroupOrderDTO) { - String url = Constant.API_URL + "/tmerclub_group/group_order/submit"; + String url = Constant.API_URL + "/tmerclub_group/groupOrder/submit"; return HttpUtil.post(url, submitGroupOrderDTO, UrlEnum.API_OTHER, List.class); } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/SeckillApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/SeckillApi.java index d722611..e096c53 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/SeckillApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/SeckillApi.java @@ -24,7 +24,7 @@ public class SeckillApi { * 平台新建秒杀分类 */ public static void saveSeckillCategory(SeckillCategoryDTO seckillCategoryDTO) { - String url = Constant.API_URL + "/tmerclub_seckill/mp/seckill_category"; + String url = Constant.API_URL + "/tmerclub_seckill/mp/seckillCategory"; HttpUtil.post(url, seckillCategoryDTO, UrlEnum.PLATFORM); } @@ -32,7 +32,7 @@ public class SeckillApi { * 获取秒杀分类列表 */ public static List getSeckillCategoryList() { - String url = Constant.API_URL + "/tmerclub_seckill/mp/seckill_category/list"; + String url = Constant.API_URL + "/tmerclub_seckill/mp/seckillCategory/list"; return HttpUtil.get(url, List.class, UrlEnum.PLATFORM); } @@ -40,7 +40,7 @@ public class SeckillApi { * 删除秒杀分类 */ public static void deleteSeckillCategory(Long categoryId) { - String url = Constant.API_URL + "/tmerclub_seckill/mp/seckill_category?categoryId=" + categoryId; + String url = Constant.API_URL + "/tmerclub_seckill/mp/seckillCategory?categoryId=" + categoryId; HttpUtil.delete(url, UrlEnum.PLATFORM); } @@ -48,7 +48,7 @@ public class SeckillApi { * 获取可参加的秒杀列表 */ public static List getSeckillList() { - String url = Constant.API_URL + "/tmerclub_seckill/mp/seckill/list_seckill?pageSize=10&pageNum=1&name=&type=0"; + String url = Constant.API_URL + "/tmerclub_seckill/mp/seckill/seckillList?pageSize=10&pageNum=1&name=&type=0"; return JSON.parseArray(JSON.toJSONString(Json.parseObject(JSON.toJSONString(HttpUtil.get(url, PageVO.class, UrlEnum.SHOP)), PageVO.class).getList()), SeckillAdminVO.class); } @@ -64,7 +64,7 @@ public class SeckillApi { * 根据时间获取秒杀活动列表 */ public static List getSeckillSpuList(Long startTimestamps) { - String url = Constant.API_URL + "/tmerclub_seckill/mp/seckill/list_seckill_spu_by_time?pageSize=10&pageNum=1&name=&startTimestamp=" + startTimestamps; + String url = Constant.API_URL + "/tmerclub_seckill/mp/seckill/seckillSpuByTimeList?pageSize=10&pageNum=1&name=&startTimestamp=" + startTimestamps; return JSON.parseArray(JSON.toJSONString(Json.parseObject(JSON.toJSONString(HttpUtil.get(url, PageVO.class, UrlEnum.SHOP)), PageVO.class).getList()), SeckillSpuVO.class); } @@ -88,7 +88,7 @@ public class SeckillApi { * 商家获取最新下架信息 */ public static OfflineHandleEventVO shopGetOfflineHandleEvent(Long seckillId) { - String url = Constant.API_URL + "/tmerclub_seckill/mp/seckill/get_offline_handle_event/" + seckillId; + String url = Constant.API_URL + "/tmerclub_seckill/mp/seckill/getOfflineHandleEvent/" + seckillId; return HttpUtil.get(url, OfflineHandleEventVO.class, UrlEnum.SHOP); } @@ -96,7 +96,7 @@ public class SeckillApi { * 商家申请上架，提交审核 */ public static void apply(OfflineHandleEventDTO offlineHandleEventDTO) { - String url = Constant.API_URL + "/tmerclub_seckill/mp/seckill/audit_apply"; + String url = Constant.API_URL + "/tmerclub_seckill/mp/seckill/auditApply"; HttpUtil.post(url, offlineHandleEventDTO, UrlEnum.SHOP); } @@ -104,7 +104,7 @@ public class SeckillApi { * 平台获取最新下架信息 */ public static OfflineHandleEventVO platformGetOfflineHandleEvent(Long seckillId) { - String url = Constant.API_URL + "/tmerclub_seckill/mp/seckill/get_offline_handle_event/" + seckillId; + String url = Constant.API_URL + "/tmerclub_seckill/mp/seckill/getOfflineHandleEvent/" + seckillId; return HttpUtil.get(url, OfflineHandleEventVO.class, UrlEnum.PLATFORM); } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/MyOrderApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/MyOrderApi.java index 3acc2d8..6f2ae9a 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/MyOrderApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/MyOrderApi.java @@ -65,7 +65,7 @@ public class MyOrderApi { * 用户扫商家码核销订单 */ public static void orderStationByOrderId(OrderStationDTO orderStationDTO) { - String url = Constant.API_URL + "/tmerclub_order/my_station_order/order_station_by_order_id"; + String url = Constant.API_URL + "/tmerclub_order/my_station_order/orderStationByOrderId"; HttpUtil.put(url, orderStationDTO, UrlEnum.API); } } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/OrderApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/OrderApi.java index 00e52aa..7753313 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/OrderApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/OrderApi.java @@ -53,13 +53,13 @@ public class OrderApi { } public static List infoOrderDelivery(Long orderNumber){ - String url = Constant.API_URL+"/tmerclub_order/mp/order_delivery/info?orderId="+orderNumber; + String url = Constant.API_URL+"/tmerclub_order/mp/orderDelivery/info?orderId="+orderNumber; List deliveryOrderFeignVos = HttpUtil.get(url, List.class,UrlEnum.SHOP); return deliveryOrderFeignVos; } public static void updateOrderDelivery(List list){ - String url = Constant.API_URL + "/tmerclub_order/mp/order_delivery/update"; + String url = Constant.API_URL + "/tmerclub_order/mp/orderDelivery/update"; HttpUtil.put(url,list,UrlEnum.SHOP); } @@ -83,7 +83,7 @@ public class OrderApi { * 根据订单ID和核销码核销虚拟订单 */ public static void orderWriteOffByOrderId(OrderVirtualInfoDTO orderVirtualInfoDTO) { - String url = Constant.API_URL + "/tmerclub_order/m/order_virtual_info/order_write_off_by_order_id"; + String url = Constant.API_URL + "/tmerclub_order/m/order_virtual_info/orderWriteOffByOrderId"; HttpUtil.put(url, orderVirtualInfoDTO, UrlEnum.SHOP); } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/ShopOrderRefundApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/ShopOrderRefundApi.java index 26c435f..1c88812 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/ShopOrderRefundApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/ShopOrderRefundApi.java @@ -46,7 +46,7 @@ public class ShopOrderRefundApi { * 根据订单号查询退款记录 */ public static List getEsOrderRefundVO(Long orderId) { - String url = Constant.API_URL + "/tmerclub_search/mp/search/order_refund/page?pageSize=10&pageNum=1&orderId=" + orderId + "&returnMoneySts=&refundId=&orderType=&applyType=&refundType=&beginTime=&endTime="; + String url = Constant.API_URL + "/tmerclub_search/mp/search/orderRefund/page?pageSize=10&pageNum=1&orderId=" + orderId + "&returnMoneySts=&refundId=&orderType=&applyType=&refundType=&beginTime=&endTime="; return JSON.parseArray(JSON.toJSONString(Json.parseObject(JSON.toJSONString(HttpUtil.get(url, EsPageVO.class, UrlEnum.SHOP)), EsPageVO.class).getList()), EsOrderRefundVO.class); } } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/StationApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/StationApi.java index 9b8b921..34c68e7 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/StationApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/StationApi.java @@ -18,7 +18,7 @@ import java.util.List; */ public class StationApi { public static List getStationList(Long shopId){ - String url = Constant.API_URL+"/tmerclub_order/station/user_station?pageNum=1&pageSize=7&lat=22.943953938872706&lng=113.39070900424778&stationName=&shopId="+shopId; + String url = Constant.API_URL+"/tmerclub_order/station/userStation?pageNum=1&pageSize=7&lat=22.943953938872706&lng=113.39070900424778&stationName=&shopId="+shopId; return JSON.parseArray(JSON.toJSONString(Json.parseObject(JSON.toJSONString(HttpUtil.get(url, PageVO.class, UrlEnum.API)), PageVO.class).getList()), StationDetailVO.class); } @@ -26,7 +26,7 @@ public class StationApi { * 获取门店首页数据 */ public static StationVO getStationIndexInfo() { - String url = Constant.API_URL + "/tmerclub_order/station/get_station_index_info"; + String url = Constant.API_URL + "/tmerclub_order/station/getStationIndexInfo"; return HttpUtil.get(url, StationVO.class, UrlEnum.STATION); } @@ -34,7 +34,7 @@ public class StationApi { * 在门店端查询订单信息 * */ public static OrderVO getStationOrderByCode(String code){ - String url = Constant.API_URL+"/tmerclub_order/station/get_station_order_by_code?code="+code; + String url = Constant.API_URL+"/tmerclub_order/station/getStationOrderByCode?code="+code; return HttpUtil.get(url,OrderVO.class, UrlEnum.STATION); } @@ -42,14 +42,14 @@ public class StationApi { * 在门店端核销自提订单 * */ public static void orderStationById(String orderIds) { - String url = Constant.API_URL + "/tmerclub_order/station/order_station_by_order_id"; + String url = Constant.API_URL + "/tmerclub_order/station/orderStationByOrderId"; HttpUtil.put(url, orderIds, UrlEnum.STATION); } /** * 在门店端核销虚拟商品订单 * */ public static void orderWriteOffByOrderNumber(OrderVirtualInfoDTO orderVirtualInfoDTO){ - String url = Constant.API_URL + "/tmerclub_order/station/order_write_off_by_order_id"; + String url = Constant.API_URL + "/tmerclub_order/station/orderWriteOffByOrderId"; HttpUtil.put(url, orderVirtualInfoDTO, UrlEnum.STATION); } } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/PlatformProductApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/PlatformProductApi.java index 18fa715..5e56fc6 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/PlatformProductApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/PlatformProductApi.java @@ -22,7 +22,7 @@ public class PlatformProductApi { * 平台获取最新下架信息 */ public static OfflineHandleEventVO platformGetOfflineHandleEvent(Long productId) { - String url = Constant.API_URL + "/tmerclub_product/mp/spu/get_offline_handle_event/" + productId; + String url = Constant.API_URL + "/tmerclub_product/mp/spu/getOfflineHandleEvent/" + productId; return HttpUtil.get(url, OfflineHandleEventVO.class, UrlEnum.PLATFORM); } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/ScoreOrderApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/ScoreOrderApi.java index 7d92f9c..f4de2ea 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/ScoreOrderApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/ScoreOrderApi.java @@ -24,13 +24,13 @@ public class ScoreOrderApi { } public static List infoOrderDelivery(Long orderNumber){ - String url = Constant.API_URL+"/tmerclub_order/mp/order_delivery/info?orderId="+orderNumber; + String url = Constant.API_URL+"/tmerclub_order/mp/orderDelivery/info?orderId="+orderNumber; List deliveryOrderFeignVos = HttpUtil.get(url, List.class,UrlEnum.PLATFORM); return deliveryOrderFeignVos; } public static void updateOrderDelivery(List list){ - String url = Constant.API_URL + "/tmerclub_order/mp/order_delivery/update"; + String url = Constant.API_URL + "/tmerclub_order/mp/orderDelivery/update"; HttpUtil.put(url,list,UrlEnum.PLATFORM); } } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/UserLevelApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/UserLevelApi.java index 6a897c0..735b742 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/UserLevelApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/UserLevelApi.java @@ -14,7 +14,7 @@ public class UserLevelApi { * 获取用户等级信息 */ public static UserLevelVO info(Long userLevelId) { - String url = Constant.API_URL + "/tmerclub_user/p/user_level?userLevelId=" + userLevelId; + String url = Constant.API_URL + "/tmerclub_user/p/userLevel?userLevelId=" + userLevelId; return HttpUtil.get(url, UserLevelVO.class, UrlEnum.PLATFORM); } @@ -22,7 +22,7 @@ public class UserLevelApi { * 更新用户等级 */ public static void update(UserLevelDTO userLevelDTO) { - String url = Constant.API_URL + "/tmerclub_user/p/user_level"; + String url = Constant.API_URL + "/tmerclub_user/p/userLevel"; HttpUtil.put(url, userLevelDTO, UrlEnum.PLATFORM); } } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/UserRightsApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/UserRightsApi.java index 8f82cf7..ebf204a 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/UserRightsApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/UserRightsApi.java @@ -13,7 +13,7 @@ public class UserRightsApi { * 新增用户权益 */ public static Long save(UserRightsDTO userRightsDTO) { - String url = Constant.API_URL + "/tmerclub_user/p/user_rights"; + String url = Constant.API_URL + "/tmerclub_user/p/userRights"; return HttpUtil.post(url, userRightsDTO, UrlEnum.PLATFORM, Long.class); } @@ -21,7 +21,7 @@ public class UserRightsApi { * 删除用户权益 */ public static void delete(Long rightsId) { - String url = Constant.API_URL + "/tmerclub_user/p/user_rights?rightsId=" + rightsId; + String url = Constant.API_URL + "/tmerclub_user/p/userRights?rightsId=" + rightsId; HttpUtil.delete(url, UrlEnum.PLATFORM); } } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/SameCityApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/SameCityApi.java index f9718e4..2f5b10b 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/SameCityApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/SameCityApi.java @@ -11,12 +11,12 @@ import com.moyuer.cloud.systemtest.util.UrlEnum; */ public class SameCityApi { public static SameCityVO getSameCityInfo() { - String url = Constant.API_URL + "/tmerclub_order/m/same_city/get_same_city_info"; + String url = Constant.API_URL + "/tmerclub_order/m/sameCity/getSameCityPage"; return HttpUtil.get(url, SameCityVO.class, UrlEnum.SHOP); } public static void saveSameCity(SameCityDTO sameCityDTO) { - String url = Constant.API_URL + "/tmerclub_order/m/same_city"; + String url = Constant.API_URL + "/tmerclub_order/m/sameCity"; HttpUtil.post(url, sameCityDTO, UrlEnum.SHOP); } } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/ShopRefundAddrApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/ShopRefundAddrApi.java index 8037171..88c2d89 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/ShopRefundAddrApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/ShopRefundAddrApi.java @@ -14,12 +14,12 @@ import java.util.List; */ public class ShopRefundAddrApi { public static Long addShopRefundAddr(ShopRefundAddrDTO shopRefundAddrDTO){ - String url = Constant.API_URL +"/tmerclub_admin/mp/shop_refund_addr"; + String url = Constant.API_URL +"/tmerclub_admin/mp/refundAddr"; return JSON.parseArray(JSON.toJSONString(HttpUtil.post(url,shopRefundAddrDTO, UrlEnum.SHOP,Long.class)),Long.class).get(0); } public static List listShopRefundAddr(){ - String url = Constant.API_URL +"/tmerclub_admin/mp/shop_refund_addr/list"; + String url = Constant.API_URL +"/tmerclub_admin/mp/refundAddr/list"; return JSON.parseArray(JSON.toJSONString(HttpUtil.get(url,List.class, UrlEnum.SHOP)),ShopRefundAddrVO.class); } } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/supplier/SupplierOrderApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/supplier/SupplierOrderApi.java index 6651868..09f69cb 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/supplier/SupplierOrderApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/supplier/SupplierOrderApi.java @@ -29,7 +29,7 @@ public class SupplierOrderApi { } public static void updateOrderDelivery(List list){ - String url = Constant.API_URL + "/tmerclub_order/mp/order_delivery/update"; + String url = Constant.API_URL + "/tmerclub_order/mp/orderDelivery/update"; HttpUtil.put(url,list,UrlEnum.SUPPLIER); } } diff --git a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/supplier/SupplierProductApi.java b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/supplier/SupplierProductApi.java index ac8a814..9a669e5 100644 --- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/supplier/SupplierProductApi.java +++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/supplier/SupplierProductApi.java @@ -75,7 +75,7 @@ public class SupplierProductApi { * 商家获取最新下架信息 */ public static OfflineHandleEventVO getOfflineHandleEvent(Long productId) { - String url = Constant.API_URL + "/tmerclub_product/s/spu/get_offline_handle_event/" + productId; + String url = Constant.API_URL + "/tmerclub_product/s/spu/getOfflineHandleEvent/" + productId; return HttpUtil.get(url, OfflineHandleEventVO.class, UrlEnum.SUPPLIER); } @@ -83,7 +83,7 @@ public class SupplierProductApi { * 商家申请上架，提交审核 */ public static void apply(OfflineHandleEventDTO offlineHandleEventDTO) { - String url = Constant.API_URL + "/tmerclub_product/s/spu/audit_apply"; + String url = Constant.API_URL + "/tmerclub_product/s/spu/auditApply"; HttpUtil.post(url, offlineHandleEventDTO, UrlEnum.SUPPLIER); } } diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/CompanyAuditingController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/CompanyAuditingController.java index 6bf1115..bdbaeba 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/CompanyAuditingController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/CompanyAuditingController.java @@ -23,7 +23,7 @@ import java.util.Objects; * @date 2022/9/13 14:06 */ @RestController("adminCompanyAuditingController") -@RequestMapping("/mp/shop_company_auditing") +@RequestMapping("/mp/shopCompanyAuditing") @Tag(name = "admin-工商信息审核情况") public class CompanyAuditingController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/HotSearchController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/HotSearchController.java index 0b069ef..dc2747a 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/HotSearchController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/HotSearchController.java @@ -30,7 +30,7 @@ import java.util.Objects; * @date 2021-01-27 09:10:00 */ @RestController("adminHotSearchController") -@RequestMapping("/mp/hot_search") +@RequestMapping("/mp/hotQuery") @Tag(name = "admin-热搜") public class HotSearchController { private static final Logger log = LoggerFactory.getLogger(HotSearchController.class); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/IndexImgController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/IndexImgController.java index c3a794e..298e0bc 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/IndexImgController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/IndexImgController.java @@ -29,7 +29,7 @@ import java.util.Objects; * @date 2020-11-24 16:38:32 */ @RestController("adminIndexImgController") -@RequestMapping("/mp/index_img") +@RequestMapping("/mp/indexPic") @Tag(name = "admin-轮播图") public class IndexImgController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopCompanyController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopCompanyController.java index 4e033c0..8a48f40 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopCompanyController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopCompanyController.java @@ -29,7 +29,6 @@ import java.util.Objects; */ @RestController("adminShopCompanyController") @RequestMapping("/ma/shopCompany") -//@RequestMapping("/mp/shop_company") @Tag(name = "admin-商家工商信息") public class ShopCompanyController { @@ -42,16 +41,16 @@ public class ShopCompanyController { @Autowired private ShopDetailService shopDetailService; - @GetMapping("/check_credit_code") + @GetMapping("/checkCreditCode") @Operation(summary = "检查统一信用码是否已存在", description = "检查统一信用码是否已存在") public ServerResponseEntity checkCreditCode(@RequestParam("creditCode") String creditCode, @RequestParam("shopId") Long shopId) { Boolean res = shopCompanyService.checkCreditCode(creditCode, shopId); return ServerResponseEntity.success(res); } - @PutMapping("/update_id_card_status") + @PutMapping("/updateCardCtatus") @Operation(summary = "更新影印件状态", description = "通联独有") - public ServerResponseEntity updateIdCardStatus(@RequestParam("shopId") Long shopId) { + public ServerResponseEntity updateCardStatus(@RequestParam("shopId") Long shopId) { if (!shopAllinpayService.getIsAllinpay()) { return ServerResponseEntity.success(); } @@ -85,9 +84,9 @@ public class ShopCompanyController { return ServerResponseEntity.success(idCardStatus.getData()); } - @PutMapping("/upload_id_card") + @PutMapping("/uploadCard") @Operation(summary = "重新上传影印件", description = "通联独有") - public ServerResponseEntity uploadIdCard(@RequestBody ShopCompanyDTO shopCompanyDTO) { + public ServerResponseEntity uploadCard(@RequestBody ShopCompanyDTO shopCompanyDTO) { if (!shopAllinpayService.getIsAllinpay()) { return ServerResponseEntity.success("非通联环境"); } diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopDetailController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopDetailController.java index 537d60a..e0f975b 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopDetailController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopDetailController.java @@ -16,14 +16,14 @@ import org.springframework.web.bind.annotation.RestController; * @Date 2021/8/14 16:45 */ @RestController("adminShopDetailController") -@RequestMapping("/mp/shop_detail") +@RequestMapping("/mp/shopDetail") @Tag(name = "admin-店铺信息") public class ShopDetailController { @Autowired private ShopDetailService shopDetailService; - @GetMapping("/check_shop_name") + @GetMapping("/checkShopName") @Operation(summary = "检查店铺名称是否已存在", description = "检查店铺名称是否已存在") public ServerResponseEntity checkShopName(@RequestParam("shopName") String shopName) { Boolean res = shopDetailService.checkShopName(shopName); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopOfflineHandleEventController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopOfflineHandleEventController.java index 9f0c902..bc82102 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopOfflineHandleEventController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopOfflineHandleEventController.java @@ -28,7 +28,7 @@ import java.util.Objects; * @date 2021-01-15 17:46:26 */ @RestController("shopOfflineHandleEventController") -@RequestMapping("/mp/shop_offline_handle_event") +@RequestMapping("/mp/shopOfflineHandleEvent") @Tag(name = "admin-下线处理事件") public class ShopOfflineHandleEventController { @@ -59,7 +59,7 @@ public class ShopOfflineHandleEventController { return ServerResponseEntity.success(); } - @GetMapping("/get_offline_handle_event_by_prodId/{prodId}") + @GetMapping("/getOfflineHandleEventByProdId/{prodId}") @Operation(summary = "获取最新下线店铺的事件", description = "通过prodId获取最新下线店铺的事件") public ServerResponseEntity getOfflineHandleEventByProdId(@PathVariable Long prodId) { ServerResponseEntity offlineHandleEventResponse = @@ -67,9 +67,9 @@ public class ShopOfflineHandleEventController { return ServerResponseEntity.success(offlineHandleEventResponse.getData()); } - @PostMapping("/shop_audit") + @PostMapping("/shopAudit") @Operation(summary = "审核店铺", description = "审核店铺") - public ServerResponseEntity prodAudit(@RequestBody OfflineHandleEventDTO offlineHandleEventDto) { + public ServerResponseEntity shopAudit(@RequestBody OfflineHandleEventDTO offlineHandleEventDto) { offlineHandleEventFeignClient.auditOfflineEvent(offlineHandleEventDto); Long shopId = offlineHandleEventDto.getHandleId(); // 审核通过,更新店铺为营业状态 @@ -84,7 +84,7 @@ public class ShopOfflineHandleEventController { return ServerResponseEntity.success(); } - @PostMapping("/audit_apply") + @PostMapping("/auditApply") @Operation(summary = "违规店铺提交审核", description = "违规店铺提交审核") public ServerResponseEntity auditApply(@RequestBody OfflineHandleEventDTO offlineHandleEventDto) { Long shopId = offlineHandleEventDto.getHandleId(); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRechargeController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRechargeController.java index 2c41127..c020889 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRechargeController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRechargeController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; * @Date 2022/6/30 17:23 */ @RestController("adminShopRechargeController") -@RequestMapping("/mp/shop_recharge") +@RequestMapping("/mp/shopRecharge") @Tag(name = "admin-商家充值记录信息") public class ShopRechargeController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRefundAddrController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRefundAddrController.java index f71ae6c..97a7e01 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRefundAddrController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRefundAddrController.java @@ -27,7 +27,7 @@ import java.util.List; * @date 2021-01-27 09:10:00 */ @RestController("adminShopRefundAddrController") -@RequestMapping("/mp/shop_refund_addr") +@RequestMapping("/mp/RefundAddr") @Tag(name = "admin-退货地址") public class ShopRefundAddrController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRenovationController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRenovationController.java index 69a0128..bb419d0 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRenovationController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRenovationController.java @@ -24,7 +24,7 @@ import java.util.Objects; * @author Orange */ @RestController("adminShopRenovationController") -@RequestMapping("/mp/shop_renovation") +@RequestMapping("/mp/shopRenovation") @Tag(name = "店铺装修信息") public class ShopRenovationController { @@ -40,7 +40,7 @@ public class ShopRenovationController { return ServerResponseEntity.success(shopRenovationPage); } - @GetMapping("/page_h5") + @GetMapping("/pageH5") @Operation(summary = "根据类型分页获取店铺装修信息列表", description = "分页获取店铺装修信息列表") public ServerResponseEntity> pageH5(@Valid PageDTO pageDTO, ShopRenovationDTO shopRenovation) { shopRenovation.setShopId(AuthUserContext.get().getTenantId()); @@ -58,7 +58,7 @@ public class ShopRenovationController { return ServerResponseEntity.success(shopRenovation); } - @GetMapping("/get_h5") + @GetMapping("/getH5") @Operation(summary = "获取店铺装修信息", description = "根据renovationId获取店铺装修信息") public ServerResponseEntity getH5ByRenovationId(@RequestParam Long renovationId) { ShopRenovation shopRenovation = shopRenovationService.getByRenovationId(renovationId); @@ -68,7 +68,7 @@ public class ShopRenovationController { return ServerResponseEntity.success(shopRenovation); } - @PostMapping("/save_pc") + @PostMapping("/savePc") @Operation(summary = "保存店铺pc端装修信息", description = "保存店铺装修信息") public ServerResponseEntity save(@Valid @RequestBody ShopRenovationDTO shopRenovationDTO) { ShopRenovation shopRenovation = BeanUtil.map(shopRenovationDTO, ShopRenovation.class); @@ -79,7 +79,7 @@ public class ShopRenovationController { return ServerResponseEntity.success(shopRenovation.getRenovationId()); } - @PostMapping("/save_h5") + @PostMapping("/saveH5") @Operation(summary = "保存店铺移动端装修信息", description = "保存店铺装修信息") public ServerResponseEntity saveH5(@Valid @RequestBody ShopRenovationDTO shopRenovationDTO) { ShopRenovation shopRenovation = BeanUtil.map(shopRenovationDTO, ShopRenovation.class); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRenovationUpDelController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRenovationUpDelController.java index dd5b46c..7314faf 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRenovationUpDelController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopRenovationUpDelController.java @@ -23,7 +23,7 @@ import java.util.Objects; * @author 菠萝凤梨 */ @RestController("adminShopRenovationUpDelController") -@RequestMapping("/mp/shop_renovation") +@RequestMapping("/mp/shopRenovation") @Tag(name = "店铺页面-修改、删除、设为主页") public class ShopRenovationUpDelController { @@ -35,7 +35,7 @@ public class ShopRenovationUpDelController { private Boolean permission; - @PutMapping("/update_pc") + @PutMapping("/updatePc") @Operation(summary = "更新店铺pc端装修信息", description = "更新店铺装修信息") public ServerResponseEntity update(@Valid @RequestBody ShopRenovationDTO shopRenovationDTO) { shopRenovationDTO.setRenovationType(RenovationType.PC.value()); @@ -43,7 +43,7 @@ public class ShopRenovationUpDelController { return ServerResponseEntity.success(); } - @PutMapping("/update_h5") + @PutMapping("/updateH5") @Operation(summary = "更新店铺移动端装修信息", description = "更新店铺装修信息") public ServerResponseEntity updateH5(@Valid @RequestBody ShopRenovationDTO shopRenovationDTO) { shopRenovationDTO.setRenovationType(RenovationType.H5.value()); @@ -51,28 +51,28 @@ public class ShopRenovationUpDelController { return ServerResponseEntity.success(); } - @DeleteMapping("/delete_pc") + @DeleteMapping("/deletePc") @Operation(summary = "删除pc店铺装修信息", description = "根据店铺装修信息id删除店铺pc装修信息") public ServerResponseEntity delete(@RequestParam Long renovationId) { deleteRenovation(renovationId); return ServerResponseEntity.success(); } - @DeleteMapping("/delete_h5") + @DeleteMapping("/deleteH5") @Operation(summary = "删除h5店铺装修信息", description = "根据店铺装修信息id删除店铺h5装修信息") public ServerResponseEntity deleteH5(@RequestParam Long renovationId) { deleteRenovation(renovationId); return ServerResponseEntity.success(); } - @PutMapping("/update_home_status_pc") + @PutMapping("/updateHomeStatus") @Operation(summary = "PC端修改主页标识", description = "PC端修改主页标识") public ServerResponseEntity updateHomeStatus(@RequestParam Long renovationId) { updateShopRenovationStatus(renovationId); return ServerResponseEntity.success(); } - @PutMapping("/update_h5_home_status") + @PutMapping("/updateH5HomeStatus") @Operation(summary = "移动端修改主页标识", description = "移动端修改主页标识") public ServerResponseEntity updateH5HomeStatus(@RequestParam Long renovationId) { updateShopRenovationStatus(renovationId); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopTemplateController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopTemplateController.java index 40b0058..c62d7f6 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopTemplateController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopTemplateController.java @@ -26,7 +26,7 @@ import java.util.Objects; * @author Orange */ @RestController("multishopShopTemplateController") -@RequestMapping("/mp/shop_template") +@RequestMapping("/mp/shopTemplate") @Tag(name = "店铺装修模板") public class ShopTemplateController { @@ -42,7 +42,7 @@ public class ShopTemplateController { return ServerResponseEntity.success(shopTemplatePage); } - @GetMapping("/page_h5") + @GetMapping("/pageH5") @Operation(summary = "根据类型获取商品装修模板表列表", description = "根据类型分页获取商品装修模板表列表") public ServerResponseEntity> pageH5(@Valid PageDTO pageDTO, ShopTemplateDTO shopTemplateDTO) { shopTemplateDTO.setShopId(AuthUserContext.get().getTenantId()); @@ -56,13 +56,13 @@ public class ShopTemplateController { return ServerResponseEntity.success(shopTemplateService.getByTemplateId(templateId)); } - @GetMapping("/get_h5") + @GetMapping("/getH5") @Operation(summary = "获取商品装修模板表", description = "根据templateId获取商品装修模板表") public ServerResponseEntity getH5ByTemplateId(@RequestParam Long templateId) { return ServerResponseEntity.success(shopTemplateService.getByTemplateId(templateId)); } - @PostMapping("/save_pc") + @PostMapping("/savePc") @Operation(summary = "保存商品pc装修模板表", description = "保存商品pc装修模板表") public ServerResponseEntity save(@Valid @RequestBody ShopTemplateDTO shopTemplateDTO) { ShopTemplate shopTemplate = BeanUtil.map(shopTemplateDTO, ShopTemplate.class); @@ -73,7 +73,7 @@ public class ShopTemplateController { return ServerResponseEntity.success(shopTemplate.getTemplateId()); } - @PostMapping("/save_h5") + @PostMapping("/saveH5") @Operation(summary = "保存商品h5装修模板表", description = "保存商品h5装修模板表") public ServerResponseEntity saveH5(@Valid @RequestBody ShopTemplateDTO shopTemplateDTO) { ShopTemplate shopTemplate = BeanUtil.map(shopTemplateDTO, ShopTemplate.class); @@ -84,14 +84,14 @@ public class ShopTemplateController { return ServerResponseEntity.success(shopTemplate.getTemplateId()); } - @PostMapping("/copy_pc") + @PostMapping("/copyPc") @Operation(summary = "PC端复制模板信息", description = "PC端复制模板信息") public ServerResponseEntity copy(@RequestParam Long templateId) { ShopTemplate shopTemplate = copyTemplate(templateId); return ServerResponseEntity.success(shopTemplate.getTemplateId()); } - @PostMapping("/copy_h5") + @PostMapping("/copyH5") @Operation(summary = "移动端复制模板信息", description = "移动端复制模板信息") public ServerResponseEntity copyH5(@RequestParam Long templateId) { ShopTemplate shopTemplate = copyTemplate(templateId); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopTemplateUpDelController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopTemplateUpDelController.java index 037e368..deeb7a7 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopTemplateUpDelController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopTemplateUpDelController.java @@ -30,7 +30,7 @@ public class ShopTemplateUpDelController { @Value("${tmerclub.expose.operation.auth:}") private Boolean permission; - @PutMapping("/update_pc") + @PutMapping("/updatePc") @Operation(summary = "更新商品PC装修模板表", description = "更新商品PC装修模板表") public ServerResponseEntity update(@Valid @RequestBody ShopTemplateDTO shopTemplateDTO) { if (BooleanUtil.isFalse(permission)) { @@ -40,7 +40,7 @@ public class ShopTemplateUpDelController { return ServerResponseEntity.success(); } - @PutMapping("/update_h5") + @PutMapping("/updateH5") @Operation(summary = "更新商品H5装修模板表", description = "更新商品H5装修模板表") public ServerResponseEntity updateH5(@Valid @RequestBody ShopTemplateDTO shopTemplateDTO) { if (BooleanUtil.isFalse(permission)) { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopWalletController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopWalletController.java index 56895cb..2690b8f 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopWalletController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopWalletController.java @@ -30,7 +30,7 @@ import java.util.Objects; * @date 2021/6/8 19:46 */ @RestController("adminShopWalletController") -@RequestMapping("/mp/shop_wallet") +@RequestMapping("/mp/shopWallet") @Tag(name = "admin-店铺钱包") public class ShopWalletController { @@ -51,28 +51,28 @@ public class ShopWalletController { return ServerResponseEntity.success(page); } - @GetMapping("/get_all_shop_wallet") + @GetMapping("/getAllShopWalletVoByShopId") @Operation(summary = "查看所有店铺钱包总信息") public ServerResponseEntity getAllShopWalletVoByShopId(ShopWalletLogSearchDTO shopWalletLogSearchDTO) { ShopWalletVO shopWallet = shopWalletService.getAllShop(shopWalletLogSearchDTO); return ServerResponseEntity.success(shopWallet); } - @GetMapping("/page_shop_wallet_by_time") + @GetMapping("/pageShopWalletByTime") @Operation(summary = "分页查看店铺钱包总信息") public ServerResponseEntity> pageShopWalletByTime(PageDTO pageDTO, ShopWalletLogSearchDTO shopWalletLogSearchDTO) { PageVO pageShopWalletByTime = shopWalletService.pageShopWalletByTime(pageDTO, shopWalletLogSearchDTO); return ServerResponseEntity.success(pageShopWalletByTime); } - @GetMapping("/page_all_shop") + @GetMapping("/getAllShopWalletLogPage") @Operation(summary = "查看所有店铺的日志") public ServerResponseEntity> getAllShopWalletLogPage(PageDTO pageDTO, ShopWalletLogSearchDTO shopWalletLogSearchDTO) { PageVO page = shopWalletLogService.pageAllShop(pageDTO, shopWalletLogSearchDTO); return ServerResponseEntity.success(page); } - @GetMapping("/get_shop_wallet_log_form") + @GetMapping("/getShopWalletLogForm") @Operation(summary = "导出店铺结算报表", description = "导出店铺结算报表") public ServerResponseEntity getShopWalletLogForm(HttpServletResponse response, ShopWalletLogSearchDTO shopWalletLogSearchDTO) { List list = shopWalletLogService.listShopWalletLogExcel(shopWalletLogSearchDTO); @@ -80,7 +80,7 @@ public class ShopWalletController { return ServerResponseEntity.success(); } - @GetMapping("/get_shop_wallet") + @GetMapping("/getShopWalletVoByShopId") @Operation(summary = "查看店铺钱包信息", description = "根据店铺id查看店铺钱包信息") public ServerResponseEntity getShopWalletVoByShopId() { Long shopId = AuthUserContext.get().getTenantId(); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopWithdrawCashController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopWithdrawCashController.java index dbcb768..2c07526 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopWithdrawCashController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/admin/ShopWithdrawCashController.java @@ -26,7 +26,7 @@ import java.util.Objects; * @Date 2021/6/11 9:23 */ @RestController("adminShopWithdrawCashController") -@RequestMapping("/mp/shop_withdraw_cash") +@RequestMapping("/mp/shopWithdrawApply") @Tag(name = "admin-商家提现申请信息") public class ShopWithdrawCashController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/HotSearchController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/HotSearchController.java index af7edaf..2940444 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/HotSearchController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/HotSearchController.java @@ -23,7 +23,7 @@ import java.util.List; * @date 2021-01-27 09:10:00 */ @RestController("appHotSearchController") -@RequestMapping("/ua/app/hot_search") +@RequestMapping("/ua/app/hotQuery") @Tag(name = "app-热搜") public class HotSearchController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/IndexImgController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/IndexImgController.java index eb83592..4bad9cd 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/IndexImgController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/IndexImgController.java @@ -23,7 +23,7 @@ import java.util.List; * @date 2020-11-24 16:38:32 */ @RestController("appIndexImgController") -@RequestMapping("/ua/index_img") +@RequestMapping("/ua/indexPic") @Tag(name = "app-轮播图") public class IndexImgController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopCollectionController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopCollectionController.java index c864c3c..84a3f78 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopCollectionController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopCollectionController.java @@ -25,7 +25,7 @@ import java.util.List; * @date 2021-02-23 14:41:42 */ @RestController("appUserCollectionShopController") -@RequestMapping("/user_collection_shop") +@RequestMapping("/shopCollection") @Tag(name = "app-用户店铺收藏记录") public class ShopCollectionController { @@ -40,7 +40,7 @@ public class ShopCollectionController { return ServerResponseEntity.success(shopCollectionPage); } - @GetMapping("/ma/is_collection") + @GetMapping("/ma/isCollection") @Operation(summary = "根据店铺id获取该店铺是否在收藏夹中", description = "传入收藏店铺id") public ServerResponseEntity isCollection(Long shopId) { UidInfoBO uidInfoBO = AuthUserContext.get(); @@ -51,16 +51,16 @@ public class ShopCollectionController { return ServerResponseEntity.success(shopCollectionService.countByShopIdAndUserId(shopId, uidInfoBO.getUserId()) > 0); } - @PostMapping("/add_or_cancel") + @PostMapping("/createOrCancel") @Operation(summary = "添加/取消收藏", description = "传入收藏店铺id,如果店铺未收藏则收藏店铺，已收藏则取消收藏") @Parameter(name = "shopId", description = "店铺id", required = true) - public ServerResponseEntity addOrCancel(@RequestBody Long shopId) { + public ServerResponseEntity createOrCancel(@RequestBody Long shopId) { Long userId = AuthUserContext.get().getUserId(); Boolean isAdd = shopCollectionService.addOrCancel(shopId, userId); return ServerResponseEntity.success(isAdd); } - @PostMapping("/batch_cancel") + @PostMapping("/batchCancel") @Operation(summary = "批量取消收藏", description = "传入收藏店铺id") @Parameter(name = "shopIds", description = "店铺Id", required = true) public ServerResponseEntity batchCancel(@RequestBody List shopIds) { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopDetailController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopDetailController.java index 08b9884..d8593a7 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopDetailController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopDetailController.java @@ -32,7 +32,7 @@ import java.util.Objects; * @date 2020-12-05 15:50:25 */ @RestController("appShopDetailController") -@RequestMapping("/ua/shop_detail") +@RequestMapping("/ua/shopDetail") @Tag(name = "app-店铺详情") public class ShopDetailController { @@ -48,7 +48,7 @@ public class ShopDetailController { return ServerResponseEntity.success(shopDetailService.shopSearchPage(pageDTO, shopDetailDTO)); } - @GetMapping("/head_info") + @GetMapping("/getShopHeadInfo") @Operation(summary = "店铺头部信息", description = "获取的店铺头部信息") public ServerResponseEntity getShopHeadInfo(Long shopId) { ShopHeadInfoVO shopHeadInfoDto = new ShopHeadInfoVO(); @@ -76,16 +76,16 @@ public class ShopDetailController { return ServerResponseEntity.success(shopHeadInfoDto); } - @GetMapping("/search_shops") + @GetMapping("/queryShops") @Operation(summary = "app搜索店铺", description = "根据店铺名称搜索店铺") - public ServerResponseEntity> searchShops(PageDTO pageDTO, ShopSearchDTO shopSearchDTO) { + public ServerResponseEntity> queryShops(PageDTO pageDTO, ShopSearchDTO shopSearchDTO) { PageVO shopPage = shopDetailService.renovationShopPage(pageDTO, shopSearchDTO, SysTypeEnum.ORDINARY.value()); return ServerResponseEntity.success(shopPage); } - @GetMapping("/list_renovation_shop") + @GetMapping("/getRenovationShopList") @Operation(summary = "获取装修店铺列表信息", description = "获取装修店铺列表信息") - public ServerResponseEntity> listRenovationShop(ShopSearchDTO shopSearchDTO) { + public ServerResponseEntity> getRenovationShopList(ShopSearchDTO shopSearchDTO) { List shopList = shopDetailService.listRenovationShop(shopSearchDTO); return ServerResponseEntity.success(shopList); } diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopRenovationController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopRenovationController.java index 96e1480..8a4b900 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopRenovationController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/app/ShopRenovationController.java @@ -24,7 +24,7 @@ import java.util.Objects; * @date 2022-08-12 11:27:18 */ @RestController("appShopRenovationController") -@RequestMapping("/ua/shop_renovation") +@RequestMapping("/ua/shopRenovation") @Tag(name = "app-店铺装修信息") public class ShopRenovationController { private static final Logger logger = LoggerFactory.getLogger(ShopRenovationController.class); @@ -32,19 +32,19 @@ public class ShopRenovationController { @Autowired private ShopRenovationService shopRenovationService; - @GetMapping("/get_home_page") + @GetMapping("/homePage") @Operation(summary = "获取店铺主页装修信息", description = "根据店铺id，装修类型获取店铺装修信息") @Parameters({ @Parameter(name = "shopId", description = "店铺id", required = true), @Parameter(name = "renovationType", description = "装修类型 1.pc 2.移动端", required = true) }) - public ServerResponseEntity getHomePage(@RequestParam("shopId") Long shopId, + public ServerResponseEntity homePage(@RequestParam("shopId") Long shopId, @RequestParam("renovationType") Integer renovationType) { ShopRenovation shopHomeRenovation = shopRenovationService.getShopHomeRenovation(shopId, renovationType); return ServerResponseEntity.success(shopHomeRenovation); } - @GetMapping("/get_home") + @GetMapping("/getHome") @Operation(summary = "获取店铺主页装修信息(内容为空）", description = "根据店铺id，装修类型获取店铺装修信息(内容为空）") @Parameters({ @Parameter(name = "shopId", description = "店铺id", required = true), @@ -60,7 +60,7 @@ public class ShopRenovationController { return ServerResponseEntity.success(shopHomeRenovation); } - @GetMapping("/get_renovation_by_id") + @GetMapping("/getRenovationById") @Operation(summary = "根据装修id获取店铺装修信息", description = "根据装修id获取店铺装修信息") @Parameter(name = "renovationId", description = "装修id", required = true) public ServerResponseEntity getRenovationById(@RequestParam("renovationId") Long renovationId) { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ApplyShopUserController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ApplyShopUserController.java index c933c24..b6b69a0 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ApplyShopUserController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ApplyShopUserController.java @@ -27,7 +27,7 @@ import java.util.Objects; * @Author lth * @Date 2021/5/12 20:27 */ -@RequestMapping("/m/apply_shop/shop_user") +@RequestMapping("/m/applyShop/shopUser") @RestController("multishopShopUserController") @Tag(name = "multishop-店铺用户信息") public class ApplyShopUserController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/CompanyAuditingController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/CompanyAuditingController.java index cef88d2..f0046e6 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/CompanyAuditingController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/CompanyAuditingController.java @@ -22,7 +22,7 @@ import java.util.Objects; * @date 2022/9/13 14:06 */ @RestController("multishopCompanyAuditingController") -@RequestMapping("/m/shop_company_auditing") +@RequestMapping("/m/shopCompanyAuditing") @Tag(name = "multishop-店铺变更工商信息") public class CompanyAuditingController { @@ -31,7 +31,7 @@ public class CompanyAuditingController { @Autowired private ShopDetailService shopDetailService; - @PostMapping("/apply_change_company_info") + @PostMapping("/applyChangeCompanyInfo") @Operation(summary = "申请变更工商信息", description = "申请变更工商信息") public ServerResponseEntity applyChangeCompanyInfo(@RequestBody @Valid ShopCompanyDTO shopCompanyDTO) { Long shopId = AuthUserContext.get().getTenantId(); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopApplyController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopApplyController.java index c8128c5..d194ded 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopApplyController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopApplyController.java @@ -29,7 +29,7 @@ import java.util.Objects; * @author person */ @RestController("multishopShopApplyController") -@RequestMapping("/m/apply_shop/shop_apply") +@RequestMapping("/m/applyShop/shopApply") @Tag(name = "multishop-店铺申请") public class ShopApplyController { @@ -47,7 +47,7 @@ public class ShopApplyController { @Autowired private ShopAllinpayService shopAllinpayService; - @GetMapping("/get_auditing_info") + @GetMapping("/getAuditingInfo") @Operation(summary = "获取店铺审核状态信息", description = "获取店铺审核状态信息,返回值为空代表该店铺没有提交过审核信息") public ServerResponseEntity getAuditingInfo() { Long shopId = AuthUserContext.get().getTenantId(); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopBankCardController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopBankCardController.java index 97bd42c..d34e359 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopBankCardController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopBankCardController.java @@ -30,7 +30,7 @@ import java.util.Objects; * @author lth */ @RestController("multishopShopBankCardController") -@RequestMapping("/m/apply_shop/shop_bank_card") +@RequestMapping("/m/applyShop/shopBankCard") @Tag(name = "multishop-店铺银行卡信息") public class ShopBankCardController { @@ -45,7 +45,7 @@ public class ShopBankCardController { @Autowired private ShopDetailService shopDetailService; - @PostMapping("/save_and_apply_shop") + @PostMapping("/saveAndApplyShop") @Operation(summary = "批量保存店铺银行卡信息并提交店铺审核信息", description = "批量保存店铺银行卡信息并提交店铺审核信息") public ServerResponseEntity saveAndApplyShop(@Valid @RequestBody List shopBankCardDTOList) { Long shopId = AuthUserContext.get().getTenantId(); @@ -94,9 +94,9 @@ public class ShopBankCardController { return ServerResponseEntity.success(shopBankCardVO); } - @GetMapping("/list_by_shopId") + @GetMapping("/getShopIdList") @Operation(summary = "获取店铺下的银行卡列表", description = "获取店铺下的银行卡列表") - public ServerResponseEntity> listByShopId() { + public ServerResponseEntity> getShopIdList() { Long shopId = AuthUserContext.get().getTenantId(); List shopBankCardVOList = shopBankCardService.listByShopId(shopId); return ServerResponseEntity.success(shopBankCardVOList); @@ -133,16 +133,16 @@ public class ShopBankCardController { return ServerResponseEntity.success(); } - @PutMapping("/set_primary") + @PutMapping("/setPrimary") @Operation(summary = "设置为主账号", description = "设置为主账号") public ServerResponseEntity setPrimary(@RequestParam("shopBankCardId") Long shopBankCardId) { shopBankCardService.setPrimaryByShopId(shopBankCardId, AuthUserContext.get().getTenantId()); return ServerResponseEntity.success(); } - @PutMapping("/set_not_primary") + @PutMapping("/cancelPrimary") @Operation(summary = "取消主账号", description = "取消主账号") - public ServerResponseEntity setNotPrimary(@RequestParam("shopBankCardId") Long shopBankCardId) { + public ServerResponseEntity cancelPrimary(@RequestParam("shopBankCardId") Long shopBankCardId) { shopBankCardService.setNotPrimaryByShopId(shopBankCardId, AuthUserContext.get().getTenantId()); return ServerResponseEntity.success(); } diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopCompanyController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopCompanyController.java index dd31652..9c9eb5b 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopCompanyController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopCompanyController.java @@ -34,7 +34,7 @@ import java.util.Objects; * @Date 2021/4/25 16:31 */ @RestController -@RequestMapping("/m/apply_shop/shop_company") +@RequestMapping("/m/applyShop/shopCompany") @Tag(name = "multishop-店铺工商信息") public class ShopCompanyController { @@ -121,7 +121,7 @@ public class ShopCompanyController { return ServerResponseEntity.success(shopCompanyVO); } - @PutMapping("/update_acct_protocol_no") + @PutMapping("/updateAcctProtocolNo") @Operation(summary = "更新店铺账户协议编号") @Parameters({ @Parameter(name = "signAcctType", description = "签约类型 1.个人 2.法人 3.企业"), diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopDetailController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopDetailController.java index dbe1e3e..cf010f9 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopDetailController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopDetailController.java @@ -31,7 +31,7 @@ import java.util.Objects; * @author lth */ @RestController("multishopShopDetailController") -@RequestMapping("/m/apply_shop/shop_detail") +@RequestMapping("/m/applyShop/shopDetail") @Tag(name = "multishop-店铺信息") public class ShopDetailController { @@ -133,7 +133,7 @@ public class ShopDetailController { return ServerResponseEntity.success(); } - @PostMapping("/audit_apply") + @PostMapping("/auditApply") @Operation(summary = "店铺重新申请上线", description = "店铺重新申请上线") public ServerResponseEntity auditApply(@RequestBody OfflineHandleEventDTO offlineHandleEventDTO) { Long shopId = AuthUserContext.get().getTenantId(); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopRechargeController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopRechargeController.java index fc09a26..0b94f04 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopRechargeController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopRechargeController.java @@ -33,7 +33,7 @@ import java.util.Objects; * @author chiley */ @RestController("multishopRechargeController") -@RequestMapping("/m/shop_recharge") +@RequestMapping("/m/shopRecharge") @Tag(name = "multishop-商家余额充值") public class ShopRechargeController { @@ -125,7 +125,7 @@ public class ShopRechargeController { } @Operation(summary = "重新发送充值支付验证码--暂不调用，采用微信正扫不需要该接口", description = "通联独有") - @PostMapping("/resend_pay_sms") + @PostMapping("/resendPaySms") public ServerResponseEntity resendPaySms(@RequestBody AllinpayRechargeDTO rechargeDTO) { if (Objects.isNull(rechargeDTO.getBizOrderNo())) { throw new LuckException("充值订单号不能为空"); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopSubstituteSalesController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopSubstituteSalesController.java index 7114f73..86e9305 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopSubstituteSalesController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopSubstituteSalesController.java @@ -23,7 +23,7 @@ import java.util.Objects; * @date 2022-06-22 17:09:12 */ @RestController("multishopShopSubstituteSalesController") -@RequestMapping("/m/shop_substitute_sales") +@RequestMapping("/m/substituteSales") @Tag(name = "代销设置表") public class ShopSubstituteSalesController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserController.java index 11a929d..5916dbf 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserController.java @@ -38,7 +38,7 @@ import java.util.Objects; * @author tmerclub * @date 2020/09/02 */ -@RequestMapping("/m/shop_user") +@RequestMapping("/m/shopUser") @RestController @Tag(name = "店铺用户信息") public class ShopUserController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserRegisterController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserRegisterController.java index e0db46f..7b2290e 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserRegisterController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopUserRegisterController.java @@ -21,7 +21,7 @@ import java.util.Objects; * @author lth */ @RestController("multishopShopUserRegisterController") -@RequestMapping("/ua/shop_user_register") +@RequestMapping("/ua/shopUserRegister") @Tag(name = "multishop-商家注册") public class ShopUserRegisterController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopWithdrawCashController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopWithdrawCashController.java index c1823cb..e90703c 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopWithdrawCashController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/multishop/ShopWithdrawCashController.java @@ -21,7 +21,7 @@ import java.util.Objects; * @author tmerclub */ @RestController("multishopShopWithdrawCashController") -@RequestMapping("/m/shop_withdraw_cash") +@RequestMapping("/m/shopWithdrawApply") @Tag(name = "multishop-商家提现申请信息") public class ShopWithdrawCashController { @@ -68,7 +68,7 @@ public class ShopWithdrawCashController { } @Operation(summary = "重新发送提现支付验证码", description = "通联独有") - @PostMapping("/resend_pay_sms") + @PostMapping("/resendPaySms") public ServerResponseEntity resendPaySms(@RequestBody AllinpayShopWithdrawCashDTO allinpayShopWithdrawCashDTO) { if (Objects.isNull(allinpayShopWithdrawCashDTO.getBizOrderNo())) { throw new LuckException("提现订单号不能为空"); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/CompanyAuditingController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/CompanyAuditingController.java index efaa827..0582f2e 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/CompanyAuditingController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/CompanyAuditingController.java @@ -28,7 +28,7 @@ import java.util.Objects; * @date 2022/9/14 14:32 */ @RestController("platformCompanyAuditingController") -@RequestMapping("/p/shop_company_auditing") +@RequestMapping("/p/shopCompanyAuditing") @Tag(name = "platform-审核店铺工商信息") @Slf4j public class CompanyAuditingController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopAuditingController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopAuditingController.java index 66231da..876e1aa 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopAuditingController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopAuditingController.java @@ -40,7 +40,7 @@ import java.util.Objects; * @date 2021-02-01 17:10:35 */ @RestController("platformShopAuditingController") -@RequestMapping("/p/shop_auditing") +@RequestMapping("/p/shopAuditing") @Tag(name = "platform-平台审核信息") public class ShopAuditingController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopBankCardController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopBankCardController.java index aaa247e..0618884 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopBankCardController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopBankCardController.java @@ -27,7 +27,7 @@ import java.util.Objects; * @Date 2021/4/26 10:09 */ @RestController -@RequestMapping("/p/shop_bank_card") +@RequestMapping("/p/shopBankCard") @Tag(name = "platform-店铺银行卡信息") public class ShopBankCardController { @@ -47,9 +47,9 @@ public class ShopBankCardController { return ServerResponseEntity.success(shopBankCardVOList); } - @PostMapping("/allinpay_save_and_apply_shop") + @PostMapping("/allinpaySave") @Operation(summary = "通联支付--批量保存店铺银行卡信息并提交店铺审核信息", description = "批量保存店铺银行卡信息并提交店铺审核信息") - public ServerResponseEntity allinpaySaveAndApplyShop(@Valid @RequestBody AllinpayShopBankCardDTO allinpayShopBankCardDTO) { + public ServerResponseEntity allinpaySave(@Valid @RequestBody AllinpayShopBankCardDTO allinpayShopBankCardDTO) { Long shopId = allinpayShopBankCardDTO.getShopId(); if (Objects.isNull(shopId)) { throw new LuckException("店铺id不能为空"); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopDetailController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopDetailController.java index c4af9fc..f1eed8d 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopDetailController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/platform/ShopDetailController.java @@ -40,7 +40,7 @@ import java.util.Objects; * @date 2020-12-05 15:50:25 */ @RestController("platformShopDetailController") -@RequestMapping("/p/shop_detail") +@RequestMapping("/p/shopDetail") @Tag(name = "platform-店铺信息") public class ShopDetailController { @@ -114,7 +114,7 @@ public class ShopDetailController { return ServerResponseEntity.success(); } - @PutMapping("/update_password") + @PutMapping("/updatePassword") @Operation(summary = "更新店铺商家的登陆密码", description = "更新店铺商家的登陆密码") public ServerResponseEntity updatePassword(@RequestBody ShopAccountDTO shopAccountDTO) { // 暂时的home的店铺id diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/supplier/ApplyShopUserController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/supplier/ApplyShopUserController.java index ce2712b..3553937 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/supplier/ApplyShopUserController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/multishop/controller/supplier/ApplyShopUserController.java @@ -25,7 +25,7 @@ import java.util.Objects; * @Author lth * @Date 2021/5/12 20:27 */ -@RequestMapping("/s/apply_shop/shop_user") +@RequestMapping("/s/applyShop/shopUser") @RestController("supplierShopUserController") @Tag(name = "supplier-店铺用户信息") public class ApplyShopUserController { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/admin/SupplierCompanyController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/admin/SupplierCompanyController.java index be58c40..3f42ecb 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/admin/SupplierCompanyController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/admin/SupplierCompanyController.java @@ -41,16 +41,16 @@ public class SupplierCompanyController { @Autowired private SupplierDetailService supplierDetailService; - @GetMapping("/check_credit_code") + @GetMapping("/checkCreditCode") @Operation(summary = "检查统一信用码是否已存在", description = "检查统一信用码是否已存在") public ServerResponseEntity checkCreditCode(@RequestParam("creditCode") String creditCode, @RequestParam("supplierId") Long supplierId) { Boolean res = supplierCompanyService.checkCreditCode(creditCode, supplierId); return ServerResponseEntity.success(res); } - @PutMapping("/update_id_card_status") + @PutMapping("/updateCardCtatus") @Operation(summary = "更新影印件状态", description = "通联独有") - public ServerResponseEntity updateIdCardStatus(@RequestParam("supplierId") Long supplierId) { + public ServerResponseEntity updateCardStatus(@RequestParam("supplierId") Long supplierId) { if (!supplierAllinpayService.getIsAllinpay()) { return ServerResponseEntity.success(); } @@ -84,7 +84,7 @@ public class SupplierCompanyController { return ServerResponseEntity.success(); } - @PutMapping("/upload_id_card") + @PutMapping("/uploadCard") @Operation(summary = "重新上传影印件", description = "通联独有") public ServerResponseEntity uploadIdCard(@RequestBody SupplierCompanyDTO supplierCompanyDTO) { if (!supplierAllinpayService.getIsAllinpay()) { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/platform/SupplierDetailController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/platform/SupplierDetailController.java index 64138cf..911f874 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/platform/SupplierDetailController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/platform/SupplierDetailController.java @@ -120,7 +120,7 @@ public class SupplierDetailController { return ServerResponseEntity.success(); } - @PutMapping("/update_password") + @PutMapping("/updatePassword") @Operation(summary = "更新供应商账户的登录密码", description = "更新供应商账户的登录密码") public ServerResponseEntity updatePassword(@RequestBody SupplierAccountDTO supplierAccountDTO) { if (Objects.equals(supplierAccountDTO.getSupplierId(), Constant.ON_LINE_SUPPLIER_ID) && BooleanUtil.isFalse(permission)) { diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/CompanyAuditingController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/CompanyAuditingController.java index 054c828..5e6461e 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/CompanyAuditingController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/CompanyAuditingController.java @@ -30,7 +30,7 @@ public class CompanyAuditingController { private SupplierCompanyAuditingService supplierCompanyAuditingService; - @PostMapping("/apply_change_company_info") + @PostMapping("/applyChangeCompanyInfo") @Operation(summary = "申请变更工商信息", description = "申请变更工商信息") public ServerResponseEntity applyChangeCompanyInfo(@RequestBody @Valid SupplierCompanyDTO supplierCompanyDTO) { Long supplierId = AuthUserContext.get().getTenantId(); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/SupplierBankCardController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/SupplierBankCardController.java index 93b0645..bd86213 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/SupplierBankCardController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/SupplierBankCardController.java @@ -123,16 +123,16 @@ public class SupplierBankCardController { return ServerResponseEntity.success(); } - @PutMapping("/set_primary") + @PutMapping("/setPrimary") @Operation(summary = "设置为主账号", description = "设置为主账号") public ServerResponseEntity setPrimary(@RequestParam("supplierBankCardId") Long supplierBankCardId) { supplierBankCardService.setPrimaryBySupplierId(supplierBankCardId, AuthUserContext.get().getTenantId()); return ServerResponseEntity.success(); } - @PutMapping("/set_not_primary") + @PutMapping("/cancelPrimary") @Operation(summary = "取消主账号", description = "取消主账号") - public ServerResponseEntity setNotPrimary(@RequestParam("supplierBankCardId") Long supplierBankCardId) { + public ServerResponseEntity cancelPrimary(@RequestParam("supplierBankCardId") Long supplierBankCardId) { supplierBankCardService.setNotPrimaryBySupplierId(supplierBankCardId, AuthUserContext.get().getTenantId()); return ServerResponseEntity.success(); } diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/SupplierCompanyController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/SupplierCompanyController.java index a9031ea..c97c098 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/SupplierCompanyController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/SupplierCompanyController.java @@ -112,7 +112,7 @@ public class SupplierCompanyController { return ServerResponseEntity.success(supplierCompanyService.getSupplierCompanyBySupplierIdAndStatus(supplierId, status)); } - @PutMapping("/update_acct_protocol_no") + @PutMapping("/updateAcctProtocolNo") @Operation(summary = "更新供应商账户协议编号") @Parameters({ @Parameter(name = "signAcctType", description = "签约类型 1.个人 2.法人 3.企业"), diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/SupplierDetailController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/SupplierDetailController.java index 1c8164a..93dd035 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/SupplierDetailController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/SupplierDetailController.java @@ -134,7 +134,7 @@ public class SupplierDetailController { return ServerResponseEntity.success(); } - @PostMapping("/audit_apply") + @PostMapping("/auditApply") @Operation(summary = "供应商重新申请上线", description = "供应商重新申请上线") public ServerResponseEntity auditApply(@RequestBody OfflineHandleEventDTO offlineHandleEventDTO) { Long supplierId = AuthUserContext.get().getTenantId(); diff --git a/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/SupplierWithdrawCashController.java b/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/SupplierWithdrawCashController.java index c55fdcb..246dfd3 100644 --- a/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/SupplierWithdrawCashController.java +++ b/tmerclub-admin/src/main/java/com/tmerclub/cloud/supplier/controller/supplier/SupplierWithdrawCashController.java @@ -70,7 +70,7 @@ public class SupplierWithdrawCashController { } @Operation(summary = "重新发送提现支付验证码", description = "通联独有") - @PostMapping("/resend_pay_sms") + @PostMapping("/resendPaySms") public ServerResponseEntity resendPaySms(@RequestBody AllinpaySupplierWithdrawCashDTO allinpaySupplierWithdrawCashDTO) { if (Objects.isNull(allinpaySupplierWithdrawCashDTO.getBizOrderNo())) { throw new LuckException("提现订单号不能为空"); diff --git a/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/LoginController.java b/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/LoginController.java index dee77be..5d27e20 100644 --- a/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/LoginController.java +++ b/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/LoginController.java @@ -91,7 +91,7 @@ public class LoginController { return doLogin(authenticationDTO, LoginType.PASSWORD.value()); } - @PostMapping("/ua/login_with_code") + @PostMapping("/ua/loginByCode") @Operation(summary = "手机号+验证码登录(用于前端登录)", description = "通过手机号+验证码登录，还要携带用户的类型，也就是用户所在的系统") public ServerResponseEntity loginWithCode(@Valid @RequestBody LoginCodeDTO loginCode) { // 该接口是用户端在（pc、h5、小程序）使用 @@ -142,7 +142,7 @@ public class LoginController { return threeInOneLogin(mobile, maCodeAuthenticationDTO.getTempUid(), SocialType.MA.value()); } - @PostMapping("/ua/admin_login") + @PostMapping("/ua/login") @Operation(summary = "账号密码 + 验证码登录(用于后台登录)", description = "通过账号/手机号/用户名密码登录，还要携带用户的类型，也就是用户所在的系统") public ServerResponseEntity login( @Valid @RequestBody CaptchaAuthenticationDTO captchaAuthenticationDTO) { diff --git a/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/PasswordController.java b/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/PasswordController.java index 7e3b8ef..3274794 100644 --- a/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/PasswordController.java +++ b/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/PasswordController.java @@ -48,7 +48,7 @@ public class PasswordController { public static final String CHECK_UPDATE_SMS_FLAG = "checkUpdatePwdSmsFlag"; - @PutMapping("/update_password") + @PutMapping("/updatePassword") @Operation(summary = "更新密码", description = "更新当前用户的密码, 更新密码之后要退出登录，清理token") public ServerResponseEntity updatePassword(@Valid @RequestBody UpdatePasswordDTO updatePasswordDTO) { UidInfoBO uidInfoBO = AuthUserContext.get(); @@ -74,7 +74,7 @@ public class PasswordController { return ServerResponseEntity.success(); } - @PutMapping("/ua/forget_password") + @PutMapping("/ua/forgetPassword") @Operation(summary = "忘记密码", description = "通过验证码修改密码，更新密码之后要退出登录，清理token") public ServerResponseEntity password(@Valid @RequestBody ForgetPasswordDTO forgetPasswordDTO) { diff --git a/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/StationLoginController.java b/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/StationLoginController.java index 6e3d7f1..7cf0bb9 100644 --- a/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/StationLoginController.java +++ b/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/StationLoginController.java @@ -46,7 +46,7 @@ public class StationLoginController { private StationFeignClient stationFeignClient; - @PostMapping("/ua/station_login") + @PostMapping("/ua/stationLogin") @Operation(summary = "自提点账号密码(用于前端登录)", description = "通过账号/手机号/用户名密码登录") public ServerResponseEntity login(@Valid @RequestBody AuthenticationDTO authenticationDTO) { authenticationDTO.setSysType(SysTypeEnum.STATION.value()); diff --git a/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/WxMnpController.java b/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/WxMnpController.java index d43bb6a..b6fd8a4 100644 --- a/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/WxMnpController.java +++ b/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/WxMnpController.java @@ -19,14 +19,14 @@ import org.springframework.web.bind.annotation.RestController; */ @Tag(name = "微信小程序接口") @RestController -@RequestMapping("/ua/wx_mnp") +@RequestMapping("/ua/wxMnp") public class WxMnpController { @Autowired private WxConfig wxConfig; @Operation(summary = "获取小程序urlLink") - @GetMapping("/generate_url_link") + @GetMapping("/generateUrlLink") public ServerResponseEntity generateUrlLink(GenerateUrlLinkRequest generateUrlLinkRequest) { WxMaService wxMaService = wxConfig.getWxMaService(); String urlLink; diff --git a/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/admin/PasswordController.java b/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/admin/PasswordController.java index abbc1da..47f00c2 100644 --- a/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/admin/PasswordController.java +++ b/tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/admin/PasswordController.java @@ -35,7 +35,7 @@ import java.util.Objects; * @date 2021/01/29 */ @RestController("adminPasswordController") -@RequestMapping("/mp/password") +@RequestMapping("/mp/changePassword") @Tag(name = "管理后台密码修改") public class PasswordController { @@ -60,7 +60,7 @@ public class PasswordController { private Boolean permission; - @PutMapping("/update_password") + @PutMapping("/updatePassword") @Operation(summary = "更新密码", description = "更新当前用户的密码, 更新密码之后要退出登录，清理token") public ServerResponseEntity updatePassword(@Valid @RequestBody UpdatePasswordDTO updatePasswordDTO) { UidInfoBO uidInfoBO = AuthUserContext.get(); @@ -101,7 +101,7 @@ public class PasswordController { return ServerResponseEntity.success(); } - @PutMapping("/ua/forget_password") + @PutMapping("/ua/forgetPassword") @Operation(summary = "忘记密码", description = "通过验证码修改密码，更新密码之后要退出登录，清理token") public ServerResponseEntity password(@Valid @RequestBody ForgetPasswordDTO forgetPasswordDTO) { diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/OssController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/OssController.java index cf72b7a..cf812ea 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/OssController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/OssController.java @@ -28,7 +28,7 @@ public class OssController { @Autowired private AttachFileService attachFileService; - @GetMapping("/get_batch_pre_sign_url") + @GetMapping("/getBatchPreSignUrl") @Operation(summary = "批量获取预签名url(s3协议)") @Parameter(name = "fileNames", description = "文件名集合") public ServerResponseEntity> getBatchPreSignUrl(@RequestParam List fileNames) { diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/QrcodeTicketController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/QrcodeTicketController.java index 0f8c583..f519831 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/QrcodeTicketController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/QrcodeTicketController.java @@ -33,7 +33,7 @@ import java.util.Objects; */ @RestController -@RequestMapping("/ua/qrcode_ticket") +@RequestMapping("/ua/qrcodeTicket") @Tag(name = "二维码数据") public class QrcodeTicketController { @@ -45,7 +45,7 @@ public class QrcodeTicketController { /** * 小程序二维码 */ - @GetMapping("/mini_qrcode") + @GetMapping("/smallQrcode") @Operation(summary = "小程序二维码获取", description = "获取小程序二维码，返回二维码图片流，小程序跳到二维码的页面之后，" + "需要根据获取的scene请求获取线上保存的content，为什么要这么麻烦，以为scene的内容有限，只能在数据库保存") @Parameters({ @@ -79,7 +79,7 @@ public class QrcodeTicketController { /** * 根据Ticket获取content */ - @GetMapping("/get_content") + @GetMapping("/getContent") @Operation(summary = "根据Ticket获取保存的内容", description = "小程序里的scene就是你要的Ticket咯") @Parameters(@Parameter(name = "ticket", description = "小程序里的scene就是你要的Ticket咯", required = true)) public ServerResponseEntity getContent(String ticket) { diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/admin/AttachFileController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/admin/AttachFileController.java index c2866c8..7f9955f 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/admin/AttachFileController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/admin/AttachFileController.java @@ -32,7 +32,7 @@ import java.util.Objects; * @date 2020-11-21 10:21:40 */ @RestController("adminAttachFileController") -@RequestMapping("/mp/attach_file") +@RequestMapping("/mp/attachFile") @Tag(name = "admin-上传文件记录表") public class AttachFileController { @@ -65,7 +65,7 @@ public class AttachFileController { /** * 更改文件名或分组 */ - @PutMapping("/update_file") + @PutMapping("/updateFile") @Operation(summary = "更新文件记录", description = "更新文件记录") public ServerResponseEntity updateFileName(@RequestBody AttachFileDTO attachFileDto) { if (Objects.isNull(attachFileDto.getFileName())) { diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/admin/AttachFileGroupController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/admin/AttachFileGroupController.java index 96b7e05..4b6c307 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/admin/AttachFileGroupController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/admin/AttachFileGroupController.java @@ -24,7 +24,7 @@ import java.util.Objects; * @date 2020-12-04 16:15:02 */ @RestController("adminAttachFileGroupController") -@RequestMapping("/mp/attach_file_group") +@RequestMapping("/mp/attachFileGroup") @Tag(name = "admin-文件分组") public class AttachFileGroupController { @Autowired diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/admin/NotifyLogController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/admin/NotifyLogController.java index e9b3160..fe53f0e 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/admin/NotifyLogController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/admin/NotifyLogController.java @@ -32,7 +32,7 @@ import java.util.Objects; * @date 2020-05-12 08:21:24 */ @RestController("adminNotifyLogController") -@RequestMapping("/mp/notify_log") +@RequestMapping("/mp/notifyLog") @Tag(name = "商家端和供应商端消息通知") public class NotifyLogController { @@ -43,7 +43,7 @@ public class NotifyLogController { /** * 查询用户未读消息数量 */ - @GetMapping("/unread_count") + @GetMapping("/unreadCount") @Operation(summary = "查询用户未读消息数量", description = "查询用户未读消息数量") public ServerResponseEntity getNotifyCount() { Long tenantId = AuthUserContext.get().getTenantId(); @@ -54,7 +54,7 @@ public class NotifyLogController { /** * 查询未读消息列表 */ - @GetMapping("/unread_count_list") + @GetMapping("/getUnReadCountList") @Operation(summary = "查询消息列表", description = "查询消息列表") @Parameter(name = "status", description = "状态 0未读 1已读 不传查询全部按照已读未读排序") public ServerResponseEntity> getUnReadCountList(@Valid PageDTO page, NotifyLogDTO notifyLogDTO) { @@ -91,7 +91,7 @@ public class NotifyLogController { return ServerResponseEntity.success(notifyLogVO); } - @PutMapping("/is_read") + @PutMapping("/isRead") @Operation(summary = "批量设置消息为已读状态 ", description = "批量设置消息为已读状态") @Parameters({ @Parameter(name = "logIds", description = "消息id", required = true), diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/admin/NotifyTemplateRemindController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/admin/NotifyTemplateRemindController.java index 5e69f0f..6d126e9 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/admin/NotifyTemplateRemindController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/admin/NotifyTemplateRemindController.java @@ -27,7 +27,7 @@ import java.util.Objects; * @date 2022-10-24 13:48:38 */ @RestController("adminNotifyTemplateRemindController") -@RequestMapping("/mp/notify_template_remind") +@RequestMapping("/mp/notifyRemind") @Tag(name = "商家端和供应商端消息提醒设置") public class NotifyTemplateRemindController { diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/app/AttachFileController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/app/AttachFileController.java index c1b16ec..1a37dd8 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/app/AttachFileController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/app/AttachFileController.java @@ -19,14 +19,14 @@ import org.springframework.web.bind.annotation.RestController; * @date 2020-11-21 10:21:40 */ @RestController("appAttachFileController") -@RequestMapping("/attach_file") +@RequestMapping("/attachFile") @Tag(name = "app-文件记录表") public class AttachFileController { @Autowired private AttachFileService attachFileService; - @GetMapping("/get_file_by_id") + @GetMapping("/getFileById") @Operation(summary = "根据文件id获取文件信息") public ServerResponseEntity getFileById(Long fileId) { AttachFileVO attachFileVO = attachFileService.getById(fileId); diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/app/NotifyLogController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/app/NotifyLogController.java index 3bfca0e..5f8b554 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/app/NotifyLogController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/app/NotifyLogController.java @@ -31,7 +31,7 @@ import java.util.Objects; * @date 2020-05-12 08:21:24 */ @RestController("appNotifyLogController") -@RequestMapping("/notify_log") +@RequestMapping("/notifyLog") @Tag(name = "消息通知") public class NotifyLogController { @@ -43,7 +43,7 @@ public class NotifyLogController { /** * 查询用户未读消息数量 */ - @GetMapping("/unread_count") + @GetMapping("/unreadCount") @Operation(summary = "查询用户未读消息数量", description = "查询用户未读消息数量") public ServerResponseEntity getNotifyCount() { Long userId = AuthUserContext.get().getUserId(); @@ -57,7 +57,7 @@ public class NotifyLogController { /** * 查询未读消息列表 */ - @GetMapping("/unread_count_list") + @GetMapping("/getUnReadCountList") @Operation(summary = "查询消息列表", description = "查询消息列表") @Parameter(name = "status", description = "状态 0未读 1已读 不传查询全部按照已读未读排序") public ServerResponseEntity> getUnReadCountList(@Valid PageDTO page, Integer status) { diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/app/NotifyTemplateRemindController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/app/NotifyTemplateRemindController.java index 0799ed5..1e1c623 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/app/NotifyTemplateRemindController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/app/NotifyTemplateRemindController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; * @date 2022-10-24 13:48:38 */ @RestController("appNotifyTemplateRemindController") -@RequestMapping("/notify_template_remind") +@RequestMapping("/notifyRemind") @Tag(name = "消息提醒设置") public class NotifyTemplateRemindController { diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/multishop/AttachFileController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/multishop/AttachFileController.java index 9953849..4059a6f 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/multishop/AttachFileController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/multishop/AttachFileController.java @@ -23,7 +23,7 @@ import java.util.Objects; * @Date 2021/6/1 15:20 */ @RestController("multishopAttachFileController") -@RequestMapping("/m/attach_file") +@RequestMapping("/m/attachFile") @Tag(name = "multishop-上传文件记录表") public class AttachFileController { @@ -31,7 +31,7 @@ public class AttachFileController { private AttachFileService attachFileService; - @DeleteMapping("/delete_by_ids") + @DeleteMapping("/deleteByIds") @Operation(summary = "根据文件id列表批量删除文件记录", description = "根据文件id列表批量删除文件记录") public ServerResponseEntity deleteByIds(@RequestBody List ids) { Long shopId = AuthUserContext.get().getTenantId(); @@ -39,7 +39,7 @@ public class AttachFileController { return ServerResponseEntity.success(); } - @PutMapping("/batch_move") + @PutMapping("/batchMove") @Operation(summary = "根据文件id列表与分组id批量移动文件", description = "根据文件id列表与分组id批量移动文件") public ServerResponseEntity batchMove(@RequestBody List ids, @RequestParam(value = "groupId", required = false, defaultValue = "") Long groupId) { Long shopId = AuthUserContext.get().getTenantId(); @@ -48,7 +48,7 @@ public class AttachFileController { return ServerResponseEntity.success(); } - @GetMapping("/get_file_by_id") + @GetMapping("/getFileById") @Operation(summary = "根据文件id获取文件信息") public ServerResponseEntity getFileById(Long fileId) { AttachFileVO attachFileVO = attachFileService.getById(fileId); @@ -59,7 +59,7 @@ public class AttachFileController { return ServerResponseEntity.success(attachFileVO); } - @PostMapping("/save_pdf_file") + @PostMapping("/savePdfFile") @Operation(summary = "保存商家发票") public ServerResponseEntity savePdfFile(@RequestBody AttachFileDTO attachFileDTO) { AttachFile attachFile = BeanUtil.map(attachFileDTO, AttachFile.class); diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/multishop/SmsController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/multishop/SmsController.java index 0881a2b..335d203 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/multishop/SmsController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/multishop/SmsController.java @@ -42,7 +42,7 @@ public class SmsController { private ShopUserFeignClient shopUserFeignClient; public static final String CHECK_UPDATE_SMS_FLAG = "checkUpdatePwdSmsFlag"; - @PutMapping("/send_withdraw_code") + @PutMapping("/sendWithdrawCode") @Operation(summary = "给商家手机号发送申请提现验证码", description = "给商家手机号发送申请提现验证码，返回商家手机号") public ServerResponseEntity applyShopSms() { Integer sysType = AuthUserContext.get().getSysType(); @@ -54,9 +54,9 @@ public class SmsController { return ServerResponseEntity.success(merchantInfoRes.getData().getPhone()); } - @PutMapping("/send_auth_shop_user_code") + @PutMapping("/sendAuthShopUserCode") @Operation(summary = "发送认证店铺员工/子账号验证码", description = "发送认证店铺员工/子账号验证码") - public ServerResponseEntity sendAuthShopUserSms(@RequestBody SendAndCheckSmsDTO sendAndCheckSmsDTO) { + public ServerResponseEntity sendAuthShopUserCode(@RequestBody SendAndCheckSmsDTO sendAndCheckSmsDTO) { String phone = sendAndCheckSmsDTO.getMobile(); if (StrUtil.isBlank(phone) || !PrincipalUtil.isMobile(phone)) { throw new LuckException("手机号格式不正确"); @@ -68,7 +68,7 @@ public class SmsController { /** * 发送忘记密码验证码接口 */ - @PostMapping("/ua/update_pwd") + @PostMapping("/ua/sendUpdatePwdCode") @Operation(summary = "发送忘记密码验证码接口", description = "发送忘记密码验证码接口") public ServerResponseEntity sendUpdatePwdCode(@RequestBody SendAndCheckSmsDTO sendSmsParam) { if (Objects.equals(shopUserFeignClient.countAccoutByMobile(sendSmsParam.getMobile()).getData(), 0)) { @@ -79,9 +79,9 @@ public class SmsController { return ServerResponseEntity.success(); } - @PutMapping("/ua/check_update_pwd") + @PutMapping("/ua/checkUpdatePwd") @Operation(summary = "校验用户忘记密码时的验证码", description = "校验验证码返回校验成功的标识") - public ServerResponseEntity checkUpdatePwdSms(@Valid @RequestBody SendAndCheckSmsDTO sendAndCheckSmsDto) { + public ServerResponseEntity checkUpdatePwd(@Valid @RequestBody SendAndCheckSmsDTO sendAndCheckSmsDto) { // 每个ip每分钟只能发十个注册的验证码，免得接口被利用 String mobile = sendAndCheckSmsDto.getMobile(); if (!smsLogService.checkValidCode(mobile, sendAndCheckSmsDto.getValidCode(), SendTypeEnum.UPDATE_PASSWORD)) { diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/platform/AttachFileController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/platform/AttachFileController.java index 9fcf5bc..95b5fd7 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/platform/AttachFileController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/platform/AttachFileController.java @@ -17,14 +17,14 @@ import java.util.List; * @Date 2021/6/1 15:45 */ @RestController("platformAttachFileController") -@RequestMapping("/p/attach_file") +@RequestMapping("/p/attachFile") @Tag(name = "platform-上传文件记录表") public class AttachFileController { @Autowired private AttachFileService attachFileService; - @DeleteMapping("/delete_by_ids") + @DeleteMapping("/deleteByIds") @Operation(summary = "根据文件id列表批量删除文件记录", description = "根据文件id列表批量删除文件记录") public ServerResponseEntity deleteByIds(@RequestBody List ids) { Long shopId = Constant.PLATFORM_SHOP_ID; @@ -32,7 +32,7 @@ public class AttachFileController { return ServerResponseEntity.success(); } - @PutMapping("/batch_move") + @PutMapping("/batchMove") @Operation(summary = "根据文件id列表与分组id批量移动文件", description = "根据文件id列表与分组id批量移动文件") public ServerResponseEntity batchMove(@RequestBody List ids, @RequestParam(value = "groupId", required = false, defaultValue = "") Long groupId) { Long shopId = Constant.PLATFORM_SHOP_ID; diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/platform/NotifyLogController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/platform/NotifyLogController.java index 6aa930d..201233b 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/platform/NotifyLogController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/platform/NotifyLogController.java @@ -25,7 +25,7 @@ import java.util.Objects; * @date 2021-05-14 09:35:32 */ @RestController("platformNotifyLogController") -@RequestMapping("/p/notify_log") +@RequestMapping("/p/notifyLog") @Tag(name = "消息日志") public class NotifyLogController { diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/platform/NotifyTemplateController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/platform/NotifyTemplateController.java index 8e59248..8d7ad41 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/platform/NotifyTemplateController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/platform/NotifyTemplateController.java @@ -30,7 +30,7 @@ import java.util.Objects; * @date 2021-05-14 09:35:32 */ @RestController("platformNotifyTemplateController") -@RequestMapping("/p/notify_template") +@RequestMapping("/p/notifyTemplate") @Tag(name = "platform-消息通知配置") public class NotifyTemplateController { diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/platform/NotifyTemplateTagController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/platform/NotifyTemplateTagController.java index f109a60..adc0826 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/platform/NotifyTemplateTagController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/platform/NotifyTemplateTagController.java @@ -28,7 +28,7 @@ import java.util.Objects; * @date 2021-05-20 11:09:53 */ @RestController("platformNotifyTemplateTagController") -@RequestMapping("/p/notify_template_tag") +@RequestMapping("/p/notifyTemplate_tag") @Tag(name = "platform-标签消息") public class NotifyTemplateTagController { diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/supplier/AttachFileController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/supplier/AttachFileController.java index 13d8d13..d2c9102 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/supplier/AttachFileController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/supplier/AttachFileController.java @@ -29,7 +29,7 @@ import java.util.Objects; * @Date 2021/6/1 15:20 */ @RestController("supplierAttachFileController") -@RequestMapping("/s/attach_file") +@RequestMapping("/s/attachFile") @Tag(name = "supplier-上传文件记录表") public class AttachFileController { @@ -39,7 +39,7 @@ public class AttachFileController { private Boolean permission; - @DeleteMapping("/delete_by_ids") + @DeleteMapping("/deleteByIds") @Operation(summary = "根据文件id列表批量删除文件记录", description = "根据文件id列表批量删除文件记录") public ServerResponseEntity deleteByIds(@RequestBody List ids) { Long shopId = AuthUserContext.get().getTenantId(); @@ -47,7 +47,7 @@ public class AttachFileController { return ServerResponseEntity.success(); } - @PutMapping("/batch_move") + @PutMapping("/batchMove") @Operation(summary = "根据文件id列表与分组id批量移动文件", description = "根据文件id列表与分组id批量移动文件") public ServerResponseEntity batchMove(@RequestBody List ids, @RequestParam(value = "groupId", required = false, defaultValue = "") Long groupId) { Long shopId = AuthUserContext.get().getTenantId(); @@ -56,7 +56,7 @@ public class AttachFileController { return ServerResponseEntity.success(); } - @GetMapping("/get_file_by_id") + @GetMapping("/getFileById") @Operation(summary = "根据文件id获取文件信息") public ServerResponseEntity getFileById(Long fileId) { AttachFileVO attachFileVO = attachFileService.getById(fileId); @@ -67,7 +67,7 @@ public class AttachFileController { return ServerResponseEntity.success(attachFileVO); } - @PostMapping("/save_pdf_file") + @PostMapping("/savePdfFile") @Operation(summary = "保存商家发票") public ServerResponseEntity savePdfFile(@RequestBody AttachFileDTO attachFileDTO) { AttachFile attachFile = BeanUtil.map(attachFileDTO, AttachFile.class); diff --git a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/supplier/SmsController.java b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/supplier/SmsController.java index 50707f0..a8aea04 100644 --- a/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/supplier/SmsController.java +++ b/tmerclub-biz/src/main/java/com/tmerclub/cloud/biz/controller/supplier/SmsController.java @@ -44,9 +44,9 @@ public class SmsController { public static final String UPDATE_PWD_SMS_FLAG = "updatePwdSmsFlag"; - @PutMapping("/send_withdraw_code") + @PutMapping("/sendWithdrawCode") @Operation(summary = "给供应商手机号发送申请提现验证码", description = "给供应商手机号发送申请提现验证码，返回供应商手机号") - public ServerResponseEntity applyShopSms() { + public ServerResponseEntity sendWithdrawCode() { Long shopId = AuthUserContext.get().getTenantId(); Integer sysType = AuthUserContext.get().getSysType(); ServerResponseEntity supplierInfoRes = accountFeignClient.getAccountInfoByTenantId(shopId, sysType); @@ -57,9 +57,9 @@ public class SmsController { return ServerResponseEntity.success(supplierInfoRes.getData().getPhone()); } - @PutMapping("/send_auth_shop_user_code") + @PutMapping("/sendAuthShopUserCode") @Operation(summary = "发送认证店铺员工/子账号验证码", description = "发送认证店铺员工/子账号验证码") - public ServerResponseEntity sendAuthShopUserSms(@RequestBody SendAndCheckSmsDTO sendAndCheckSmsDTO) { + public ServerResponseEntity sendAuthShopUserCode(@RequestBody SendAndCheckSmsDTO sendAndCheckSmsDTO) { String phone = sendAndCheckSmsDTO.getMobile(); if (StrUtil.isBlank(phone) || !PrincipalUtil.isMobile(phone)) { throw new LuckException("手机号格式不正确"); @@ -71,7 +71,7 @@ public class SmsController { /** * 发送忘记密码验证码接口 */ - @PostMapping("/ua/update_pwd") + @PostMapping("/ua/sendUpdatePwdCode") @Operation(summary = "发送忘记密码验证码接口", description = "发送忘记密码验证码接口") public ServerResponseEntity sendUpdatePwdCode(@RequestBody SendAndCheckSmsDTO sendSmsParam) { if (Objects.equals(supplierUserFeignClient.countAccoutByMobile(sendSmsParam.getMobile()).getData(), 0)) { @@ -82,9 +82,9 @@ public class SmsController { return ServerResponseEntity.success(); } - @PutMapping("/ua/check_update_pwd") + @PutMapping("/ua/checkUpdatePwd") @Operation(summary = "校验用户忘记密码时的验证码", description = "校验验证码返回校验成功的标识") - public ServerResponseEntity checkUpdatePwdSms(@Valid @RequestBody SendAndCheckSmsDTO sendAndCheckSmsDto) { + public ServerResponseEntity checkUpdatePwd(@Valid @RequestBody SendAndCheckSmsDTO sendAndCheckSmsDto) { // 每个ip每分钟只能发十个注册的验证码，免得接口被利用 if (!smsLogService.checkValidCode(sendAndCheckSmsDto.getMobile(), sendAndCheckSmsDto.getValidCode(), SendTypeEnum.UPDATE_PASSWORD)) { // 验证码有误或已过期 diff --git a/tmerclub-common/tmerclub-common-security/src/main/java/com/tmerclub/cloud/common/security/adapter/AuthConfigAdapter.java b/tmerclub-common/tmerclub-common-security/src/main/java/com/tmerclub/cloud/common/security/adapter/AuthConfigAdapter.java index 413fa21..035cc25 100644 --- a/tmerclub-common/tmerclub-common-security/src/main/java/com/tmerclub/cloud/common/security/adapter/AuthConfigAdapter.java +++ b/tmerclub-common/tmerclub-common-security/src/main/java/com/tmerclub/cloud/common/security/adapter/AuthConfigAdapter.java @@ -60,7 +60,7 @@ public interface AuthConfigAdapter { /** * 退出登录uri */ - String LOGIN_OUT_URI = "/ma/login_out"; + String LOGIN_OUT_URI = "/ma/loginOut"; /** * 需要授权登陆的路径 diff --git a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/admin/CustomerAnalysisController.java b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/admin/CustomerAnalysisController.java index 0e21ce5..ae200bb 100644 --- a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/admin/CustomerAnalysisController.java +++ b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/admin/CustomerAnalysisController.java @@ -32,7 +32,7 @@ import java.util.Objects; */ @Tag(name = "顾客分析接口") @RestController("adminCustomerAnalysisController") -@RequestMapping("/mp/customer_analysis") +@RequestMapping("/mp/customerAnalysis") public class CustomerAnalysisController { @Autowired @@ -42,7 +42,7 @@ public class CustomerAnalysisController { * 会员分析，会员概况 */ @Operation(summary = "会员分析，会员概况", description = "会员分析，会员概况") - @GetMapping("/get_member_survey") + @GetMapping("/getMemberSurvey") public ServerResponseEntity getMemberSurvey(MemberReqDTO param) { MemberSurveyRespVO memberSurveyRespVO = customerAnalysisService.getMemberSurvey(param); return ServerResponseEntity.success(memberSurveyRespVO); @@ -52,7 +52,7 @@ public class CustomerAnalysisController { * 会员分析，会员人数趋势/ 会员占比趋势 */ @Operation(summary = "会员分析，会员人数趋势/ 会员占比趋势", description = "会员分析，会员人数趋势/ 会员占比趋势") - @GetMapping("/get_member_trend") + @GetMapping("/getMemberTrend") public ServerResponseEntity> getMemberTrend(MemberReqDTO param) { List resList = customerAnalysisService.getMemberTrend(param); return ServerResponseEntity.success(resList); @@ -62,7 +62,7 @@ public class CustomerAnalysisController { * 会员分析，会员贡献价值分析 */ @Operation(summary = "会员分析，会员贡献价值分析", description = "会员分析，会员贡献价值分析") - @GetMapping("/get_member_vontribute_value") + @GetMapping("/getMemberContributeValue") public ServerResponseEntity getMemberContributeValue(MemberReqDTO param) { MemberContributeRespVO contributeRespVO = customerAnalysisService.getMemberContributeValue(param); return ServerResponseEntity.success(contributeRespVO); @@ -71,7 +71,7 @@ public class CustomerAnalysisController { /** * 会员分析，新老会员成交分析 */ - @GetMapping("/get_member_deal") + @GetMapping("/getMemberDeal") @Operation(summary = "会员分析，新老会员成交分析", description = "会员分析，新老会员成交分析") public ServerResponseEntity getMemberDeal(MemberReqDTO param) { MemberDealRespVO respParam = customerAnalysisService.getMemberDeal(param); @@ -82,7 +82,7 @@ public class CustomerAnalysisController { * 客户分析，客户留存分析 */ @Operation(summary = "客户分析-客户留存分析", description = "客户分析，客户留存分析,不做周留存数据") - @GetMapping("/get_customer_retained") + @GetMapping("/getCustomerRetained") public ServerResponseEntity> getCustomerRetained(CustomerRetainedDTO customerRetainedDTO) { // Integer dateType = customerRetainedDTO.getDateType(); @@ -97,7 +97,7 @@ public class CustomerAnalysisController { return ServerResponseEntity.success(respList); } - @GetMapping("/member_trend_export") + @GetMapping("/memberTrendExport") @Operation(summary = "导出excel", description = "导出导出会员分析，会员人数趋势/ 会员占比趋势") public ServerResponseEntity memberTrendExport(HttpServletResponse response, MemberReqDTO param) { List list = customerAnalysisService.listMemberTrend(param); diff --git a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/admin/ProductAnalyseController.java b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/admin/ProductAnalyseController.java index f86a383..0c9cc67 100644 --- a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/admin/ProductAnalyseController.java +++ b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/admin/ProductAnalyseController.java @@ -25,14 +25,14 @@ import java.util.Objects; * @date 2021-05-21 15:25:19 */ @RestController -@RequestMapping("/mp/product_analyse") +@RequestMapping("/mp/productAnalyse") @Tag(name = "admin流量分析—商品分析") public class ProductAnalyseController { @Autowired private ProductAnalyseService productAnalyseService; - @GetMapping("/get_single_prod_trend") + @GetMapping("/getSingleProdTrend") @Operation(summary = "获得单个商品趋势图") public ServerResponseEntity> getSingleProdTrend(SingleProdTrendDTO singleProdTrendDTO) { UidInfoBO uidInfoBO = AuthUserContext.get(); diff --git a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/multishop/FormController.java b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/multishop/FormController.java index c29d799..8259520 100644 --- a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/multishop/FormController.java +++ b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/multishop/FormController.java @@ -89,14 +89,14 @@ public class FormController { return ServerResponseEntity.success(); } - @GetMapping("/get_form_item") + @GetMapping("/getFormItem") @Operation(summary = "获取报表项列表", description = "获取报表项列表") public ServerResponseEntity> getFormItem() { List formItemEnumList = formService.getFormItem(2, I18nMessage.getLang()); return ServerResponseEntity.success(formItemEnumList); } - @GetMapping("/form_excel") + @GetMapping("/formExcel") @Operation(summary = "根据报表id生成对应的报表统计数据", description = "根据报表id生成对应的报表统计数据") public void formExcel(@RequestParam("formId") Long formId, HttpServletResponse response) { Form form = formService.getByFormId(formId); @@ -108,7 +108,7 @@ public class FormController { ExcelUtil.soleExcel(response, list, form.getFormName(), FormExcelVO.MERGE_ROW_INDEX, FormExcelVO.MERGE_COLUMN_INDEX, excelParam.getFormItemNames(), FormExcelVO.class); } - @GetMapping("/get_recommend_form_list") + @GetMapping("/getRecommendFormList") @Operation(summary = "获取全部推荐报表", description = "获取全部推荐报表") public ServerResponseEntity> getRecommendFormList() { List formList = formService.getRecommendFormList(); diff --git a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/multishop/ProductAnalyseController.java b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/multishop/ProductAnalyseController.java index 7ca8534..3c70184 100644 --- a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/multishop/ProductAnalyseController.java +++ b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/multishop/ProductAnalyseController.java @@ -24,14 +24,14 @@ import org.springframework.web.bind.annotation.RestController; * @date 2021-05-21 15:25:19 */ @RestController("multishopProductAnalyseController") -@RequestMapping("/m/product_analyse") +@RequestMapping("/m/productAnalyse") @Tag(name = "流量分析—商品分析") public class ProductAnalyseController { @Autowired private ProductAnalyseService productAnalyseService; - @GetMapping("/get_product_effect") + @GetMapping("/getProductEffect") @Operation(summary = "获取商家端商品洞察数据", description = "获取商品洞察数据") public ServerResponseEntity> getProductEffect(@Valid PageDTO pageDTO, ProdEffectDTO prodEffectDTO) { prodEffectDTO.setShopId(AuthUserContext.get().getTenantId()); diff --git a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/platform/FlowAnalysisController.java b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/platform/FlowAnalysisController.java index e08151f..20f093c 100644 --- a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/platform/FlowAnalysisController.java +++ b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/platform/FlowAnalysisController.java @@ -28,7 +28,7 @@ import java.util.List; * @date 2021-06-02 */ @RestController -@RequestMapping("/p/flow_analysis") +@RequestMapping("/p/flowAnalysis") @Tag(name = "platform-流量概括") public class FlowAnalysisController { @@ -51,7 +51,7 @@ public class FlowAnalysisController { /** * 流量总览 */ - @GetMapping("/flow_all") + @GetMapping("/flowAll") @Operation(summary = "流量总览", description = "流量总览") public ServerResponseEntity page(FlowAnalysisDTO flowAnalysisDTO) { //获取时间范围内的统计数据 @@ -62,7 +62,7 @@ public class FlowAnalysisController { /** * 流量趋势 */ - @GetMapping("/flow_trend") + @GetMapping("/flowTrend") @Operation(summary = "流量趋势", description = "流量趋势") public ServerResponseEntity> flowTrend(FlowAnalysisDTO flowAnalysisDTO) { // 获取开始和结束时间 @@ -73,14 +73,14 @@ public class FlowAnalysisController { /** * 流量来源构成 */ - @GetMapping("/flow_sour") + @GetMapping("/flowSour") @Operation(summary = "流量来源构成", description = "流量来源构成") public ServerResponseEntity> flowSour(FlowAnalysisDTO flowAnalysisDTO) { List flowAnalysisDtoList = flowUserAnalysisService.flowSour(flowAnalysisDTO); return ServerResponseEntity.success(flowAnalysisDtoList); } - @GetMapping("/analysis_data_export") + @GetMapping("/analysisDataExport") @Operation(summary = "导出excel", description = "导出流量总览") public ServerResponseEntity analysisDataExport(HttpServletResponse response, FlowAnalysisDTO flowAnalysisDTO) { List list = flowUserAnalysisService.listFlowAnalysisDataExcel(flowAnalysisDTO); @@ -88,14 +88,14 @@ public class FlowAnalysisController { return ServerResponseEntity.success(); } - @GetMapping("/flow_trend_export") + @GetMapping("/flowTrendExport") @Operation(summary = "导出excel", description = "导出流量趋势") public ServerResponseEntity flowTrendExport(HttpServletResponse response, FlowAnalysisDTO flowAnalysisDTO) { flowUserAnalysisService.exportFlowTrend(response, flowAnalysisDTO); return ServerResponseEntity.success(); } - @GetMapping("/flow_sour_export") + @GetMapping("/flowSourExport") @Operation(summary = "导出excel", description = "导出成交转换") public ServerResponseEntity flowSourExport(HttpServletResponse response, FlowAnalysisDTO flowAnalysisDTO) { List list = flowUserAnalysisService.listFlowSourDataExcel(flowAnalysisDTO); diff --git a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/platform/FormController.java b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/platform/FormController.java index 9b80753..bfc0744 100644 --- a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/platform/FormController.java +++ b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/platform/FormController.java @@ -105,7 +105,7 @@ public class FormController { return ServerResponseEntity.success(); } - @GetMapping("/get_form_item") + @GetMapping("/getFormItem") @Operation(summary = "获取报表项列表", description = "获取报表项列表") @Parameter(name = "type", description = "1:平台端 2：商家端") public ServerResponseEntity> getFormItem(@RequestParam("type") Integer type) { @@ -113,7 +113,7 @@ public class FormController { return ServerResponseEntity.success(formItemEnumList); } - @GetMapping("/form_excel") + @GetMapping("/formExcel") @Operation(summary = "生成报表", description = "生成报表") public void formExcel(@RequestParam("formId") Long formId, HttpServletResponse response) { Form form = formService.getByFormId(formId); @@ -125,14 +125,14 @@ public class FormController { ExcelUtil.soleExcel(response, list, form.getFormName(), FormExcelVO.MERGE_ROW_INDEX, FormExcelVO.MERGE_COLUMN_INDEX, excelParam.getFormItemNames(), FormExcelVO.class); } - @GetMapping("/get_recommend_form_page") + @GetMapping("/getRecommendFormPage") @Operation(summary = "分页获取推荐报表", description = "分页获取推荐报表") public ServerResponseEntity> getRecommendFormPage(FormDTO form, PageDTO page) { PageVO
formPage = formService.getRecommendFormPage(page, form); return ServerResponseEntity.success(formPage); } - @GetMapping("/get_recommend_form_list") + @GetMapping("/getRecommendFormList") @Operation(summary = "获取推荐报表", description = "获取推荐报表") public ServerResponseEntity> getRecommendFormList() { List formList = formService.getRecommendFormList(); diff --git a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/platform/ProductAnalyseController.java b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/platform/ProductAnalyseController.java index f623c33..2e9627e 100644 --- a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/platform/ProductAnalyseController.java +++ b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/platform/ProductAnalyseController.java @@ -33,21 +33,21 @@ import java.util.List; * @date 2021-05-21 15:25:19 */ @RestController("platformProductAnalyseController") -@RequestMapping("/p/product_analyse") +@RequestMapping("/p/productAnalyse") @Tag(name = "platform-商品分析") public class ProductAnalyseController { @Autowired private ProductAnalyseService productAnalyseService; - @GetMapping("/get_product_effect") + @GetMapping("/getProductEffect") @Operation(summary = "获取平台端商品洞察数据", description = "获取商品洞察数据") public ServerResponseEntity> getProductEffect(@Valid PageDTO pageDTO, ProdEffectDTO prodEffectDTO) { prodEffectDTO.setLang(I18nMessage.getLang()); return ServerResponseEntity.success(productAnalyseService.getProductEffect(pageDTO,prodEffectDTO)); } - @GetMapping("/prod_effect_export") + @GetMapping("/prodEffectExport") @Operation(summary = "导出excel", description = "导出商品洞察数据") public ServerResponseEntity prodEffectExport(HttpServletResponse response, ProdEffectDTO prodEffectDTO) { prodEffectDTO.setLang(I18nMessage.getLang()); @@ -59,13 +59,13 @@ public class ProductAnalyseController { return ServerResponseEntity.success(); } - @GetMapping("/list_shop_ranking_by_flow") + @GetMapping("/shopRankIngByFlow") @Operation(summary = "获取店铺流量排行榜", description = "获取店铺流量排行榜") @Parameters({ @Parameter(name = "dayCount", description = "天数（几天内的排行榜）"), @Parameter(name = "limit", description = "排行榜条数") }) - public ServerResponseEntity> listShopRankIngByFlow(@RequestParam(value = "dayCount", defaultValue = "30") Integer dayCount, + public ServerResponseEntity> shopRankIngByFlow(@RequestParam(value = "dayCount", defaultValue = "30") Integer dayCount, @RequestParam(value = "limit", defaultValue = "10") Integer limit) { List shopFlowInfoVOList = productAnalyseService.listShopRankIngByFlow(DateUtil.endOfDay(DateUtil.date()), dayCount, limit); return ServerResponseEntity.success(shopFlowInfoVOList); diff --git a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/platform/UserVisitAnalysisController.java b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/platform/UserVisitAnalysisController.java index dfc8830..cf31a1d 100644 --- a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/platform/UserVisitAnalysisController.java +++ b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/platform/UserVisitAnalysisController.java @@ -25,21 +25,21 @@ import java.util.List; * @date 2021-05-21 15:25:19 */ @RestController("platformUserVisitAnalysisController") -@RequestMapping("/p/user_visit_analysis") +@RequestMapping("/p/userVisitAnalysis") @Tag(name = "platform-用户访问统计") public class UserVisitAnalysisController { @Autowired private UserVisitAnalysisService userVisitAnalysisService; - @GetMapping("/get_user_analysis_data") + @GetMapping("/getUserAnalysisData") @Operation(summary = "获取访客分析数据", description = "获取访客分析数据") public ServerResponseEntity getUserAnalysisData(FlowAnalysisDTO flowAnalysisDTO) { FlowUserAnalysisVO flowUserAnalysisVO = userVisitAnalysisService.getUserAnalysisData(flowAnalysisDTO); return ServerResponseEntity.success(flowUserAnalysisVO); } - @GetMapping("/user_analysis_data_export") + @GetMapping("/userAnalysisDataExport") @Operation(summary = "导出excel", description = "导出会员分析数据-地图") public ServerResponseEntity userAnalysisDataExport(HttpServletResponse response, FlowAnalysisDTO flowAnalysisDTO) { List list = userVisitAnalysisService.listUserAnalysisDataExcel(flowAnalysisDTO); diff --git a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/supplier/ProductAnalyseController.java b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/supplier/ProductAnalyseController.java index 2ccc084..4978908 100644 --- a/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/supplier/ProductAnalyseController.java +++ b/tmerclub-flow/src/main/java/com/tmerclub/cloud/flow/controller/supplier/ProductAnalyseController.java @@ -27,14 +27,14 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController("supplierProductAnalyseController") -@RequestMapping("/s/product_analyse") +@RequestMapping("/s/productAnalyse") @Tag(name = "supplier-商品分析") public class ProductAnalyseController { @Autowired private ProductAnalyseService productAnalyseService; - @GetMapping("/get_product_effect") + @GetMapping("/getProductEffect") @Operation(summary = "获取商家端商品洞察数据", description = "获取商品洞察数据") public ServerResponseEntity> getProductEffect(@Valid PageDTO pageDTO, ProdEffectDTO prodEffectDTO) { prodEffectDTO.setShopId(AuthUserContext.get().getTenantId()); @@ -42,12 +42,12 @@ public class ProductAnalyseController { return ServerResponseEntity.success(productAnalyseService.getProductEffect(pageDTO, prodEffectDTO)); } - @GetMapping("/get_shop_product_flow_info") + @GetMapping("/getShopProductFlowInfo") @Operation(summary = "获取供应商店铺流量信息和近30天的商品访问流量排行榜", description = "获取店铺商品浏览量、新老访客数量和近30天的商品访问流量排行榜") @Parameters({ @Parameter(name = "dayCount", description = "天数（几天内的排行榜）"), @Parameter(name = "limit", description = "排行榜条数")}) - public ServerResponseEntity getShopFlowInfoAndProdRankIng(@RequestParam(value = "dayCount", defaultValue = "30") Integer dayCount, + public ServerResponseEntity getShopProductFlowInfo(@RequestParam(value = "dayCount", defaultValue = "30") Integer dayCount, @RequestParam(value = "limit", defaultValue = "5") Integer limit){ return ServerResponseEntity.success(productAnalyseService.getSupplierFlowInfoAndProdRankIng(dayCount, limit)); } diff --git a/tmerclub-group/src/main/java/com/tmerclub/cloud/group/controller/admin/GroupActivityController.java b/tmerclub-group/src/main/java/com/tmerclub/cloud/group/controller/admin/GroupActivityController.java index cc885b6..357f53d 100644 --- a/tmerclub-group/src/main/java/com/tmerclub/cloud/group/controller/admin/GroupActivityController.java +++ b/tmerclub-group/src/main/java/com/tmerclub/cloud/group/controller/admin/GroupActivityController.java @@ -31,7 +31,7 @@ import java.util.Objects; * @date 2021-03-19 11:26:37 */ @RestController("adminGroupActivityController") -@RequestMapping("/mp/group_activity") +@RequestMapping("/mp/groupActivity") @Tag(name = "admin-拼团活动表") public class GroupActivityController { @@ -59,7 +59,7 @@ public class GroupActivityController { * @param groupActivityDTO 拼团活动表 * @return 分页数据 */ - @GetMapping("/platform_page") + @GetMapping("/platformPage") public ServerResponseEntity> platformPage(PageDTO pageDTO, GroupActivityDTO groupActivityDTO) { if (!Objects.equals(Constant.PLATFORM_SHOP_ID, AuthUserContext.get().getTenantId())) { throw new LuckException(ResponseEnum.UNAUTHORIZED); @@ -200,7 +200,7 @@ public class GroupActivityController { return ServerResponseEntity.success(); } - @GetMapping("/get_offline_handle_event/{groupActivityId}") + @GetMapping("/getOfflineHandleEvent/{groupActivityId}") @Operation(summary = "获取最新下线的事件", description = "获取最新下线的事件") public ServerResponseEntity getOfflineHandleEvent(@PathVariable Long groupActivityId) { return ServerResponseEntity.success(groupActivityService.getOfflineHandleEvent(groupActivityId)); @@ -216,7 +216,7 @@ public class GroupActivityController { return ServerResponseEntity.success(); } - @PostMapping("/audit_apply") + @PostMapping("/auditApply") @Operation(summary = "违规活动提交审核", description = "违规活动提交审核") public ServerResponseEntity auditApply(@RequestBody OfflineHandleEventDTO offlineHandleEventDto) { groupActivityService.auditApply(offlineHandleEventDto); diff --git a/tmerclub-group/src/main/java/com/tmerclub/cloud/group/controller/app/GroupActivityController.java b/tmerclub-group/src/main/java/com/tmerclub/cloud/group/controller/app/GroupActivityController.java index cfd5a61..4569e18 100644 --- a/tmerclub-group/src/main/java/com/tmerclub/cloud/group/controller/app/GroupActivityController.java +++ b/tmerclub-group/src/main/java/com/tmerclub/cloud/group/controller/app/GroupActivityController.java @@ -29,7 +29,7 @@ import java.util.Objects; * @date 2021-03-20 10:39:31 */ @RestController("appGroupActivityController") -@RequestMapping("/ua/group_activity") +@RequestMapping("/ua/groupActivity") @Tag(name = "app-拼团活动表") public class GroupActivityController { @@ -70,7 +70,7 @@ public class GroupActivityController { return ServerResponseEntity.success(groupActivity); } - @GetMapping("/join_group_list") + @GetMapping("/joinGroupList") @Operation(summary = "可加入的团列表", description = "只显示最近n个团列表(默认10)") public ServerResponseEntity> joinGroupList( @Parameter(description = "拼团活动ID", required = true) @RequestParam("groupActivityId") Long groupActivityId, diff --git a/tmerclub-group/src/main/java/com/tmerclub/cloud/group/controller/app/GroupOrderController.java b/tmerclub-group/src/main/java/com/tmerclub/cloud/group/controller/app/GroupOrderController.java index 0058706..942cf58 100644 --- a/tmerclub-group/src/main/java/com/tmerclub/cloud/group/controller/app/GroupOrderController.java +++ b/tmerclub-group/src/main/java/com/tmerclub/cloud/group/controller/app/GroupOrderController.java @@ -56,7 +56,7 @@ import java.util.Objects; * @date 2021-04-07 10:39:32 */ @RestController("appGroupOrderController") -@RequestMapping("/group_order") +@RequestMapping("/groupOrder") @Tag(name = "拼团订单表") public class GroupOrderController { diff --git a/tmerclub-group/src/main/java/com/tmerclub/cloud/group/controller/app/GroupTeamController.java b/tmerclub-group/src/main/java/com/tmerclub/cloud/group/controller/app/GroupTeamController.java index 53d796c..955580d 100644 --- a/tmerclub-group/src/main/java/com/tmerclub/cloud/group/controller/app/GroupTeamController.java +++ b/tmerclub-group/src/main/java/com/tmerclub/cloud/group/controller/app/GroupTeamController.java @@ -32,7 +32,7 @@ import java.util.Objects; * @date 2021-03-20 10:39:32 */ @RestController("appGroupTeamController") -@RequestMapping("/group_team") +@RequestMapping("/groupTeam") @Tag(name = "app-拼团团队表") public class GroupTeamController { @@ -95,7 +95,7 @@ public class GroupTeamController { return ServerResponseEntity.success(infoVo); } - @GetMapping("/join_users") + @GetMapping("/joinGroupUsers") @Operation(summary = "参团的用户列表", description = "参团的用户列表") public ServerResponseEntity> joinGroupUsers( @Parameter(description = "拼团团队ID", required = true) @RequestParam("groupTeamId") Long groupTeamId) { diff --git a/tmerclub-im/src/main/java/com/tmerclub/cloud/im/controller/multishop/ImMsgBizSkillsController.java b/tmerclub-im/src/main/java/com/tmerclub/cloud/im/controller/multishop/ImMsgBizSkillsController.java index 8824c24..f352200 100644 --- a/tmerclub-im/src/main/java/com/tmerclub/cloud/im/controller/multishop/ImMsgBizSkillsController.java +++ b/tmerclub-im/src/main/java/com/tmerclub/cloud/im/controller/multishop/ImMsgBizSkillsController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; * @date 2023-03-23 17:43:40 */ @RestController("multishopImMsgBizSkillsController") -@RequestMapping("/m/im_msg_biz_skills") +@RequestMapping("/m/imMsgBizSkills") @Tag(name = "店铺自动回复接口") public class ImMsgBizSkillsController { diff --git a/tmerclub-im/src/main/java/com/tmerclub/cloud/im/controller/platform/ImMsgBizSkillsController.java b/tmerclub-im/src/main/java/com/tmerclub/cloud/im/controller/platform/ImMsgBizSkillsController.java index 338f6de..85db884 100644 --- a/tmerclub-im/src/main/java/com/tmerclub/cloud/im/controller/platform/ImMsgBizSkillsController.java +++ b/tmerclub-im/src/main/java/com/tmerclub/cloud/im/controller/platform/ImMsgBizSkillsController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; * @date 2023-03-23 17:43:40 */ @RestController("platformImMsgBizSkillsController") -@RequestMapping("/p/im_msg_biz_skills") +@RequestMapping("/p/imMsgBizSkills") @Tag(name = "平台自动回复接口") public class ImMsgBizSkillsController { diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/combo/controller/app/ComboSpuController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/combo/controller/app/ComboSpuController.java index 66fe865..0065dd5 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/combo/controller/app/ComboSpuController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/combo/controller/app/ComboSpuController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; * @date 2022-08-16 09:18:06 */ @RestController("appComboProdController") -@RequestMapping("/combo_prod") +@RequestMapping("/comboProd") @Tag(name = "套装商品项") public class ComboSpuController { diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/combo/controller/app/ComboSpuSkuController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/combo/controller/app/ComboSpuSkuController.java index e7f4d98..4134c2d 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/combo/controller/app/ComboSpuSkuController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/combo/controller/app/ComboSpuSkuController.java @@ -24,7 +24,7 @@ import java.util.List; * @date 2022-08-16 09:18:06 */ @RestController("appComboProdSkuController") -@RequestMapping("/combo_prod_sku") +@RequestMapping("/comboProdSku") @Tag(name = "app-套餐商品sku项") public class ComboSpuSkuController { diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/combo/controller/multishop/ComboController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/combo/controller/multishop/ComboController.java index 01f684a..dcd4d50 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/combo/controller/multishop/ComboController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/combo/controller/multishop/ComboController.java @@ -57,7 +57,7 @@ public class ComboController { return ServerResponseEntity.success(); } - @PutMapping("/update_combo_status") + @PutMapping("/updateComboStatus") @Operation(summary = "修改商品套餐状态", description = "修改商品套餐状态") public ServerResponseEntity updateComboStatus(@RequestBody ComboDTO comboDTO) { comboService.updateComboStatus(comboDTO.getComboId(), comboDTO.getStatus()); diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/controller/admin/CouponController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/controller/admin/CouponController.java index 190d9c2..da7c197 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/controller/admin/CouponController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/controller/admin/CouponController.java @@ -50,7 +50,7 @@ public class CouponController { @Autowired private CouponStockManager couponStockManager; - @GetMapping("/admin_page") + @GetMapping("/platformPage") @Operation(summary = "店铺优惠券管理列表", description = "店铺优惠券管理列表") public ServerResponseEntity> platformPage(@Valid PageDTO pageDTO, CouponDTO couponDTO) { PageVO couponPage = couponService.adminPage(pageDTO, couponDTO); @@ -66,7 +66,7 @@ public class CouponController { } - @GetMapping("/page_shop_coupon_user") + @GetMapping("/shopCouponUserPage") @Operation(summary = "获取某个用户的优惠券明细", description = "获取某个用户的优惠券明细") public ServerResponseEntity> shopCouponUserPage(@Valid PageDTO pageDTO, CouponUserDTO couponUserDTO) { couponUserDTO.setShopId(AuthUserContext.get().getTenantId()); @@ -118,9 +118,9 @@ public class CouponController { } - @GetMapping("/page_platform_coupons") + @GetMapping("/platformCouponsPage") @Operation(summary = "分页获取平台优惠券列表", description = "分页获取平台优惠券列表") - public ServerResponseEntity> pagePlatformCoupons(@Valid PageDTO pageDTO, CouponDTO couponDTO) { + public ServerResponseEntity> platformCouponsPage(@Valid PageDTO pageDTO, CouponDTO couponDTO) { couponDTO.setShopId(Constant.PLATFORM_SHOP_ID); couponDTO.setStatus(StatusEnum.ENABLE.value()); couponDTO.setPutonStatus(StatusEnum.ENABLE.value()); @@ -129,7 +129,7 @@ public class CouponController { return ServerResponseEntity.success(couponPage); } - @PutMapping("/send_user_coupon") + @PutMapping("/sendUserCoupon") @Operation(summary = "批量发放优惠券", description = "平台批量发放优惠券给用户") public ServerResponseEntity sendUserCoupon(@RequestBody UserCouponsDTO userCouponsDTO) { List userIds = userCouponsDTO.getUserIds(); @@ -173,7 +173,7 @@ public class CouponController { return ServerResponseEntity.success(); } - @GetMapping("/get_offline_handle_event/{couponId}") + @GetMapping("/getOfflineHandleEvent/{couponId}") @Operation(summary = "获取最新下线的事件", description = "获取最新下线的事件") public ServerResponseEntity getOfflineHandleEvent(@PathVariable Long couponId) { return ServerResponseEntity.success(couponService.getOfflineHandleEvent(couponId)); @@ -192,7 +192,7 @@ public class CouponController { return ServerResponseEntity.success(); } - @PostMapping("/audit_apply") + @PostMapping("/auditApply") @Operation(summary = "违规活动提交审核", description = "违规活动提交审核") public ServerResponseEntity auditApply(@RequestBody OfflineHandleEventDTO offlineHandleEventDto) { couponService.auditApply(offlineHandleEventDto); diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/controller/app/CouponController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/controller/app/CouponController.java index 5a05eed..6744fc7 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/controller/app/CouponController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/controller/app/CouponController.java @@ -53,9 +53,9 @@ public class CouponController { private CouponStockManager couponStockManager; - @GetMapping("/general_coupon_list") + @GetMapping("/platformCouponList") @Operation(summary = "平台优惠券列表(领券中心, 访客接口)", description = "平台优惠券列表") - public ServerResponseEntity> generalCouponList() { + public ServerResponseEntity> platformCouponList() { UidInfoBO uidInfoBO = AuthUserContext.get(); Long userId = null; if (Objects.nonNull(uidInfoBO)) { @@ -64,7 +64,7 @@ public class CouponController { return ServerResponseEntity.success(couponService.generalCouponList(userId)); } - @GetMapping("/get_coupon_page") + @GetMapping("/getCouponPage") @Operation(summary = "店铺商品券列表(领券中心, 访客接口)", description = "获取店铺商品券列表") public ServerResponseEntity> getCouponPage(@Valid PageDTO page) { UidInfoBO uidInfoBO = AuthUserContext.get(); @@ -76,7 +76,7 @@ public class CouponController { return ServerResponseEntity.success(couponDto); } - @GetMapping("/get_shop_or_spu_coupon_list") + @GetMapping("/getShopOrSpuCouponList") @Operation(summary = "获取指定店铺或指定商品的所有优惠券 ", description = "通过shopId或shopId和spuId获取指定店铺或指定商品的所有优惠券") public ServerResponseEntity> getShopOrSpuCouponList(Long shopId, Long spuId) { // 获取已投放优惠券 @@ -119,7 +119,7 @@ public class CouponController { } - @GetMapping("/get_spus_by_coupon_id") + @GetMapping("/getSpusByCouponId") @Operation(summary = "根据优惠券，获取可用的商品列表", description = "根据优惠券，获取可用的商品列表") @Parameter(name = "couponId", description = "优惠券id") public ServerResponseEntity> getSpusByCouponId(PageDTO pageDTO, ProductSearchDTO productSearch, @@ -127,7 +127,7 @@ public class CouponController { return ServerResponseEntity.success(couponService.spuListByCouponId(pageDTO, productSearch, couponId)); } - @GetMapping("/get_by_coupon_id") + @GetMapping("/generalCouponList") @Operation(summary = "获取优惠券信息", description = "根据id获取") public ServerResponseEntity generalCouponList(@RequestParam("couponId") Long couponId) { CouponVO coupon = couponService.getCouponAndProdData(couponId); diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/controller/app/MyCouponController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/controller/app/MyCouponController.java index c5dacc1..35ddd68 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/controller/app/MyCouponController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/controller/app/MyCouponController.java @@ -26,7 +26,7 @@ import java.util.Objects; * @date 2020-12-08 17:22:56 */ @RestController("appMyCouponController") -@RequestMapping("/my_coupon") +@RequestMapping("/myCoupon") @Tag(name = "app-我的优惠券") public class MyCouponController { @@ -35,7 +35,7 @@ public class MyCouponController { @Autowired private CouponUserService couponUserService; - @GetMapping("/get_page") + @GetMapping("/getUserCouponPage") @Operation(summary = "查看用户的优惠券(所有/指定状态)分页列表", description = "查看用户的优惠券(所有/指定状态)分页列表") @Parameters({ @Parameter(name = "status", description = "优惠券状态 0:已过期 1:未使用 2:已使用"), @@ -45,7 +45,7 @@ public class MyCouponController { return ServerResponseEntity.success(couponService.getUserCouponPage(page, type, status)); } - @GetMapping("/get_my_coupons_status_or_type_count") + @GetMapping("/getCouponCountByStatus") @Operation(summary = "获取用户优惠券的数量", description = "获取各个状态下的优惠券个数") public ServerResponseEntity> getCouponCountByStatus() { Map couponCount = couponUserService.getCouponCountByStatus(AuthUserContext.get().getUserId()); @@ -62,7 +62,7 @@ public class MyCouponController { return ServerResponseEntity.success("领取优惠券成功"); } - @DeleteMapping("/delete_coupon/{couponUserId}") + @DeleteMapping("/deleteCoupon/{couponUserId}") @Operation(summary = "删除用户优惠券", description = "通过优惠券id删除用户优惠券") @Parameter(name = "couponUserId", description = "用户优惠券Id") public ServerResponseEntity deleteCoupon(@PathVariable("couponUserId") Long couponUserId) { diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/controller/platform/CouponController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/controller/platform/CouponController.java index f7a4119..0ec8122 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/controller/platform/CouponController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/coupon/controller/platform/CouponController.java @@ -29,7 +29,7 @@ public class CouponController { @Autowired private CouponUserService couponUserService; - @GetMapping("/page_coupon_user") + @GetMapping("/platformCouponUserPage") @Operation(summary = "获取某个用户的优惠券明细", description = "获取某个用户的优惠券明细") public ServerResponseEntity> platformCouponUserPage(@Valid PageDTO pageDTO, CouponUserDTO couponUserDTO) { PageVO couponPage = couponUserService.getPageByUserId(pageDTO, couponUserDTO); diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/discount/controller/admin/DiscountController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/discount/controller/admin/DiscountController.java index d96db1a..998707a 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/discount/controller/admin/DiscountController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/discount/controller/admin/DiscountController.java @@ -60,7 +60,7 @@ public class DiscountController { return ServerResponseEntity.success(transports); } - @GetMapping("/platform_page") + @GetMapping("/platformPage") @Operation(summary = "平台满减活动管理列表", description = "平台满减活动管理列表") public ServerResponseEntity> platformPage(@Valid PageDTO pageDTO, DiscountDTO transportDTO) { PageVO transports = discountService.platformPage(pageDTO, transportDTO); @@ -164,7 +164,7 @@ public class DiscountController { return ServerResponseEntity.success(); } - @GetMapping("/get_offline_handle_event/{discountId}") + @GetMapping("/getOfflineHandleEvent/{discountId}") @Operation(summary = "通过discountId获取最新下线的事件", description = "通过discountId获取最新下线的事件") public ServerResponseEntity getOfflineHandleEvent(@PathVariable Long discountId) { return ServerResponseEntity.success(discountService.getOfflineHandleEvent(discountId)); @@ -183,7 +183,7 @@ public class DiscountController { return ServerResponseEntity.success(); } - @PostMapping("/audit_apply") + @PostMapping("/auditApply") @Operation(summary = "违规活动提交审核", description = "违规活动提交审核") public ServerResponseEntity auditApply(@RequestBody OfflineHandleEventDTO offlineHandleEventDto) { discountService.auditApply(offlineHandleEventDto); diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/discount/controller/app/DiscountController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/discount/controller/app/DiscountController.java index 0251b9c..4fe1848 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/discount/controller/app/DiscountController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/discount/controller/app/DiscountController.java @@ -76,7 +76,7 @@ public class DiscountController { return ServerResponseEntity.success(discount); } - @GetMapping("/spu_page_by_discount_id") + @GetMapping("/getSpuPageByDiscountId") @Operation(summary = "获取促销活动商品分页", description = "通过活动id获取促销活动详情") @Parameter(name = "discountId", description = "活动ID", required = true) public ServerResponseEntity> getSpuPageByDiscountId(EsPageDTO pageDTO, ProductSearchDTO productSearchDTO, diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/discount/controller/app/SpuDiscountController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/discount/controller/app/SpuDiscountController.java index 841bebe..b8586f1 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/discount/controller/app/SpuDiscountController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/discount/controller/app/SpuDiscountController.java @@ -31,7 +31,7 @@ public class SpuDiscountController { @Autowired private DiscountService discountService; - @GetMapping("/get_discount_list") + @GetMapping("/getDiscountBySpuId") @Operation(summary = "获取店铺、商品对应的促销活动", description = "通过商品id获取商品所有促销活动") public ServerResponseEntity> getDiscountBySpuId(Long spuId, Long shopId) { List discountList = discountService.listDiscountsAndItemsByShopId(shopId); diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/admin/DistributionUserIncomeController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/admin/DistributionUserIncomeController.java index 51b5426..f5b75eb 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/admin/DistributionUserIncomeController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/admin/DistributionUserIncomeController.java @@ -28,16 +28,16 @@ import java.util.Objects; * @Date 2021/8/10 16:30 */ @RestController("adminDistributionUserIncomeController") -@RequestMapping("/mp/distribution_user_income") +@RequestMapping("/mp/distributionUserIncome") @Tag(name = "admin-分销收入记录信息") public class DistributionUserIncomeController { @Autowired private DistributionUserIncomeService distributionUserIncomeService; - @GetMapping("/page_sales_record") + @GetMapping("/salesRecordPage") @Operation(summary = "获取销售记录", description = "获取销售记录") - public ServerResponseEntity> pageSalesRecord(@Valid PageDTO pageDTO, DistributionUserIncomeDTO distributionUserIncomeDTO) { + public ServerResponseEntity> salesRecordPage(@Valid PageDTO pageDTO, DistributionUserIncomeDTO distributionUserIncomeDTO) { PageVO distributionUserIncomePageVO = distributionUserIncomeService.pageSalesRecord(pageDTO, distributionUserIncomeDTO); for (DistributionUserIncomeVO record : distributionUserIncomePageVO.getList()) { DistributionUserVO distributionUser = record.getDistributionUser(); diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionConfigController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionConfigController.java index 0f7882d..c3062e5 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionConfigController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionConfigController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; * @date 2021-08-12 09:46:26 */ @RestController("appDistributionConfigController") -@RequestMapping("/distribution_set") +@RequestMapping("/distributionSet") @Tag(name = "分销设置信息") public class DistributionConfigController { diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionMsgController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionMsgController.java index 8e4e19c..a4284c0 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionMsgController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionMsgController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; * @date 2021-08-09 14:14:05 */ @RestController("appDistributionMsgController") -@RequestMapping("/distribution_msg") +@RequestMapping("/distributionMsg") @Tag(name = "app-分销公告信息") public class DistributionMsgController { diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionQrCodeController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionQrCodeController.java index 2034c87..f6aa2d7 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionQrCodeController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionQrCodeController.java @@ -24,7 +24,7 @@ import java.io.File; * @date 2021-08-12 10:46:10 */ @RestController("appDistributionQrCodeController") -@RequestMapping("/ua/distribution_qrcode") +@RequestMapping("/ua/distributionQrcode") @Tag(name = "分销生成二维码接口") public class DistributionQrCodeController { private static final Logger LOGGER = LoggerFactory.getLogger(DistributionQrCodeController.class); diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionRecruitConfigController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionRecruitConfigController.java index d353399..c1ff761 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionRecruitConfigController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionRecruitConfigController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; * @author cl */ @RestController("appDistributionRecruitConfigController") -@RequestMapping("/distribution_recruit") +@RequestMapping("/distributionRecruit") @Tag(name = "分销推广信息") public class DistributionRecruitConfigController { diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionRegisterController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionRegisterController.java index 0395044..cb58d58 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionRegisterController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionRegisterController.java @@ -51,7 +51,7 @@ import java.util.Objects; * @date 2021-08-16 10:00:21 */ @RestController("appDistributionRegisterController") -@RequestMapping("/distribution_register") +@RequestMapping("/distributionRegister") @Tag(name = "分销员绑定关系") public class DistributionRegisterController { @@ -73,7 +73,7 @@ public class DistributionRegisterController { /** * 成为分销员 */ - @PostMapping("/add_distribution_user") + @PostMapping("/addDistributionUser") @Operation(summary = "申请成为分销员", description = "申请成为分销员，返回分销员状态 0 待审核 1 正常") public ServerResponseEntity addDistributionUser(@Valid @RequestBody DistributionUserRegisterDTO distributionUserRegisterDTO) { Long userId = AuthUserContext.get().getUserId(); @@ -159,7 +159,7 @@ public class DistributionRegisterController { return ServerResponseEntity.success(distributionUser.getState()); } - @GetMapping("/check_allinpay_info") + @GetMapping("/checkAllinpayInfo") @Operation(summary = "检查分销条件(通联)") public ServerResponseEntity checkAllinpayInfo() { // 检查通联信息 diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionSpuController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionSpuController.java index e947c57..3c42b6c 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionSpuController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionSpuController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; * @date 2021-08-09 14:14:07 */ @RestController("appDistributionSpuController") -@RequestMapping("/ua/distribution_spu") +@RequestMapping("/ua/distributionSpu") @Tag(name = "app-分销商品关联信息") public class DistributionSpuController { diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionUserBindController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionUserBindController.java index 5c7dad2..77339d7 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionUserBindController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionUserBindController.java @@ -30,7 +30,7 @@ import java.util.Objects; * @date 2021-08-09 14:14:09 */ @RestController("appDistributionUserBindController") -@RequestMapping("/distribution_user_bind") +@RequestMapping("/distributionUserBind") @Tag(name = "分销员绑定关系") public class DistributionUserBindController { @@ -43,7 +43,7 @@ public class DistributionUserBindController { @Autowired private DistributionUserService distributionUserService; - @PostMapping("/bind_user") + @PostMapping("/bindUser") @Operation(summary = "绑定用户", description = "根据分销员卡号绑定用户") @Parameters(@Parameter(name = "distributionUserId", description = "卡号", required = true)) public ServerResponseEntity bindUser(@RequestParam Long distributionUserId) { @@ -80,7 +80,7 @@ public class DistributionUserBindController { return ServerResponseEntity.success(); } - @GetMapping("/bind_user_list") + @GetMapping("/bindUserList") @Operation(summary = "绑定用户列表", description = "获取分销员所绑定的用户列表") @Parameters(@Parameter(name = "userType", description = "类型 1 我的用户， 2 我的好友")) public ServerResponseEntity> bindUserList(@RequestParam("userType") Integer userType) { diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionUserController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionUserController.java index 1c11215..3c069c0 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionUserController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionUserController.java @@ -56,7 +56,7 @@ public class DistributionUserController { return ServerResponseEntity.success(achievementDataVO); } - @GetMapping("/distribution_user_info") + @GetMapping("/distributionUserInfo") @Operation(summary = "分销员信息", description = "分销员信息") public ServerResponseEntity getDistributionUserInfo() { Long userId = AuthUserContext.get().getUserId(); @@ -81,9 +81,9 @@ public class DistributionUserController { return ServerResponseEntity.success(pageVO); } - @GetMapping("/distribution_orders") + @GetMapping("/distributionOrderPage") @Operation(summary = "分页查看分销员佣金明细", description = "分页查看分销员佣金明细") - public ServerResponseEntity> getDistributionOrder(@Valid PageDTO pageDTO) { + public ServerResponseEntity> distributionOrderPage(@Valid PageDTO pageDTO) { Long userId = AuthUserContext.get().getUserId(); DistributionUserVO distributionUser = distributionUserService.getByUserId(userId); PageVO pageVO = distributionUserIncomeService.getDistributionOrderByDistributionUserId(pageDTO, distributionUser.getDistributionUserId()); diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionUserIncomeController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionUserIncomeController.java index acaee45..20f3816 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionUserIncomeController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionUserIncomeController.java @@ -30,7 +30,7 @@ import java.util.Objects; * @date 2021-08-09 14:14:09 */ @RestController("appDistributionUserIncomeController") -@RequestMapping("/distribution_user_income") +@RequestMapping("/distributionUserIncome") @Tag(name = "app-分销收入记录信息") public class DistributionUserIncomeController { @@ -61,7 +61,7 @@ public class DistributionUserIncomeController { return ServerResponseEntity.success(distributionUserIncomeService.statisticsDistributionUserIncome(distributionUser.getDistributionUserId())); } - @GetMapping("/my_promotion_order") + @GetMapping("/getMyPromotionOrderByState") @Operation(summary = "我的推广订单", description = "通过状态获取我的推广订单(0:待支付 1:待结算 2:已结算 -1:订单失效)") public ServerResponseEntity> getMyPromotionOrderByState(@Valid PageDTO pageDTO, Integer state) { DistributionUserVO distributionUser = distributionUserService.getByUserId(AuthUserContext.get().getUserId()); diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionUserWalletController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionUserWalletController.java index f2b2672..3e1f1ae 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionUserWalletController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionUserWalletController.java @@ -32,7 +32,7 @@ import java.util.Objects; * @date 2021-08-09 14:14:10 */ @RestController("appDistributionUserWalletController") -@RequestMapping("/distribution_user_wallet") +@RequestMapping("/distributionUserWallet") @Tag(name = "app-分销员钱包信息") public class DistributionUserWalletController { diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionWithdrawCashController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionWithdrawCashController.java index 3ff1f2b..e9b0190 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionWithdrawCashController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/app/DistributionWithdrawCashController.java @@ -133,7 +133,7 @@ public class DistributionWithdrawCashController { return ServerResponseEntity.success(); } - @GetMapping("/is_withdraw_cash") + @GetMapping("/isWithdrawCash") @Operation(summary = "当前是否可以提现") public ServerResponseEntity isWithdrawCash() { Long userId = AuthUserContext.get().getUserId(); @@ -154,7 +154,7 @@ public class DistributionWithdrawCashController { return ServerResponseEntity.success(true); } - @GetMapping("/total_withdraw_cash") + @GetMapping("/getUserTotalWithdrawCash") @Operation(summary = "查看用户总提现金额") public ServerResponseEntity getUserTotalWithdrawCash() { Long userId = AuthUserContext.get().getUserId(); diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/multishop/DistributionSpuController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/multishop/DistributionSpuController.java index dcd2dab..43fbab0 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/multishop/DistributionSpuController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/multishop/DistributionSpuController.java @@ -26,7 +26,7 @@ import java.util.Objects; * @date 2021-08-09 14:14:07 */ @RestController("multishopDistributionSpuController") -@RequestMapping("/m/distribution_spu") +@RequestMapping("/m/distributionSpu") @Tag(name = "multishop-分销商品关联信息") public class DistributionSpuController { @@ -69,20 +69,20 @@ public class DistributionSpuController { } - @GetMapping("/get_offline_handle_event") + @GetMapping("/getOfflineHandleEvent") @Operation(summary = "获取分销商品下线信息", description = "获取分销商品下线信息") public ServerResponseEntity getOfflineHandleEvent(@RequestParam("distributionSpuId") Long distributionSpuId) { return ServerResponseEntity.success(distributionSpuService.getOfflineHandleEvent(distributionSpuId)); } - @PostMapping("/audit_apply") + @PostMapping("/auditApply") @Operation(summary = "违规分销商品提交重新上线申请", description = "违规分销商品提交重新上线申请") public ServerResponseEntity auditApply(@RequestBody OfflineHandleEventDTO offlineHandleEventDTO) { distributionSpuService.auditApply(offlineHandleEventDTO); return ServerResponseEntity.success(); } - @PutMapping("/update_state") + @PutMapping("/updateState") @Operation(summary = "上架或下架分销商品", description = "上架或下架分销商品") public ServerResponseEntity updateState(@RequestParam("distributionSpuId") Long distributionSpuId, @RequestParam("state") Integer state) { if (!Objects.equals(DistributionSpuStatus.OFF_SHELF.value(), state) && !Objects.equals(DistributionSpuStatus.PUT_SHELF.value(), state)) { diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionAuditingController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionAuditingController.java index 9da5412..4685fac 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionAuditingController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionAuditingController.java @@ -32,7 +32,7 @@ import java.util.Date; * @date 2021-08-09 14:14:05 */ @RestController("platformDistributionAuditingController") -@RequestMapping("/p/distribution_auditing") +@RequestMapping("/p/distributionAuditing") @Tag(name = "platform-分销员申请信息") public class DistributionAuditingController { diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionMsgController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionMsgController.java index 0f1dc8d..c3119f4 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionMsgController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionMsgController.java @@ -24,7 +24,7 @@ import java.util.List; * @date 2021-08-09 14:14:05 */ @RestController("platformDistributionMsgController") -@RequestMapping("/p/distribution_msg") +@RequestMapping("/p/distributionMsg") @Tag(name = "分销公告信息") public class DistributionMsgController { diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionSpuController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionSpuController.java index b0fcc16..6046a8b 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionSpuController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionSpuController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; * @date 2021-08-09 14:14:07 */ @RestController("platformDistributionSpuController") -@RequestMapping("/p/distribution_spu") +@RequestMapping("/p/distributionSpu") @Tag(name = "platform-分销商品关联信息") public class DistributionSpuController { @@ -45,7 +45,7 @@ public class DistributionSpuController { return ServerResponseEntity.success(); } - @GetMapping("/get_offline_handle_event") + @GetMapping("/getOfflineHandleEvent") @Operation(summary = "获取分销商品下线信息", description = "获取分销商品下线信息") public ServerResponseEntity getOfflineHandleEvent(@RequestParam("distributionSpuId") Long distributionSpuId) { return ServerResponseEntity.success(distributionSpuService.getOfflineHandleEvent(distributionSpuId)); diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserBanController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserBanController.java index f88d48b..6a88808 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserBanController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserBanController.java @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController; * @date 2021-08-09 14:14:08 */ @RestController("platformDistributionUserBanController") -@RequestMapping("/p/distribution_user_ban") +@RequestMapping("/p/distributionuserBan") @Tag(name = "platform-分销封禁记录") public class DistributionUserBanController { diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserBindController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserBindController.java index 12c7f86..9094bb9 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserBindController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserBindController.java @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController; * @date 2021-08-09 14:14:09 */ @RestController("platformDistributionUserBindController") -@RequestMapping("/p/distribution_user_bind") +@RequestMapping("/p/distributionUserBind") @Tag(name = "platform-分销员绑定关系") public class DistributionUserBindController { diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserController.java index dc396fa..432b387 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserController.java @@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.*; * @date 2021-08-09 14:14:07 */ @RestController("platformDistributionUserController") -@RequestMapping("/p/distribution_user") +@RequestMapping("/p/distributionUser") @Tag(name = "platform-分销员信息") public class DistributionUserController { @@ -50,7 +50,7 @@ public class DistributionUserController { return ServerResponseEntity.success(distributionUserPage); } - @GetMapping("/achievement_page") + @GetMapping("/achievementPage") @Operation(summary = "获取分销业绩统计列表", description = "分页获取分销业绩统计") public ServerResponseEntity> achievementPage(@Valid PageDTO pageDTO, DistributionUserDTO distributionUserDTO, String userMobile) { PageVO page = distributionUserService.achievementPage(pageDTO, distributionUserDTO, userMobile); @@ -71,7 +71,7 @@ public class DistributionUserController { } @Operation(summary = "修改分销员的状态") - @PutMapping("/update_state") + @PutMapping("/updateState") public ServerResponseEntity updateState(@RequestBody DistributionUserBanDTO distributionUserBanDTO) { DistributionUserBan distributionUserBan = BeanUtil.map(distributionUserBanDTO, DistributionUserBan.class); distributionUserService.updateDistributionStateAndBan(distributionUserBan); @@ -82,7 +82,7 @@ public class DistributionUserController { } @Operation(summary = "获取分销员最新的封禁信息") - @GetMapping("/ban_info") + @GetMapping("/getLatestBanInfo") public ServerResponseEntity getLatestBanInfo(@RequestParam("distributionUserId") Long distributionUserId) { DistributionUserBanVO distributionUserBanVO = distributionUserService.getLatestBanInfoByDistributionUserId(distributionUserId); return ServerResponseEntity.success(distributionUserBanVO); diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserIncomeController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserIncomeController.java index f7045bd..93a58ed 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserIncomeController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserIncomeController.java @@ -33,7 +33,7 @@ import java.util.Objects; * @date 2021-08-09 14:14:09 */ @RestController("platformDistributionUserIncomeController") -@RequestMapping("/p/distribution_user_income") +@RequestMapping("/p/distributionUserIncome") @Tag(name = "分销收入记录信息") public class DistributionUserIncomeController { @@ -47,7 +47,7 @@ public class DistributionUserIncomeController { return ServerResponseEntity.success(distributionUserIncomePage); } - @GetMapping("/effect_page") + @GetMapping("/effectPage") @Operation(summary = "获取分销推广效果列表", description = "分页获取分销推广效果列表") public ServerResponseEntity> effectPage(@Valid PageDTO pageDTO, DistributionUserIncomeDTO distributionUserIncomeDTO, String userMobile) { PageVO distributionUserIncomePage = distributionUserIncomeService.effectPage(pageDTO, distributionUserIncomeDTO, userMobile, Constant.PLATFORM_SHOP_ID); diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserWalletBillController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserWalletBillController.java index 9ca93b5..b4ecb4c 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserWalletBillController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserWalletBillController.java @@ -30,7 +30,7 @@ import java.util.Objects; * @date 2021-08-09 14:14:10 */ @RestController("platformDistributionUserWalletBillController") -@RequestMapping("/p/distribution_user_wallet_bill") +@RequestMapping("/p/distributionUserWalletBill") @Tag(name = "分销员钱包流水记录") public class DistributionUserWalletBillController { @@ -44,7 +44,7 @@ public class DistributionUserWalletBillController { return ServerResponseEntity.success(distributionUserWalletBillPage); } - @GetMapping("/wallet_bill_page") + @GetMapping("/walletBillPage") @Operation(summary = "获取分销员钱包流水记录列表", description = "分页获取分销员钱包流水记录列表") public ServerResponseEntity> walletBillPage(@Valid PageDTO pageDTO, String userMobile, String nickName) { PageVO pageVO = distributionUserWalletBillService.walletBillPage(pageDTO, userMobile, nickName); diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserWalletController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserWalletController.java index 5774c94..5c0a665 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserWalletController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionUserWalletController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; * @date 2021-08-09 14:14:10 */ @RestController("platformDistributionUserWalletController") -@RequestMapping("/p/distribution_user_wallet") +@RequestMapping("/p/distributionUserWallet") @Tag(name = "分销员钱包信息") public class DistributionUserWalletController { @@ -37,7 +37,7 @@ public class DistributionUserWalletController { return ServerResponseEntity.success(distributionUserWalletPage); } - @GetMapping("/wallet_page") + @GetMapping("/getWalletPage") @Operation(summary = "获取分销员钱包信息列表", description = "分页获取分销员钱包信息列表") public ServerResponseEntity> walletPage(@Valid PageDTO pageDTO, String userMobile) { PageVO distributionUserWalletPage = distributionUserWalletService.walletPage(pageDTO, userMobile); diff --git a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionWithdrawCashController.java b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionWithdrawCashController.java index c8ccb3e..252a39b 100644 --- a/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionWithdrawCashController.java +++ b/tmerclub-marketing/src/main/java/com/tmerclub/cloud/distribution/controller/platform/DistributionWithdrawCashController.java @@ -41,7 +41,7 @@ import java.util.Objects; * @date 2021-08-09 14:14:10 */ @RestController("platformDistributionWithdrawCashController") -@RequestMapping("/p/distribution_withdraw_cash") +@RequestMapping("/p/distributionWithdrawCash") @Tag(name = "分销员提现记录") public class DistributionWithdrawCashController { @@ -73,7 +73,7 @@ public class DistributionWithdrawCashController { } - @PutMapping("/to_success") + @PutMapping("/updateSuccess") @Operation(summary = "更新分销员提现记录", description = "更新分销员提现记录") public ServerResponseEntity update(Long withdrawCashId) { DistributionWithdrawCash distributionWithdrawCash = distributionWithdrawCashService.getByWithdrawCashId(withdrawCashId); diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/AreaController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/AreaController.java index 018b750..742e854 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/AreaController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/AreaController.java @@ -45,22 +45,22 @@ public class AreaController { return ServerResponseEntity.success(areaService.getByAreaId(areaId)); } - @GetMapping("/list_by_pid") + @GetMapping("/parentByPid") @Operation(summary = "通过父级id获取区域列表", description = "通过父级id获取区域列表") - public ServerResponseEntity> listByPid(Long pid) { + public ServerResponseEntity> parentByPid(Long pid) { List list = areaService.listByPid(pid); return ServerResponseEntity.success(list); } - @GetMapping("/area_list_info") + @GetMapping("/getAreaListInfo") @Operation(summary = "获取可用的区域省市区信息（三级地址列表，省市区结构）", description = "获取可用的区域省市区信息") public ServerResponseEntity> getAreaListInfo() { return ServerResponseEntity.success(areaService.getAreaListInfo()); } - @GetMapping("/list_area_of_enable") + @GetMapping("/AreaOfEnableList") @Operation(summary = "获取可用的省市区列表（三级地址列表）", description = "获取可用的省市区列表") - public ServerResponseEntity> listAreaOfEnable() { + public ServerResponseEntity> AreaOfEnableList() { List list = areaService.listAreaOfEnable(); List res = new ArrayList<>(Constant.INITIAL_CAPACITY); for (AreaVO pArea : list) { diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/DeliveryCompanyController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/DeliveryCompanyController.java index 684cc12..db60088 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/DeliveryCompanyController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/DeliveryCompanyController.java @@ -25,7 +25,7 @@ import java.util.List; * @date 2020-12-07 15:10:00 */ @RestController("adminDeliveryCompanyController") -@RequestMapping("/mp/delivery_company") +@RequestMapping("/mp/deliveryCompany") @Tag(name = "物流公司") public class DeliveryCompanyController { diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/OrderDeliveryController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/OrderDeliveryController.java index 8df0f9b..9f25861 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/OrderDeliveryController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/OrderDeliveryController.java @@ -19,7 +19,7 @@ import java.util.List; */ @Controller @RestController("adminOrderDeliveryController") -@RequestMapping("/mp/order_delivery") +@RequestMapping("/mp/orderDelivery") @Tag(name = "物流包裹") public class OrderDeliveryController { diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/OutletConfigController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/OutletConfigController.java index 7e074b9..e16990a 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/OutletConfigController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/OutletConfigController.java @@ -28,7 +28,7 @@ import java.util.List; * @date 2023-08-23 14:48:23 */ @RestController("adminOutletConfigController") -@RequestMapping("/mp/outlet_config") +@RequestMapping("/mp/outletConfig") @Tag(name = "网点配置") public class OutletConfigController { @@ -85,7 +85,7 @@ public class OutletConfigController { return ServerResponseEntity.success(); } - @PutMapping("/set_default") + @PutMapping("/setDefault") @Operation(summary = "设网点信息为默认/取消默认") public ServerResponseEntity setDefault(@RequestParam Long outletConfigId) { outletConfigService.setDefault(outletConfigId); @@ -93,9 +93,9 @@ public class OutletConfigController { return ServerResponseEntity.success(); } - @GetMapping("/list_outlet_config") + @GetMapping("/outletConfigList") @Operation(summary = "获取网点信息列表") - public ServerResponseEntity> listOutletConfig() { + public ServerResponseEntity> outletConfigList() { List list = outletConfigService.listByShopId(AuthUserContext.get().getTenantId(), AuthUserContext.get().getSysType()); return ServerResponseEntity.success(list); } diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/PrinterController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/PrinterController.java index 19d3dd1..4f369dd 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/PrinterController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/admin/PrinterController.java @@ -77,7 +77,7 @@ public class PrinterController { return ServerResponseEntity.success(); } - @PutMapping("/set_default") + @PutMapping("/setDefault") @Operation(summary = "设打印机信息为默认/取消默认") public ServerResponseEntity setDefault(@RequestParam Long printerId) { printerService.setDefault(printerId); @@ -85,9 +85,9 @@ public class PrinterController { return ServerResponseEntity.success(); } - @GetMapping("/list_printer") - @Operation(summary = "list_printer") - public ServerResponseEntity> listPrinter() { + @GetMapping("/printerList") + @Operation(summary = "printerList") + public ServerResponseEntity> printerList() { List list = printerService.listByShopId(AuthUserContext.get().getTenantId(), AuthUserContext.get().getSysType()); return ServerResponseEntity.success(list); } diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/AreaController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/AreaController.java index 5836a76..0c8d8a6 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/AreaController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/AreaController.java @@ -34,9 +34,9 @@ public class AreaController { return ServerResponseEntity.success(list); } - @GetMapping("/list_by_pid") + @GetMapping("/parentByPid") @Operation(summary = "通过父级id获取区域列表", description = "通过父级id获取区域列表") - public ServerResponseEntity> listByPid(Long pid) { + public ServerResponseEntity> parentByPid(Long pid) { List list = areaService.listByPid(pid); return ServerResponseEntity.success(list); } diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/DeliveryCompanyController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/DeliveryCompanyController.java index 4d7a789..ebbc693 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/DeliveryCompanyController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/DeliveryCompanyController.java @@ -20,7 +20,7 @@ import java.util.List; * @date 2020-12-07 15:10:00 */ @RestController("appDeliveryCompanyController") -@RequestMapping("/delivery_company") +@RequestMapping("/deliveryCompany") @Tag(name = "物流公司") public class DeliveryCompanyController { diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/MyDeliveryController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/MyDeliveryController.java index 7bc7f20..1b90838 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/MyDeliveryController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/MyDeliveryController.java @@ -22,7 +22,7 @@ import java.util.List; * @author */ @RestController("appMyDeliveryController") -@RequestMapping("/my_delivery") +@RequestMapping("/myDelivery") @Tag(name = "app-我的物流接口") public class MyDeliveryController { @@ -35,14 +35,14 @@ public class MyDeliveryController { /** * 物流查询接口 */ - @GetMapping("/order_info/{orderId}") + @GetMapping("/orderInfo/{orderId}") @Operation(summary = "物流查询接口", description = "根据orderNumber查询订单所有包裹信息") public ServerResponseEntity> info(@PathVariable("orderId") String orderId) { List deliveryOrders = deliveryOrderService.getByDeliveryByOrderId(Long.parseLong(orderId)); return ServerResponseEntity.success(deliveryOrders); } - @GetMapping("/delivery_order/{deliveryOrderId}") + @GetMapping("/deliveryPackage/{deliveryOrderId}") @Operation(summary = "物流包裹查询接口", description = "根据orderDeliveryId查询订单包裹信息") @Parameter(name = "deliveryOrderId", description = "订单物流包裹id") public ServerResponseEntity info(@PathVariable("deliveryOrderId") Long deliveryOrderId) { diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/StationController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/StationController.java index cca7b3a..1426d03 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/StationController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/StationController.java @@ -94,7 +94,7 @@ public class StationController { return ServerResponseEntity.success(); } - @GetMapping("/get_station_index_info") + @GetMapping("/getStationIndexInfo") @Operation(summary = "自提点首页数据", description = "获取自提点首页数据") public ServerResponseEntity getStationIndexInfo() { Long stationId = AuthUserContext.get().getTenantId(); @@ -104,17 +104,17 @@ public class StationController { return ServerResponseEntity.success(stationVO); } - @PostMapping("/user_station") + @PostMapping("/userStation") @Operation(summary = "获取距离用户近的自提点") public ServerResponseEntity> getStationList(@Valid @RequestBody OrderStationDTO orderStationDTO) { PageVO stationParams = stationService.getStationList(orderStationDTO.getPageDTO(), orderStationDTO); return ServerResponseEntity.success(stationParams); } - @GetMapping("/order_list_by_status") + @GetMapping("/orderStatusList") @Operation(summary = "订单列表信息", description = "根据订单状态获取订单列表信息，状态为0时获取所有订单") @Parameters(@Parameter(name = "status", description = "订单状态 1:待付款 2:待发货 3:待收货 4:待评价 5:成功 6:失败")) - public ServerResponseEntity> orderListByStatus(OrderSearchDTO orderSearchDTO) { + public ServerResponseEntity> orderStatusList(OrderSearchDTO orderSearchDTO) { Long stationId = AuthUserContext.get().getTenantId(); orderSearchDTO.setStationId(stationId); if (Objects.equals(orderSearchDTO.getStatus(), OrderStatus.PAYED.value())) { @@ -139,7 +139,7 @@ public class StationController { return ServerResponseEntity.success(data); } - @GetMapping("/get_code") + @GetMapping("/getCode") @Operation(summary = "自提点二维码信息", description = "自提点二维码信息") public ServerResponseEntity getCode() { Long stationId = AuthUserContext.get().getTenantId(); @@ -148,7 +148,7 @@ public class StationController { return ServerResponseEntity.success(code); } - @GetMapping("/get_station_order_by_code") + @GetMapping("/getStationOrderByCode") @Operation(summary = "通过提货码获取自提订单或虚拟订单", description = "自提点输入提货码获取自提订单或虚拟订单") @Parameter(name = "code", description = "提货码", required = true) public ServerResponseEntity getStationOrderByCode(@RequestParam("code") String code) { @@ -157,7 +157,7 @@ public class StationController { } - @PutMapping("/order_station_by_order_id") + @PutMapping("/orderStationByOrderId") @Operation(summary = "自提点提货", description = "自提点提货操作") @Parameter(name = "orderIds", description = "订单编号数组", required = true) public ServerResponseEntity orderStationByOrderId(@RequestBody String orderIds) { @@ -168,7 +168,7 @@ public class StationController { return ServerResponseEntity.success(Boolean.TRUE); } - @PutMapping("/order_write_off_by_order_id") + @PutMapping("/orderWriteOffByOrderId") @Operation(summary = "虚拟商品订单核销操作", description = "虚拟商品订单核销操作") public ServerResponseEntity orderWriteOffByOrderId(@RequestBody OrderVirtualInfoDTO orderVirtualInfoDTO) { Long orderId = orderVirtualInfoDTO.getOrderId(); diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/TranscityFreeController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/TranscityFreeController.java index 2ec716b..b304767 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/TranscityFreeController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/TranscityFreeController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; * @date 2020-12-07 15:10:01 */ @RestController("appTranscityFreeController") -@RequestMapping("/transcity_free") +@RequestMapping("/transcityFree") @Tag(name = "指定条件包邮城市项") public class TranscityFreeController { diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/TransfeeFreeController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/TransfeeFreeController.java index a456b09..48418c2 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/TransfeeFreeController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/app/TransfeeFreeController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; * @date 2020-12-07 15:10:01 */ @RestController("appTransfeeFreeController") -@RequestMapping("/transfee_free") +@RequestMapping("/transfeeFree") @Tag(name = "指定条件包邮项") public class TransfeeFreeController { diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/multishop/SameCityController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/multishop/SameCityController.java index 83d909b..eb16743 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/multishop/SameCityController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/multishop/SameCityController.java @@ -24,14 +24,14 @@ import org.springframework.web.bind.annotation.*; * @date 2020-05-23 08:26:25 */ @RestController("multishopSameCityController") -@RequestMapping("/m/same_city") +@RequestMapping("/m/sameCity") @Tag(name = "商家端同城配送接口") public class SameCityController { @Autowired private SameCityService sameCityService; - @GetMapping("/get_same_city_info") + @GetMapping("/getSameCityPage") @Operation(summary = "获取同城配送数据") public ServerResponseEntity getSameCityPage() { Long shopId = AuthUserContext.get().getTenantId(); diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/multishop/StationController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/multishop/StationController.java index 2f8b88e..cab043e 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/multishop/StationController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/multishop/StationController.java @@ -156,7 +156,7 @@ public class StationController { return ServerResponseEntity.success(); } - @PostMapping("/create_account") + @PostMapping("/createAccount") @Operation(summary = "创建自提门店账号", description = "创建自提门店账号") public ServerResponseEntity createAccount(@RequestBody StationDTO stationDTO) { // 创建账号 @@ -181,7 +181,7 @@ public class StationController { return ServerResponseEntity.success(); } - @PutMapping("/change_account_info") + @PutMapping("/changeAccountInfo") @Operation(summary = "账号密码设置", description = "账号密码设置") public ServerResponseEntity changeAccountInfo(@RequestBody StationDTO stationDTO) { // 检查是否有权限 @@ -207,7 +207,7 @@ public class StationController { return ServerResponseEntity.success(); } - @GetMapping("/check_station_account") + @GetMapping("/checkStationAccount") @Operation(summary = "校验账号") @Parameters({ @Parameter(name = "stationId", description = "自提点id"), @@ -229,7 +229,7 @@ public class StationController { return ServerResponseEntity.success(true); } - @GetMapping("/get_offline_handle_event/{stationId}") + @GetMapping("/getOfflineHandleEvent/{stationId}") @Operation(summary = "通过自提点id获取下线信息") @Parameter(name = "stationId", description = "自提点id", required = true) public ServerResponseEntity getOfflineHandleEventByStationId(@PathVariable("stationId") Long stationId) { @@ -237,7 +237,7 @@ public class StationController { return ServerResponseEntity.success(offlineHandleEventVO); } - @PostMapping("/audit_apply") + @PostMapping("/auditApply") @Operation(summary = "下线自提点提交审核") public ServerResponseEntity auditApply(@RequestBody OfflineHandleEventDTO eventDTO) { StationVO stationVO = stationService.getByStationId(eventDTO.getHandleId()); @@ -254,14 +254,14 @@ public class StationController { return ServerResponseEntity.success(); } - @GetMapping("/list_station") + @GetMapping("/stationPage") @Operation(summary = "获取自提点列表", description = "获取自提点列表") public ServerResponseEntity> page() { Long shopId = AuthUserContext.get().getTenantId(); return ServerResponseEntity.success(stationService.listByShopId(shopId)); } - @PutMapping("/switch_station_stock_mode") + @PutMapping("/switchStationStockMode") @Operation(summary = "切换门店库存模式", description = "切换门店库存模式") @Parameters({ @Parameter(name = "stationId", description = "门店id"), diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/platform/DeliveryCompanyController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/platform/DeliveryCompanyController.java index dabe40e..10a2da4 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/platform/DeliveryCompanyController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/platform/DeliveryCompanyController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; * @Date 2021/4/27 10:17 */ @RestController("platformDeliveryCompanyController") -@RequestMapping("/p/delivery_company") +@RequestMapping("/p/deliveryCompany") @Tag(name = "物流公司") public class DeliveryCompanyController { diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/platform/StationController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/platform/StationController.java index caef5ff..1c6d3d1 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/platform/StationController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/platform/StationController.java @@ -99,7 +99,7 @@ public class StationController { return ServerResponseEntity.success(stationVO); } - @GetMapping("/get_offline_handle_event/{stationId}") + @GetMapping("/getOfflineHandleEvent/{stationId}") @Operation(summary = "通过自提点id获取下线信息") @Parameter(name = "stationId", description = "自提点id", required = true) public ServerResponseEntity getOfflineHandleEventByStationId(@PathVariable("stationId") Long stationId) { @@ -123,7 +123,7 @@ public class StationController { return ServerResponseEntity.success(); } - @PostMapping("/audit_station") + @PostMapping("/auditStation") @Operation(summary = "自提点下线审核") public ServerResponseEntity auditStation(@RequestBody OfflineHandleEventDTO eventDTO) { this.isExist(eventDTO.getHandleId()); diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/supplier/OrderDeliveryController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/supplier/OrderDeliveryController.java index ba4a405..af17190 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/supplier/OrderDeliveryController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/supplier/OrderDeliveryController.java @@ -19,7 +19,7 @@ import java.util.List; */ @Controller @RestController("supplierOrderDeliveryController") -@RequestMapping("/s/order_delivery") +@RequestMapping("/s/orderDelivery") @Tag(name = "供应商订单物流包裹") public class OrderDeliveryController { diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/supplier/OutletConfigController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/supplier/OutletConfigController.java index b06b45c..59bd4ec 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/supplier/OutletConfigController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/supplier/OutletConfigController.java @@ -28,7 +28,7 @@ import java.util.List; * @date 2023-08-23 14:48:23 */ @RestController("supplierOutletConfigController") -@RequestMapping("/s/outlet_config") +@RequestMapping("/s/outletConfig") @Tag(name = "供应商网点配置") public class OutletConfigController { @@ -85,7 +85,7 @@ public class OutletConfigController { return ServerResponseEntity.success(); } - @PutMapping("/set_default") + @PutMapping("/setDefault") @Operation(summary = "设网点信息为默认/取消默认") public ServerResponseEntity setDefault(@RequestParam Long outletConfigId) { outletConfigService.setDefault(outletConfigId); @@ -93,9 +93,9 @@ public class OutletConfigController { return ServerResponseEntity.success(); } - @GetMapping("/list_outlet_config") + @GetMapping("/outletConfigList") @Operation(summary = "获取网点信息列表") - public ServerResponseEntity> listOutletConfig() { + public ServerResponseEntity> outletConfigList() { List list = outletConfigService.listByShopId(AuthUserContext.get().getTenantId(), AuthUserContext.get().getSysType()); return ServerResponseEntity.success(list); } diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/supplier/PrinterController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/supplier/PrinterController.java index 1b77254..2d9d976 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/supplier/PrinterController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/controller/supplier/PrinterController.java @@ -77,7 +77,7 @@ public class PrinterController { return ServerResponseEntity.success(); } - @PutMapping("/set_default") + @PutMapping("/setDefault") @Operation(summary = "设打印机信息为默认/取消默认") public ServerResponseEntity setDefault(@RequestParam Long printerId) { printerService.setDefault(printerId); @@ -85,9 +85,9 @@ public class PrinterController { return ServerResponseEntity.success(); } - @GetMapping("/list_printer") + @GetMapping("/printerList") @Operation(summary = "获取打印机信息列表") - public ServerResponseEntity> listPrinter() { + public ServerResponseEntity> printerList() { List list = printerService.listByShopId(AuthUserContext.get().getTenantId(), AuthUserContext.get().getSysType()); return ServerResponseEntity.success(list); } diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/admin/OrderController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/admin/OrderController.java index c2eba38..3faed0c 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/admin/OrderController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/admin/OrderController.java @@ -195,7 +195,7 @@ public class OrderController { /** * 获取信息 */ - @GetMapping("/order_info/{orderId}") + @GetMapping("/orderInfo/{orderId}") public ServerResponseEntity info(@PathVariable("orderId") Long orderId) { // 订单和订单项 Order order = orderService.getOrderAndOrderItemData(orderId, AuthUserContext.get().getTenantId()); diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/app/MyOrderController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/app/MyOrderController.java index 62ecdab..6635d12 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/app/MyOrderController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/app/MyOrderController.java @@ -428,7 +428,7 @@ public class MyOrderController { return ServerResponseEntity.success(orderItemVO); } - @GetMapping("/get_order_status") + @GetMapping("/getOrderStatus") @Operation(summary = "根据虚拟订单编号获取订单券码") public ServerResponseEntity getOrderStatus(@RequestParam("orderId") Long orderId) { EsOrderBO esorder = orderService.getEsOrder(orderId); diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/app/MyStationOrderController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/app/MyStationOrderController.java index c1ce64c..9a625cb 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/app/MyStationOrderController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/app/MyStationOrderController.java @@ -115,7 +115,7 @@ public class MyStationOrderController { return ServerResponseEntity.success(page); } - @PutMapping("/order_station_by_order_id") + @PutMapping("/orderStationByOrderId") @Operation(summary = "用户提货操作", description = "用户提货操作") public ServerResponseEntity orderStationByOrderId(@RequestBody OrderStationWriteOffDTO orderStationWriteOffDTO) { orderService.orderStationByOrderId(orderStationWriteOffDTO.getOrderIds(), AuthUserContext.get().getUserId(), orderStationWriteOffDTO.getStationId()); diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/app/OrderRefundController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/app/OrderRefundController.java index 524072d..09a4153 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/app/OrderRefundController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/app/OrderRefundController.java @@ -82,7 +82,7 @@ public class OrderRefundController { private OrderRefundAddrService orderRefundAddrService; - @GetMapping("/user_page") + @GetMapping("/userPage") @Operation(summary = "用户退款订单搜索接口", description = "用户退款订单搜索接口") public ServerResponseEntity> pcPage(@Valid PageDTO pageDTO, OrderRefundSearchDTO orderRefundSearchDTO) { PageVO orderRefundPage = orderRefundService.userOrderRefundPage(pageDTO, orderRefundSearchDTO); diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/multishop/AllotOrderController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/multishop/AllotOrderController.java index 4cf5d4d..1bf58b6 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/multishop/AllotOrderController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/multishop/AllotOrderController.java @@ -89,7 +89,7 @@ public class AllotOrderController { @Parameter(name = "outWarehouseId", description = "调出仓库id"), @Parameter(name = "inWarehouseId", description = "调入仓库id") }) - @PostMapping("/import_excel") + @PostMapping("/importExcel") public ServerResponseEntity importExcel(Long outWarehouseId, Long inWarehouseId, @RequestPart("excelFile") MultipartFile excelFile) { diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/multishop/OrderVirtualInfoController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/multishop/OrderVirtualInfoController.java index e86d01c..4268013 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/multishop/OrderVirtualInfoController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/multishop/OrderVirtualInfoController.java @@ -30,7 +30,7 @@ public class OrderVirtualInfoController { @Autowired private OrderVirtualInfoService orderVirtualInfoService; - @GetMapping("/order_info/{orderId}") + @GetMapping("/orderInfo/{orderId}") @Operation(summary = "根据订单号获取虚拟订单信息", description = "根据订单号获取订单信息") public ServerResponseEntity info(@PathVariable("orderId") Long orderId) { Long shopId = AuthUserContext.get().getTenantId(); @@ -45,7 +45,7 @@ public class OrderVirtualInfoController { return ServerResponseEntity.success(orderVO); } - @PutMapping("/order_write_off_by_order_id") + @PutMapping("/orderWriteOffByOrderId") @Operation(summary = "用户虚拟商品订单核销操作", description = "用户虚拟商品订单核销操作") public ServerResponseEntity orderWriteOffByOrderId(@RequestBody OrderVirtualInfoDTO orderVirtualInfoDTO) { Long orderId = orderVirtualInfoDTO.getOrderId(); diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/platform/OrderController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/platform/OrderController.java index 5acd7e2..bf4a90b 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/platform/OrderController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/platform/OrderController.java @@ -148,7 +148,7 @@ public class OrderController { /** * 获取信息 */ - @GetMapping("/order_info/{orderId}") + @GetMapping("/orderInfo/{orderId}") public ServerResponseEntity info(@PathVariable("orderId") Long orderId) { // 订单和订单项 Order order = orderService.getOrderAndOrderItemData(orderId, null); diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/supplier/AllotOrderController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/supplier/AllotOrderController.java index e2666f6..36e3d36 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/supplier/AllotOrderController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/supplier/AllotOrderController.java @@ -89,7 +89,7 @@ public class AllotOrderController { @Parameter(name = "outWarehouseId", description = "调出仓库id"), @Parameter(name = "inWarehouseId", description = "调入仓库id") }) - @PostMapping("/import_excel") + @PostMapping("/importExcel") public ServerResponseEntity importExcel(Long outWarehouseId, Long inWarehouseId, @RequestPart("excelFile") MultipartFile excelFile) { diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/supplier/OrderController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/supplier/OrderController.java index c20ff14..6e11ac4 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/supplier/OrderController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/supplier/OrderController.java @@ -151,7 +151,7 @@ public class OrderController { /** * 获取信息 */ - @GetMapping("/order_info/{orderId}") + @GetMapping("/orderInfo/{orderId}") public ServerResponseEntity info(@PathVariable("orderId") Long orderId) { // 订单和订单项 Order order = orderService.getOrderAndOrderItemData(orderId, null); diff --git a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/supplier/PurchaseOrderController.java b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/supplier/PurchaseOrderController.java index b5d6e68..efe8f83 100644 --- a/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/supplier/PurchaseOrderController.java +++ b/tmerclub-order/src/main/java/com/tmerclub/cloud/order/controller/supplier/PurchaseOrderController.java @@ -178,7 +178,7 @@ public class PurchaseOrderController { return ServerResponseEntity.success(info); } - @GetMapping("/sold_excel") + @GetMapping("/soldExcel") @Operation(summary = "导出excel", description = "导出订单excel") public ServerResponseEntity orderSoldExcel(HttpServletResponse response, PurchaseOrderDTO purchaseOrder) { purchaseOrder.setSupplierId(AuthUserContext.get().getTenantId()); diff --git a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/app/AllinpayMemberController.java b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/app/AllinpayMemberController.java index 7061d89..b390374 100644 --- a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/app/AllinpayMemberController.java +++ b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/app/AllinpayMemberController.java @@ -54,7 +54,7 @@ public class AllinpayMemberController { @Value("${application.domainUrl}") private String domainUrl; - @GetMapping("/get_user_info") + @GetMapping("/getMemberInfo") @Operation(summary = "获取个人会员信息", description = "获取个人会员信息") public ServerResponseEntity getMemberInfo() { String bizUserId = String.valueOf(AuthUserContext.get().getUserId()); @@ -68,7 +68,7 @@ public class AllinpayMemberController { return ServerResponseEntity.success(userInfo); } - @PostMapping("/set_real_name") + @PostMapping("/setRealName") @Operation(summary = "个人实名验证", description = "个人实名验证") public ServerResponseEntity setRealName(@RequestBody SetRealNameBySmsCodeDTO setRealNameBySmsCodeDTO) { UserExtensionDTO userExtensionDTO = new UserExtensionDTO(); @@ -84,7 +84,7 @@ public class AllinpayMemberController { return ServerResponseEntity.success(); } - @PostMapping("/set_pay_pwd") + @PostMapping("/setPayPwd") @Operation(summary = "设置支付密码", description = "设置支付密码") public ServerResponseEntity setPayPwd(@RequestBody SetPayPwdDTO setPayPwdDTO) { Long userId = AuthUserContext.get().getUserId(); @@ -99,7 +99,7 @@ public class AllinpayMemberController { return ServerResponseEntity.success(url); } - @PutMapping("/update_pay_pwd") + @PutMapping("/updatePayPwd") @Operation(summary = "修改支付密码", description = "修改支付密码") public ServerResponseEntity updatePayPwd(@RequestBody SetPayPwdDTO setPayPwdDTO) { Long userId = AuthUserContext.get().getUserId(); @@ -114,7 +114,7 @@ public class AllinpayMemberController { return ServerResponseEntity.success(url); } - @PutMapping("/reset_pay_pwd") + @PutMapping("/resetPayPwd") @Operation(summary = "重置支付密码", description = "重置支付密码") public ServerResponseEntity resetPayPwd(@RequestBody SetPayPwdDTO setPayPwdDTO) { Long userId = AuthUserContext.get().getUserId(); @@ -129,7 +129,7 @@ public class AllinpayMemberController { return ServerResponseEntity.success(url); } - @PutMapping("/update_phone_by_pay_pwd") + @PutMapping("/updatePhoneByPayPwd") @Operation(summary = "修改绑定手机(返回通联页面url)", description = "仅限个人会员") public ServerResponseEntity updatePhoneByPayPwd(@RequestBody UpdatePhoneByPayPwdDTO updatePhoneByPayPwdDTO) { String bizUserId = String.valueOf(AuthUserContext.get().getUserId()); @@ -144,7 +144,7 @@ public class AllinpayMemberController { return ServerResponseEntity.success(url); } - @GetMapping("/query_bind_acct") + @GetMapping("/queryBindAcct") @Operation(summary = "查询已绑定的支付账户用户标识", description = "查询已绑定的支付账户用户标识") public ServerResponseEntity queryBindAcct() { String bizUserId = String.valueOf(AuthUserContext.get().getUserId()); @@ -152,7 +152,7 @@ public class AllinpayMemberController { return ServerResponseEntity.success(resp); } - @PostMapping("/sign_acct_protocol") + @PostMapping("/signAcctProtocol") @Operation(summary = "账户提现协议签约", description = "账户提现协议签约") public ServerResponseEntity signAcctProtocol(@RequestBody SignAcctProtocolDTO signAcctProtocolDTO) { Long userId = AuthUserContext.get().getUserId(); @@ -165,7 +165,7 @@ public class AllinpayMemberController { return ServerResponseEntity.success(url); } - @GetMapping("/sign_contract_query") + @GetMapping("/signContractQuery") @Operation(summary = "账户协议签约查询", description = "账户协议签约查询") public ServerResponseEntity signContractQuery(SignAcctProtocolDTO signAcctProtocolDTO) { Long userId = AuthUserContext.get().getUserId(); @@ -173,7 +173,7 @@ public class AllinpayMemberController { return ServerResponseEntity.success(url); } - @PostMapping("/apply_bind_bank_card") + @PostMapping("/applyBindBankCard") @Operation(summary = "请求绑定银行卡", description = "请求绑定银行卡") public ServerResponseEntity applyBindBankCard(@RequestBody ApplyBankCardDTO applyBankCardDTO) { String bizUserId = AuthUserContext.get().getUserId().toString(); @@ -186,7 +186,7 @@ public class AllinpayMemberController { return ServerResponseEntity.success(resp); } - @PutMapping("/bind_bank_card") + @PutMapping("/bindBankCard") @Operation(summary = "绑定银行卡", description = "绑定银行卡") public ServerResponseEntity bindBankCard(@RequestBody BindBankCardDTO bindBankCardDTO) { Long userId = AuthUserContext.get().getUserId(); @@ -194,7 +194,7 @@ public class AllinpayMemberController { return ServerResponseEntity.success(); } - @PutMapping("/unbind_bank_card") + @PutMapping("/unbindBankCard") @Operation(summary = "解绑银行卡", description = "解绑银行卡") public ServerResponseEntity unbindBankCard(@RequestBody UnbindBankCardDTO unbindBankCardDTO) { Long userId = AuthUserContext.get().getUserId(); @@ -202,7 +202,7 @@ public class AllinpayMemberController { return ServerResponseEntity.success(); } - @GetMapping("/query_bank_card") + @GetMapping("/queryBankCard") @Operation(summary = "查询银行卡", description = "查询银行卡") @Parameter(name = "cardNo", description = "银行卡号(不传则查询全部银行卡)") public ServerResponseEntity> queryBankCard(@RequestParam(value = "cardNo", required = false) String cardNo) { @@ -211,7 +211,7 @@ public class AllinpayMemberController { return ServerResponseEntity.success(bindCards); } - @PostMapping("/send_verification_code") + @PostMapping("/sendVerificationCode") @Operation(summary = "发送短信验证码", description = "发送短信验证码") public ServerResponseEntity sendVerificationCode(@RequestBody VerificationCodeDTO verificationCodeDTO) { String bizUserId = AuthUserContext.get().getUserId().toString(); @@ -219,7 +219,7 @@ public class AllinpayMemberController { return ServerResponseEntity.success(); } - @PostMapping("/bind_phone") + @PostMapping("/bindPhone") @Operation(summary = "绑定手机", description = "绑定手机") public ServerResponseEntity bindPhone(@RequestBody VerificationCodeDTO verificationCodeDTO) { String bizUserId = AuthUserContext.get().getUserId().toString(); @@ -240,7 +240,7 @@ public class AllinpayMemberController { return ServerResponseEntity.success(); } - @PutMapping("/unbind_phone") + @PutMapping("/unbindPhone") @Operation(summary = "解绑手机", description = "解绑手机") public ServerResponseEntity unbindPhone(@RequestBody VerificationCodeDTO verificationCodeDTO) { Long userId = AuthUserContext.get().getUserId(); @@ -248,23 +248,23 @@ public class AllinpayMemberController { return ServerResponseEntity.success(); } - @PutMapping("/bank_card_change_bind_phone") + @PutMapping("/changeBindPhone") @Operation(summary = "修改绑定手机(银行卡验证版)", description = "修改绑定手机(银行卡验证版)") - public ServerResponseEntity bankCardChangeBindPhone(@RequestBody BankCardChangeBindPhoneDTO bankCardChangeBindPhoneDTO) { + public ServerResponseEntity changeBindPhone(@RequestBody BankCardChangeBindPhoneDTO bankCardChangeBindPhoneDTO) { String bizUserId = String.valueOf(AuthUserContext.get().getUserId()); BankCardChangeBindPhoneResp resp = allinpayService.bankCardChangeBindPhone(bizUserId, bankCardChangeBindPhoneDTO); return ServerResponseEntity.success(resp); } - @PutMapping("/verify_bank_card_change_bind_phone") + @PutMapping("/confirmChangeBindPhone") @Operation(summary = "确认修改绑定手机(银行卡验证版)", description = "确认修改绑定手机(银行卡验证版)") - public ServerResponseEntity verifyBankCardChangeBindPhone(@RequestBody VerifyBankCardChangeBindPhoneDTO verifyBankCardChangeBindPhoneDTO) { + public ServerResponseEntity confirmChangeBindPhone(@RequestBody VerifyBankCardChangeBindPhoneDTO verifyBankCardChangeBindPhoneDTO) { String bizUserId = String.valueOf(AuthUserContext.get().getUserId()); allinpayService.verifyBankCardChangeBindPhone(bizUserId, verifyBankCardChangeBindPhoneDTO); return ServerResponseEntity.success(); } - @PostMapping("/create_member") + @PostMapping("/createMember") @Operation(summary = "创建会员", description = "创建会员") public ServerResponseEntity createMember() { UidInfoBO uidInfoBO = AuthUserContext.get(); @@ -277,10 +277,10 @@ public class AllinpayMemberController { return ServerResponseEntity.success(); } - @GetMapping("/get_bank_card_bin") + @GetMapping("/getBankcardBin") @Operation(summary = "查询卡bin", description = "查询卡bin") @Parameter(name = "cardNo", description = "卡号") - public ServerResponseEntity getBankCardBin(String cardNo) { + public ServerResponseEntity getBankcardBin(String cardNo) { CardBinInfo cardBinInfo = allinpayService.getBankCardBin(cardNo); return ServerResponseEntity.success(cardBinInfo); } diff --git a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/app/AllinpayOrderController.java b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/app/AllinpayOrderController.java index 60472c2..4e6634b 100644 --- a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/app/AllinpayOrderController.java +++ b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/app/AllinpayOrderController.java @@ -32,7 +32,7 @@ public class AllinpayOrderController { @Autowired private AllinpayService allinpayService; - @GetMapping("/query_balance") + @GetMapping("/queryBalance") @Operation(summary = "查询账户余额") public ServerResponseEntity queryBalance() { UidInfoBO uidInfoBO = AuthUserContext.get(); @@ -41,7 +41,7 @@ public class AllinpayOrderController { return ServerResponseEntity.success(queryBalanceResp); } - @GetMapping("/query_in_exp_detail") + @GetMapping("/queryInExpDetail") @Operation(summary = "查询账户收支明细") public ServerResponseEntity> queryInExpDetail(PageDTO pageDTO, QueryInExpDetailDTO queryInExpDetailDTO) { @@ -50,7 +50,7 @@ public class AllinpayOrderController { return ServerResponseEntity.success(pageVO); } - @PostMapping("/pay_confirm_by_front_sms") + @PostMapping("/payConfirmByFrontSms") @Operation(summary = "确认支付[前台+短信验证码])", description = "通联支付申请后，前端再调用此接口获取通联页面链接") public ServerResponseEntity payConfirmByFrontSms(@RequestBody PayBySmsDTO payBySmsDTO) { String bizUserId = String.valueOf(AuthUserContext.get().getUserId()); @@ -58,7 +58,7 @@ public class AllinpayOrderController { return ServerResponseEntity.success(url); } - @PostMapping("/pay_confirm_by_front_pwd") + @PostMapping("/payConfirmByFrontPwd") @Operation(summary = "确认支付[前台+密码验证版]", description = "通联支付申请后，前端再调用此接口获取通联页面链接") public ServerResponseEntity payConfirmByFrontPwd(@RequestBody PayByPwdDTO payByPwdDTO) { String bizUserId = String.valueOf(AuthUserContext.get().getUserId()); @@ -66,7 +66,7 @@ public class AllinpayOrderController { return ServerResponseEntity.success(url); } - @PostMapping("/pay_confirm_by_back_sms") + @PostMapping("/payConfirmByBackSms") @Operation(summary = "确认支付[后台+短信验证码]", description = "通联支付申请后，后端再调用此接口获取通联页面链接") public ServerResponseEntity payConfirmByBackSms(@RequestBody PayByBackSmsDTO payByBackSmsDTO) { String bizUserId = String.valueOf(AuthUserContext.get().getUserId()); @@ -74,14 +74,14 @@ public class AllinpayOrderController { return ServerResponseEntity.success(resp); } - @GetMapping("/resend_pay_sms") + @GetMapping("/resendPaySms") @Operation(summary = "重新发送支付短信验证码") public ServerResponseEntity resendPaySms(String bizOrderNo) { ResendPaySmsResp resp = allinpayService.resendPaySms(bizOrderNo); return ServerResponseEntity.success(resp); } - @GetMapping("/get_order_status") + @GetMapping("/getOrderStatus") @Operation(summary = "查询订单状态") public ServerResponseEntity getOrderStatus(String bizOrderNo) { String bizUserId = String.valueOf(AuthUserContext.get().getUserId()); diff --git a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/multishop/AllinpayCompanyController.java b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/multishop/AllinpayCompanyController.java index a96f99f..7723352 100644 --- a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/multishop/AllinpayCompanyController.java +++ b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/multishop/AllinpayCompanyController.java @@ -33,7 +33,7 @@ import java.util.stream.Collectors; */ @Tag(name = "通联支付-企业会员接口(商家端)") @RestController("mulitshop-allinpay-company") -@RequestMapping("/m/apply_shop/allinpay/company") +@RequestMapping("/m/applyShop/allinpay/company") public class AllinpayCompanyController { @Autowired @@ -42,13 +42,13 @@ public class AllinpayCompanyController { @Value("${application.domainUrl}") private String domainUrl; - @GetMapping("/create_company_member") + @GetMapping("/createCompanyMember") public ServerResponseEntity createCompanyMember(@RequestParam("bizUserId") String bizUserId) { allinpayCompanyService.createCompanyMember(bizUserId); return ServerResponseEntity.success(); } - @GetMapping("/get_company_info") + @GetMapping("/getCompanyInfo") @Operation(summary = "获取企业信息", description = "获取企业信息") public ServerResponseEntity getCompanyInfo() { String bizUserId = getBizUserId(); @@ -56,14 +56,14 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(companyInfo); } - @GetMapping("/get_company_info_by_id") + @GetMapping("/getCompanyInfoById") @Operation(summary = "获取企业信息--测试", description = "获取企业信息") - public ServerResponseEntity getCompanyInfo(@RequestParam("bizUserId") String bizUserId) { + public ServerResponseEntity getCompanyInfoById(@RequestParam("bizUserId") String bizUserId) { CompanyInfo companyInfo = allinpayCompanyService.getCompanyInfo(bizUserId); return ServerResponseEntity.success(companyInfo); } - @PostMapping("/send_verification_code") + @PostMapping("/sendVerificationCode") @Operation(summary = "发送短信验证码", description = "发送短信验证码") public ServerResponseEntity sendVerificationCode(@RequestBody VerificationCodeDTO verificationCodeDTO) { String bizUserId = getBizUserId(); @@ -83,7 +83,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @PostMapping("/bind_phone") + @PostMapping("/bindPhone") @Operation(summary = "绑定手机", description = "绑定手机") public ServerResponseEntity bindPhone(@RequestBody VerificationCodeDTO verificationCodeDTO) { String bizUserId = getBizUserId(); @@ -100,7 +100,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @PutMapping("/unbind_phone") + @PutMapping("/unbindPhone") @Operation(summary = "解绑手机", description = "解绑手机") public ServerResponseEntity unbindPhone(@RequestBody VerificationCodeDTO verificationCodeDTO) { String bizUserId = getBizUserId(); @@ -118,7 +118,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @PostMapping("/set_company_info") + @PostMapping("/setCompanyInfo") @Operation(summary = "设置企业信息--该接口前端不调用", description = "设置企业信息--该接口前端不调用") public ServerResponseEntity setCompanyInfo(@RequestBody SetCompanyInfoDTO setCompanyInfoDTO) { String bizUserId = getBizUserId(); @@ -128,7 +128,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @PutMapping("/update_company_info") + @PutMapping("/updateCompanyInfo") @Operation(summary = "企业会员信息修改--该接口前端不调用", description = "企业会员信息修改--该接口前端不调用") public ServerResponseEntity updateCompanyInfo(@RequestBody UpdateCompanyInfoDTO updateCompanyInfoDTO) { String bizUserId = getBizUserId(); @@ -143,7 +143,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @PostMapping("/apply_bind_bank_card") + @PostMapping("/applyBindBankCard") @Operation(summary = "请求绑定银行卡", description = "请求绑定银行卡-法人") public ServerResponseEntity applyBindBankCard(@RequestBody ApplyBankCardDTO applyBankCardDTO) { String bizUserId = getBizUserId(); @@ -153,7 +153,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @PutMapping("/bind_bank_card") + @PutMapping("/bindBankCard") @Operation(summary = "确认绑定银行卡--当前绑卡方式为8，该接口不调用", description = "确认绑定银行卡-法人") public ServerResponseEntity bindBankCard(@RequestBody BindBankCardDTO bindBankCardDTO) { String bizUserId = getBizUserId(); @@ -163,7 +163,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @PutMapping("/unbind_bank_card") + @PutMapping("/unbindBankCard") @Operation(summary = "解绑银行卡", description = "解绑银行卡-法人") public ServerResponseEntity unbindBankCard(@RequestBody UnbindBankCardDTO unbindBankCardDTO) { String bizUserId = getBizUserId(); @@ -172,7 +172,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @GetMapping("query_bank_card") + @GetMapping("/queryBankCard") @Operation(summary = "查询银行卡", description = "查询银行卡") @Parameter(name = "cardNo", description = "银行卡号(不传则查询全部银行卡)") public ServerResponseEntity> queryBankCard(@RequestParam(value = "cardNo", required = false) String cardNo) { @@ -182,7 +182,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(bindCards); } - @PostMapping("/bind_company_account") + @PostMapping("/bindCompanyAccount") @Operation(summary = "企业会员绑定对公户", description = "企业会员绑定对公户") public ServerResponseEntity bindCompanyAccount(@RequestBody BindCompanyAccountDTO bindCompanyAccountDTO) { String bizUserId = getBizUserId(); @@ -192,7 +192,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @PostMapping("/sign_acct_protocol") + @PostMapping("/signAcctProtocol") @Operation(summary = "账户提现协议签约", description = "账户提现协议签约") public ServerResponseEntity signAcctProtocol(@RequestBody SignAcctProtocolDTO signAcctProtocolDTO) { String bizUserId = getBizUserId(); @@ -202,7 +202,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(url); } - @GetMapping("/sign_contract_query") + @GetMapping("/signContractQuery") @Operation(summary = "账户协议签约查询", description = "账户协议签约查询") public ServerResponseEntity signContractQuery(SignAcctProtocolDTO signAcctProtocolDTO) { String bizUserId = getBizUserId(); diff --git a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/multishop/AllinpayOrderController.java b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/multishop/AllinpayOrderController.java index 6023968..79ac326 100644 --- a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/multishop/AllinpayOrderController.java +++ b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/multishop/AllinpayOrderController.java @@ -33,7 +33,7 @@ public class AllinpayOrderController { @Autowired private AllinpayService allinpayService; - @GetMapping("/query_balance") + @GetMapping("/queryBalance") @Operation(summary = "查询账户余额") public ServerResponseEntity queryBalance() { String bizUserId = String.valueOf(AuthUserContext.get().getTenantId()); @@ -41,7 +41,7 @@ public class AllinpayOrderController { return ServerResponseEntity.success(queryBalanceResp); } - @GetMapping("/query_in_exp_detail") + @GetMapping("/queryInExpDetail") @Operation(summary = "查询账户收支明细") public ServerResponseEntity> queryInExpDetail(PageDTO pageDTO, QueryInExpDetailDTO queryInExpDetailDTO) { @@ -50,7 +50,7 @@ public class AllinpayOrderController { return ServerResponseEntity.success(pageVO); } - @PostMapping("/pay_confirm_by_front_sms") + @PostMapping("/payConfirmByFrontSms") @Operation(summary = "确认支付[前台+短信验证码])", description = "通联支付申请后，前端再调用此接口获取通联页面链接") public ServerResponseEntity payConfirmByFrontSms(@RequestBody PayBySmsDTO payBySmsDTO) { String bizUserId = String.valueOf(AuthUserContext.get().getTenantId()); @@ -58,7 +58,7 @@ public class AllinpayOrderController { return ServerResponseEntity.success(url); } - @PostMapping("/pay_confirm_by_front_pwd") + @PostMapping("/payConfirmByFrontPwd") @Operation(summary = "确认支付[前台+密码验证版]", description = "通联支付申请后，前端再调用此接口获取通联页面链接") public ServerResponseEntity payConfirmByFrontPwd(@RequestBody PayByPwdDTO payByPwdDTO) { String bizUserId = String.valueOf(AuthUserContext.get().getTenantId()); @@ -66,7 +66,7 @@ public class AllinpayOrderController { return ServerResponseEntity.success(url); } - @PostMapping("/pay_confirm_by_back_sms") + @PostMapping("/payConfirmByBackSms") @Operation(summary = "确认支付[后台+短信验证码]", description = "通联支付申请后，后端再调用此接口获取通联页面链接") public ServerResponseEntity payConfirmByBackSms(@RequestBody PayByBackSmsDTO payByBackSmsDTO) { String bizUserId = String.valueOf(AuthUserContext.get().getTenantId()); @@ -74,14 +74,14 @@ public class AllinpayOrderController { return ServerResponseEntity.success(resp); } - @GetMapping("/resend_pay_sms") + @GetMapping("/resendPaySms") @Operation(summary = "重新发送支付短信验证码") public ServerResponseEntity resendPaySms(String bizOrderNo) { ResendPaySmsResp resp = allinpayService.resendPaySms(bizOrderNo); return ServerResponseEntity.success(resp); } - @GetMapping("/get_order_status") + @GetMapping("/getOrderStatus") @Operation(summary = "查询订单状态") public ServerResponseEntity getOrderStatus(String bizOrderNo) { String bizUserId = String.valueOf(AuthUserContext.get().getTenantId()); diff --git a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/multishop/RechargePayController.java b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/multishop/RechargePayController.java index e97772c..d4f148b 100644 --- a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/multishop/RechargePayController.java +++ b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/multishop/RechargePayController.java @@ -87,7 +87,7 @@ public class RechargePayController { } - @GetMapping("/is_pay/{payEntry}/{orderIds}") + @GetMapping("/isPay/{payEntry}/{orderIds}") @Operation(summary = "根据订单号查询该订单是否已经支付", description = "根据订单号查询该订单是否已经支付") public ResponseEntity isPay(@PathVariable Integer payEntry, @PathVariable String orderIds) { Long shopId = AuthUserContext.getShopId(); diff --git a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/platform/AccountDetailController.java b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/platform/AccountDetailController.java index 22ac37b..60f8fa1 100644 --- a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/platform/AccountDetailController.java +++ b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/platform/AccountDetailController.java @@ -26,7 +26,7 @@ import java.util.Objects; * @author TRACK */ @RestController("platformAccountDetailController") -@RequestMapping("/p/account_detail") +@RequestMapping("/p/accountDetail") @Tag(name = "platform-账户详情") public class AccountDetailController { @Autowired @@ -35,7 +35,7 @@ public class AccountDetailController { @Autowired private RefundInfoService refundInfoService; - @GetMapping("/get_income_account_detail") + @GetMapping("/getIncomeAccountDetail") @Operation(summary = "获取收入账户详情", description = "根据时间获取") public ServerResponseEntity getIncomeAccountDetail(AccountSearchDTO accountSearchDTO) { if (Objects.equals(accountSearchDTO.getShopId(), Constant.PLATFORM_SHOP_ID)) { @@ -46,7 +46,7 @@ public class AccountDetailController { return ServerResponseEntity.success(accountDetailVO); } - @GetMapping("/get_refund_account_detail") + @GetMapping("/getRefundAccountDetail") @Operation(summary = "获取退款账户详情", description = "根据时间获取") public ServerResponseEntity getRefundAccountDetail(AccountSearchDTO accountSearchDTO) { if (Objects.equals(accountSearchDTO.getShopId(), Constant.PLATFORM_SHOP_ID)) { @@ -57,42 +57,42 @@ public class AccountDetailController { return ServerResponseEntity.success(accountDetailVO); } - @GetMapping("/get_income_account_detail_info") + @GetMapping("/getIncomeAccountDetailInfo") @Operation(summary = "分页获取收入账户详情", description = "分页获取收入账户详情") public ServerResponseEntity> getIncomeAccountDetailInfo(PageDTO pageDTO, AccountSearchDTO accountSearchDTO) { PageVO accountDetailPage = payInfoService.pageIncomeAccountDetail(pageDTO, accountSearchDTO); return ServerResponseEntity.success(accountDetailPage); } - @GetMapping("/get_refund_account_detail_info") + @GetMapping("/getRefundAccountDetailInfo") @Operation(summary = "分页获取退款账户详情", description = "分页获取退款账户详情") public ServerResponseEntity> getRefundAccountDetailInfo(PageDTO pageDTO, AccountSearchDTO accountSearchDTO) { PageVO accountDetailPage = refundInfoService.pageRefundAccountDetail(pageDTO, accountSearchDTO); return ServerResponseEntity.success(accountDetailPage); } - @GetMapping("/get_pay_info") + @GetMapping("/getPayInfo") @Operation(summary = "分页获取指定店铺的收入结算明细", description = "根据分页参数和时间获取") public ServerResponseEntity> getPayInfo(PageDTO pageDTO, AccountSearchDTO accountSearchDTO) { PageVO pageVO = payInfoService.getPayInfoPage(pageDTO, accountSearchDTO); return ServerResponseEntity.success(pageVO); } - @GetMapping("/get_refund_info") + @GetMapping("/getRefundInfo") @Operation(summary = "分页获取指定店铺的退款结算明细", description = "根据分页参数和时间获取") public ServerResponseEntity> getRefundInfo(PageDTO pageDTO, AccountSearchDTO accountSearchDTO) { PageVO pageVO = refundInfoService.getRefundInfoPage(pageDTO, accountSearchDTO); return ServerResponseEntity.success(pageVO); } - @GetMapping("/sold_excel") + @GetMapping("/soldExcel") @Operation(summary = "导出收入对账excel", description = "导出收入对账excel") public ServerResponseEntity soldExcel(HttpServletResponse response, AccountSearchDTO accountSearchDTO) { payInfoService.excelPayInfo(response, accountSearchDTO); return ServerResponseEntity.success(); } - @GetMapping("/refund_sold_excel") + @GetMapping("/refundSoldExcel") @Operation(summary = "导出退款对账excel", description = "导出退款对账excel") public ServerResponseEntity refundSoldExcel(HttpServletResponse response, AccountSearchDTO accountSearchDTO) { refundInfoService.excelRefundInfo(response, accountSearchDTO); diff --git a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/platform/AllinpayMemberController.java b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/platform/AllinpayMemberController.java index a74fc82..5f8b2cf 100644 --- a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/platform/AllinpayMemberController.java +++ b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/platform/AllinpayMemberController.java @@ -23,14 +23,14 @@ public class AllinpayMemberController { private AllinpayService allinpayService; @Operation(summary = "锁定会员", description = "锁定会员") - @PutMapping("/lock_member") + @PutMapping("/lockMember") public ServerResponseEntity lockMember(@RequestBody LockMemberDTO lockMemberDTO) { allinpayService.lockMember(lockMemberDTO); return ServerResponseEntity.success(); } @Operation(summary = "解锁会员", description = "解锁会员") - @PutMapping("/unlock_member") + @PutMapping("/unlockMember") public ServerResponseEntity unlockMember(@RequestBody LockMemberDTO lockMemberDTO) { allinpayService.unlockMember(lockMemberDTO); return ServerResponseEntity.success(); diff --git a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/supplier/AllinpayCompanyController.java b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/supplier/AllinpayCompanyController.java index 4ad554d..9fd44f8 100644 --- a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/supplier/AllinpayCompanyController.java +++ b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/supplier/AllinpayCompanyController.java @@ -33,7 +33,7 @@ import java.util.stream.Collectors; */ @Tag(name = "通联支付-企业会员接口(供应商端)") @RestController("supplier-allinpay-company") -@RequestMapping("/s/apply_supplier/allinpay/company") +@RequestMapping("/s/applySupplier/allinpay/company") public class AllinpayCompanyController { @Autowired @@ -42,7 +42,7 @@ public class AllinpayCompanyController { @Value("${application.domainUrl}") private String domainUrl; - @GetMapping("/get_company_info") + @GetMapping("/getCompanyInfo") @Operation(summary = "获取企业信息", description = "获取企业信息") public ServerResponseEntity getCompanyInfo() { String bizUserId = getBizUserId(); @@ -50,7 +50,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(companyInfo); } - @PostMapping("/send_verification_code") + @PostMapping("/sendVerificationCode") @Operation(summary = "发送短信验证码", description = "发送短信验证码") public ServerResponseEntity sendVerificationCode(@RequestBody VerificationCodeDTO verificationCodeDTO) { String bizUserId = getBizUserId(); @@ -70,7 +70,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @PostMapping("/bind_phone") + @PostMapping("/bindPhone") @Operation(summary = "绑定手机", description = "绑定手机") public ServerResponseEntity bindPhone(@RequestBody VerificationCodeDTO verificationCodeDTO) { String bizUserId = getBizUserId(); @@ -87,7 +87,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @PutMapping("/unbind_phone") + @PutMapping("/unbindPhone") @Operation(summary = "解绑手机", description = "解绑手机") public ServerResponseEntity unbindPhone(@RequestBody VerificationCodeDTO verificationCodeDTO) { String bizUserId = getBizUserId(); @@ -105,7 +105,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @PostMapping("/set_company_info") + @PostMapping("/setCompanyInfo") @Operation(summary = "设置企业信息--该接口前端不调用", description = "设置企业信息--该接口前端不调用") public ServerResponseEntity setCompanyInfo(@RequestBody SetCompanyInfoDTO setCompanyInfoDTO) { String bizUserId = getBizUserId(); @@ -115,7 +115,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @PutMapping("/update_company_info") + @PutMapping("/updateCompanyInfo") @Operation(summary = "企业会员信息修改--该接口前端不调用", description = "企业会员信息修改--该接口前端不调用") public ServerResponseEntity updateCompanyInfo(@RequestBody UpdateCompanyInfoDTO updateCompanyInfoDTO) { String bizUserId = getBizUserId(); @@ -130,7 +130,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @PostMapping("/apply_bind_bank_card") + @PostMapping("/applyBindBankCard") @Operation(summary = "请求绑定银行卡", description = "请求绑定银行卡-法人") public ServerResponseEntity applyBindBankCard(@RequestBody ApplyBankCardDTO applyBankCardDTO) { String bizUserId = getBizUserId(); @@ -140,7 +140,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @PutMapping("/bind_bank_card") + @PutMapping("/bindBankCard") @Operation(summary = "确认绑定银行卡--当前绑卡方式为8，该接口不调用", description = "确认绑定银行卡-法人") public ServerResponseEntity bindBankCard(@RequestBody BindBankCardDTO bindBankCardDTO) { String bizUserId = getBizUserId(); @@ -150,7 +150,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @PutMapping("/unbind_bank_card") + @PutMapping("/unbindBankCard") @Operation(summary = "解绑银行卡", description = "解绑银行卡-法人") public ServerResponseEntity unbindBankCard(@RequestBody UnbindBankCardDTO unbindBankCardDTO) { String bizUserId = getBizUserId(); @@ -159,7 +159,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @GetMapping("query_bank_card") + @GetMapping("/queryBankCard") @Operation(summary = "查询银行卡", description = "查询银行卡") @Parameter(name = "cardNo", description = "银行卡号(不传则查询全部银行卡)") public ServerResponseEntity> queryBankCard(@RequestParam(value = "cardNo", required = false) String cardNo) { @@ -169,7 +169,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(bindCards); } - @PostMapping("/bind_company_account") + @PostMapping("/bindCompanyAccount") @Operation(summary = "企业会员绑定对公户", description = "企业会员绑定对公户") public ServerResponseEntity bindCompanyAccount(@RequestBody BindCompanyAccountDTO bindCompanyAccountDTO) { String bizUserId = getBizUserId(); @@ -179,7 +179,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(); } - @PostMapping("/sign_acct_protocol") + @PostMapping("/signAcctProtocol") @Operation(summary = "账户提现协议签约", description = "账户提现协议签约") public ServerResponseEntity signAcctProtocol(@RequestBody SignAcctProtocolDTO signAcctProtocolDTO) { String bizUserId = getBizUserId(); @@ -189,7 +189,7 @@ public class AllinpayCompanyController { return ServerResponseEntity.success(url); } - @GetMapping("/sign_contract_query") + @GetMapping("/signContractQuery") @Operation(summary = "账户协议签约查询", description = "账户协议签约查询") public ServerResponseEntity signContractQuery(SignAcctProtocolDTO signAcctProtocolDTO) { String bizUserId = getBizUserId(); diff --git a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/user/PayController.java b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/user/PayController.java index 2c182bb..c1b4032 100644 --- a/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/user/PayController.java +++ b/tmerclub-payment/src/main/java/com/tmerclub/cloud/payment/controller/user/PayController.java @@ -81,7 +81,7 @@ public class PayController { /** * 支付预售订单尾款 */ - @PostMapping("/pay_balance") + @PostMapping("/payBalance") @Operation(summary = "根据订单号进行支付尾款", description = "根据订单号进行支付尾款") public ServerResponseEntity payBalance(@Valid @RequestBody PayInfoDTO payParam) throws AlipayApiException, WxPayException { ServerResponseEntity configResponse = configFeignClient.getConfig(Constant.PAY_SETTLEMENT_CONFIG); @@ -104,7 +104,7 @@ public class PayController { return payManager.doPay(payInfo); } - @GetMapping("/is_pay/{payEntry}/{orderIds}/{payAmountType}") + @GetMapping("/isPay/{payEntry}/{orderIds}/{payAmountType}") @Operation(summary = "根据订单号查询该订单是否已经支付", description = "根据订单号查询该订单是否已经支付") @Parameter(name = "payAmountType", description = "支付金额类型，0.付定金or普通订单付款 1.付尾款（定金预售订单独有）", required = true) public ResponseEntity isPay(@PathVariable Integer payEntry, @PathVariable String orderIds, @PathVariable Integer payAmountType) { diff --git a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/admin/CategoryController.java b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/admin/CategoryController.java index 617d49a..3f423e9 100644 --- a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/admin/CategoryController.java +++ b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/admin/CategoryController.java @@ -145,7 +145,7 @@ public class CategoryController { return ServerResponseEntity.success(); } - @GetMapping("/sold_excel") + @GetMapping("/soldExcel") @Operation(summary = "导出excel", description = "导出分类excel") public ServerResponseEntity spuSoldExcel(HttpServletResponse response) { Long shopId = AuthUserContext.get().getTenantId(); diff --git a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/admin/SpuController.java b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/admin/SpuController.java index 9e3ff68..b3a6a5e 100644 --- a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/admin/SpuController.java +++ b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/admin/SpuController.java @@ -302,7 +302,7 @@ public class SpuController { return ServerResponseEntity.success(); } - @GetMapping("/sold_excel") + @GetMapping("/soldExcel") @Operation(summary = "导出excel", description = "导出商品excel") public ServerResponseEntity spuSoldExcel(HttpServletResponse response, SpuPageSearchDTO spuDTO) { List list = spuExcelService.excelSpuList(spuDTO); @@ -311,9 +311,9 @@ public class SpuController { return ServerResponseEntity.success(); } - @GetMapping("/down_model") + @GetMapping("/exportModel") @Operation(summary = "导出商品excel模板", description = "导出商品excel模板") - public ServerResponseEntity downloadModel(HttpServletResponse response) { + public ServerResponseEntity exportModel(HttpServletResponse response) { spuExcelService.downloadModel(response); return ServerResponseEntity.success(); } @@ -368,7 +368,7 @@ public class SpuController { return ServerResponseEntity.success(); } - @GetMapping("/get_offline_handle_event/{spuId}") + @GetMapping("/getOfflineHandleEvent/{spuId}") @Operation(summary = "获取最新下线的事件", description = "获取最新下线的事件") public ServerResponseEntity getOfflineHandleEvent(@PathVariable Long spuId) { SpuVO spuDb = spuService.getBySpuId(spuId); @@ -394,7 +394,7 @@ public class SpuController { return ServerResponseEntity.success(); } - @PostMapping("/audit_apply") + @PostMapping("/auditApply") @Operation(summary = "违规活动提交审核", description = "违规活动提交审核") public ServerResponseEntity auditApply(@RequestBody OfflineHandleEventDTO offlineHandleEventDto) { SpuVO spuDb = spuService.getBySpuId(offlineHandleEventDto.getHandleId()); diff --git a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/app/SpuCollectionController.java b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/app/SpuCollectionController.java index cf54c27..bf6c807 100644 --- a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/app/SpuCollectionController.java +++ b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/app/SpuCollectionController.java @@ -50,7 +50,7 @@ public class SpuCollectionController { return ServerResponseEntity.success(spuCollectionService.getUserCollectionDtoPageByUserId(page, AuthUserContext.get().getUserId(), prodName, prodType)); } - @GetMapping("/ma/is_collection") + @GetMapping("/ma/isCollection") @Operation(summary = "根据商品id获取该商品是否在收藏夹中", description = "传入收藏商品id") @Parameter(name = "spuId", description = "商品id") public ServerResponseEntity isCollection(@RequestParam Long spuId) { @@ -63,9 +63,9 @@ public class SpuCollectionController { } - @PostMapping("/add_or_cancel") + @PostMapping("/createOrCancel") @Operation(summary = "添加/取消收藏(返回false：取消收藏 true：添加收藏)", description = "传入收藏商品id,如果商品未收藏则收藏商品，已收藏则取消收藏") - public ServerResponseEntity addOrCancel(@RequestBody Long spuId) { + public ServerResponseEntity createOrCancel(@RequestBody Long spuId) { if (Objects.isNull(spuService.getBySpuId(spuId))) { throw new LuckException("该商品不存在"); } diff --git a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/multishop/SkuController.java b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/multishop/SkuController.java index 95b70dc..c774e3f 100644 --- a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/multishop/SkuController.java +++ b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/multishop/SkuController.java @@ -66,7 +66,7 @@ public class SkuController { return ServerResponseEntity.success(count); } - @GetMapping("/sold_excel") + @GetMapping("/soldExcel") @Operation(summary = "导出sku信息", description = "导出sku信息") public ServerResponseEntity skuSoldExcel(HttpServletResponse response, ProductSearchDTO product) { product.setShopId(AuthUserContext.get().getTenantId()); diff --git a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/multishop/StockBillLogItemController.java b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/multishop/StockBillLogItemController.java index a27af5b..1426952 100644 --- a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/multishop/StockBillLogItemController.java +++ b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/multishop/StockBillLogItemController.java @@ -71,7 +71,7 @@ public class StockBillLogItemController { } @Operation(summary = "批量导入商品项", description = "批量导入商品项") - @PostMapping("/import_excel") + @PostMapping("/importExcel") public ServerResponseEntity importExcel(@RequestParam("excelFile") MultipartFile file, @RequestParam("type") Integer type) { if (file == null) { throw new LuckException("网络繁忙，请稍后重试"); diff --git a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/multishop/TakeStockSpuController.java b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/multishop/TakeStockSpuController.java index 9a99c98..9645711 100644 --- a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/multishop/TakeStockSpuController.java +++ b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/multishop/TakeStockSpuController.java @@ -103,7 +103,7 @@ public class TakeStockSpuController { } @Operation(summary = "导入盘点商品", description = "导入盘点商品") - @PostMapping("/import_excel") + @PostMapping("/importExcel") public ServerResponseEntity importExcel(@RequestParam("excelFile") MultipartFile excelFile, @RequestParam("takeStockId") Long takeStockId) { if (Objects.isNull(excelFile)) { diff --git a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/platform/CategoryController.java b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/platform/CategoryController.java index cd063df..4143f4d 100644 --- a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/platform/CategoryController.java +++ b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/platform/CategoryController.java @@ -57,7 +57,7 @@ public class CategoryController { return ServerResponseEntity.success(); } - @GetMapping("/sold_excel") + @GetMapping("/soldExcel") @Operation(summary = "导出excel", description = "导出分类excel") public ServerResponseEntity spuSoldExcel(HttpServletResponse response) { List list = categoryService.listExcelPlatform(); diff --git a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/platform/SpuController.java b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/platform/SpuController.java index cfe71ba..818f9b1 100644 --- a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/platform/SpuController.java +++ b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/platform/SpuController.java @@ -85,7 +85,7 @@ public class SpuController { return ServerResponseEntity.success(); } - @PostMapping("/sold_excel") + @PostMapping("/soldExcel") @Operation(summary = "导出excel", description = " 导出商品excel") public ServerResponseEntity spuSoldExcel(HttpServletResponse response, @RequestBody ProductSearchDTO productSearchDTO) { List list = spuExcelService.excelPlatformSpuList(productSearchDTO); diff --git a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/supplier/SpuController.java b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/supplier/SpuController.java index 0159c08..64727d5 100644 --- a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/supplier/SpuController.java +++ b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/supplier/SpuController.java @@ -285,7 +285,7 @@ public class SpuController { return ServerResponseEntity.success(); } - @GetMapping("/sold_excel") + @GetMapping("/soldExcel") @Operation(summary = "导出excel", description = "导出商品excel") public ServerResponseEntity spuSoldExcel(HttpServletResponse response, SpuPageSearchDTO spuDTO) { List list = spuExcelService.excelSpuList(spuDTO); @@ -299,9 +299,9 @@ public class SpuController { return ServerResponseEntity.success(); } - @GetMapping("/down_model") + @GetMapping("/exportModel") @Operation(summary = "导出商品excel模板", description = "导出商品excel模板") - public ServerResponseEntity downloadModel(HttpServletResponse response) { + public ServerResponseEntity exportModel(HttpServletResponse response) { spuExcelService.downloadModel(response); return ServerResponseEntity.success(); } @@ -428,7 +428,7 @@ public class SpuController { return ServerResponseEntity.success(); } - @GetMapping("/get_offline_handle_event/{spuId}") + @GetMapping("/getOfflineHandleEvent/{spuId}") @Operation(summary = "获取最新下线的事件", description = "获取最新下线的事件") public ServerResponseEntity getOfflineHandleEvent(@PathVariable Long spuId) { SpuVO spuDb = spuService.getBySpuId(spuId); @@ -449,7 +449,7 @@ public class SpuController { return ServerResponseEntity.success(); } - @PostMapping("/audit_apply") + @PostMapping("/auditApply") @Operation(summary = "违规活动提交审核", description = "违规活动提交审核") public ServerResponseEntity auditApply(@RequestBody OfflineHandleEventDTO offlineHandleEventDto) { SpuVO spuDb = spuService.getBySpuId(offlineHandleEventDto.getHandleId()); diff --git a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/supplier/StockBillLogItemController.java b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/supplier/StockBillLogItemController.java index 14b31ff..c0be8ac 100644 --- a/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/supplier/StockBillLogItemController.java +++ b/tmerclub-product/src/main/java/com/tmerclub/cloud/product/controller/supplier/StockBillLogItemController.java @@ -51,7 +51,7 @@ public class StockBillLogItemController { } @Operation(summary = "批量导入商品项", description = "批量导入商品项") - @PostMapping("/import_excel") + @PostMapping("/importExcel") public ServerResponseEntity importExcel(@RequestParam("excelFile") MultipartFile file, @RequestParam("type") Integer type) { if (file == null) { throw new LuckException("网络繁忙，请稍后重试"); diff --git a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/admin/OrderRefundSearchController.java b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/admin/OrderRefundSearchController.java index 1b10ee6..820c22e 100644 --- a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/admin/OrderRefundSearchController.java +++ b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/admin/OrderRefundSearchController.java @@ -32,7 +32,7 @@ import java.util.stream.Collectors; * @date 2020/11/16 */ @RestController("adminOrderRefundSearchController") -@RequestMapping("/mp/search/order_refund") +@RequestMapping("/mp/search/orderRefund") @Tag(name = "admin-退款订单搜索接口") public class OrderRefundSearchController { diff --git a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/admin/OrderSearchController.java b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/admin/OrderSearchController.java index 3ef3f40..25b48cd 100644 --- a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/admin/OrderSearchController.java +++ b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/admin/OrderSearchController.java @@ -49,7 +49,7 @@ public class OrderSearchController { private SupplierDetailFeignClient supplierDetailFeignClient; - @GetMapping("/sold_excel") + @GetMapping("/soldExcel") @Operation(summary = "导出excel", description = "导出订单excel") public ServerResponseEntity orderSoldExcel(HttpServletResponse response, OrderSearchDTO orderSearchDTO) { orderSearchDTO.setShopId(AuthUserContext.get().getTenantId()); diff --git a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/admin/ProductSearchController.java b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/admin/ProductSearchController.java index cbaca4f..1c8c994 100644 --- a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/admin/ProductSearchController.java +++ b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/admin/ProductSearchController.java @@ -127,7 +127,7 @@ public class ProductSearchController { return ServerResponseEntity.success(searchPage); } - @GetMapping("/page_distribution_spu") + @GetMapping("/pageDistributionSpu") @Operation(summary = "分销商品列表", description = "分销商品列表") public ServerResponseEntity> pageDistributionSpu(@Valid EsPageDTO pageDTO, ProductSearchDTO productSearchDTO) { Long shopId = AuthUserContext.get().getTenantId(); @@ -141,7 +141,7 @@ public class ProductSearchController { return ServerResponseEntity.success(searchPage); } - @GetMapping("/page_supply_spu") + @GetMapping("/pageSupplySup") @Operation(summary = "商家搜索供应商品列表", description = "商家搜索供应商品列表") public ServerResponseEntity> pageSupplySup(@Valid EsPageDTO pageDTO, ProductSearchDTO productSearchDTO) { Long shopId = AuthUserContext.get().getTenantId(); @@ -209,7 +209,7 @@ public class ProductSearchController { return ServerResponseEntity.success(spuAdminPage); } - @GetMapping("/page_supplier_spu_list") + @GetMapping("/pageSupplierSpuList") @Operation(summary = "获取某个供应商或商家（不含代销商品）的商品列表", description = "获取某个供应商或商家（不含代销商品）的商品列表") public ServerResponseEntity> pageSupplierSpuList(@Valid EsPageDTO pageDTO, ProductSearchDTO productSearchDTO) { Long shopId = AuthUserContext.get().getTenantId(); @@ -259,7 +259,7 @@ public class ProductSearchController { return ServerResponseEntity.success(searchPage); } - @GetMapping("/page_shop_spu_list") + @GetMapping("/pageShopSpuList") @Operation(summary = "获取商家的商品列表", description = "获取商家的商品列表") public ServerResponseEntity> pageShopSpuList(@Valid EsPageDTO pageDTO, ProductSearchDTO productSearchDTO) { Long shopId = AuthUserContext.get().getTenantId(); @@ -287,7 +287,7 @@ public class ProductSearchController { return ServerResponseEntity.success(searchPage); } - @GetMapping("/page_consignment_spu") + @GetMapping("/pageConsignmentSpu") @Operation(summary = "代销商品列表", description = "代销商品列表") public ServerResponseEntity> pageConsignmentSpu(@Valid EsPageDTO pageDTO, ProductSearchDTO productSearchDTO) { Long shopId = AuthUserContext.get().getTenantId(); @@ -330,7 +330,7 @@ public class ProductSearchController { return ServerResponseEntity.success(spuAdminEsPage); } - @GetMapping("/page_can_combo_spu") + @GetMapping("/pageCanComboSpu") @Operation(summary = "获取可以参加组合商品的商品列表", description = "获取可以参加组合商品的商品列表,商家关联商品范围：商家商品+代销但商家发货商品；供应商关联商品范围：供应商商品") public ServerResponseEntity> pageCanComboSpu(@Valid EsPageDTO pageDTO, ProductSearchDTO productSearchDTO) { Long shopId = AuthUserContext.get().getTenantId(); @@ -401,7 +401,7 @@ public class ProductSearchController { } - @GetMapping("/page_combo_add_spu") + @GetMapping("/pageComboAddSpu") @Operation(summary = "套餐以及赠品选择商品列表", description = "套餐以及赠品选择商品列表") public ServerResponseEntity> pageComboAddSpu(@Valid EsPageDTO pageDTO, ProductSearchDTO productSearchDTO) { Long shopId = AuthUserContext.get().getTenantId(); @@ -420,7 +420,7 @@ public class ProductSearchController { return ServerResponseEntity.success(searchPage); } - @GetMapping("/renovation_page") + @GetMapping("/renovationPage") @Operation(summary = "商品信息列表(商家装修商品列表)", description = "商品信息列表(商家装修商品列表)") public ServerResponseEntity> renovationPage(@Valid EsPageDTO pageDTO, ProductSearchDTO productSearchDTO) { productSearchDTO.setShopId(AuthUserContext.get().getTenantId()); diff --git a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/app/ProductSearchController.java b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/app/ProductSearchController.java index 0a45a77..83476e7 100644 --- a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/app/ProductSearchController.java +++ b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/app/ProductSearchController.java @@ -49,7 +49,7 @@ public class ProductSearchController { private SpuFeignClient spuFeignClient; - @GetMapping("/pc_page") + @GetMapping("/pcPage") @Operation(summary = "pc端商品搜索接口", description = "pc端商品搜索接口") public ServerResponseEntity> pcPage(@Valid EsPageDTO pageDTO, ProductSearchDTO productSearchDTO) { productSearchDTO.setAttrMap(productSearchManager.splitAttr(productSearchDTO.getAttrIds())); @@ -92,7 +92,7 @@ public class ProductSearchController { return ServerResponseEntity.success(simplePage(pageDTO, productSearchDTO)); } - @GetMapping("/search_page") + @GetMapping("/searchPage") @Operation(summary = "手机端商品搜索接口", description = "手机端商品搜索接口") public ServerResponseEntity> searchPage(@Valid EsPageDTO pageDTO, ProductSearchDTO productSearchDTO) { productSearchDTO.setAttrMap(productSearchManager.splitAttr(productSearchDTO.getAttrIds())); @@ -112,7 +112,7 @@ public class ProductSearchController { return ServerResponseEntity.success(page); } - @GetMapping("/page_distribution_spu") + @GetMapping("/pageDistributionSpu") @Operation(summary = "分销商品列表", description = "分销商品列表") public ServerResponseEntity> pageDistributionSpu(@Valid EsPageDTO pageDTO, ProductSearchDTO productSearchDTO) { productSearchDTO.setDistributionSpu(Boolean.TRUE); @@ -121,7 +121,7 @@ public class ProductSearchController { return ServerResponseEntity.success(searchPage); } - @GetMapping("/renovation_page") + @GetMapping("/renovationPage") @Operation(summary = "商品信息列表(app装修商品列表)", description = "商品信息列表(app装修商品列表)") public ServerResponseEntity> renovationPage(@Valid EsPageDTO pageDTO, ProductSearchDTO productSearchDTO) { EsPageVO searchPage = productSearchManager.showSpuTypeRenovationPage(pageDTO, productSearchDTO); diff --git a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/multishop/AllotOrderSearchController.java b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/multishop/AllotOrderSearchController.java index 17eea82..634d260 100644 --- a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/multishop/AllotOrderSearchController.java +++ b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/multishop/AllotOrderSearchController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; */ @Tag(name = "调拨订单搜索接口(商家端)") @RestController("multiShopAllotOrderSearchController") -@RequestMapping("/m/allot_order_search") +@RequestMapping("/m/allotOrderSearch") public class AllotOrderSearchController { @Autowired diff --git a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/multishop/OrderInvoiceSearchController.java b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/multishop/OrderInvoiceSearchController.java index a010d3b..9c97fde 100644 --- a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/multishop/OrderInvoiceSearchController.java +++ b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/multishop/OrderInvoiceSearchController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController; * @date 2020/11/16 */ @RestController("multishopOrderInvoiceSearchController") -@RequestMapping("/m/order_invoice_search") +@RequestMapping("/m/orderinvoiceSearch") @Tag(name = "multishop-订单发票管理接口") public class OrderInvoiceSearchController { diff --git a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/multishop/PurchaseOrderSearchController.java b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/multishop/PurchaseOrderSearchController.java index 9a056c4..6556dce 100644 --- a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/multishop/PurchaseOrderSearchController.java +++ b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/multishop/PurchaseOrderSearchController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController; * @date 2020/11/16 */ @RestController("multishopPurchaseOrderSearchController") -@RequestMapping("/m/purchase_order_search") +@RequestMapping("/m/purchaseOrderSearch") @Tag(name = "multishop-采购订单管理接口") public class PurchaseOrderSearchController { diff --git a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/platform/OrderSearchController.java b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/platform/OrderSearchController.java index e54f163..b1e67c5 100644 --- a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/platform/OrderSearchController.java +++ b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/platform/OrderSearchController.java @@ -47,7 +47,7 @@ public class OrderSearchController { private SupplierDetailFeignClient supplierDetailFeignClient; - @GetMapping("/sold_excel") + @GetMapping("/soldExcel") @Operation(summary = "导出excel", description = "导出订单excel") public ServerResponseEntity orderSoldExcel(HttpServletResponse response,OrderSearchDTO orderSearchDTO) { // 查询订单列表 @@ -60,9 +60,9 @@ public class OrderSearchController { - @GetMapping("/score_sold_excel") + @GetMapping("/scoreSoldExcel") @Operation(summary = "积分订单导出excel", description = "积分订单导出excel") - public ServerResponseEntity scoreOrderSoldExcel(HttpServletResponse response,OrderSearchDTO orderSearchDTO) { + public ServerResponseEntity scoreSoldExcel(HttpServletResponse response,OrderSearchDTO orderSearchDTO) { orderSearchDTO.setShopId(AuthUserContext.get().getTenantId()); // 查询订单列表 List orderExcelList = orderSearchManager.orderExcelScrollSearch(orderSearchDTO); diff --git a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/platform/ProductSearchController.java b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/platform/ProductSearchController.java index 3de1bcb..a1fa4d3 100644 --- a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/platform/ProductSearchController.java +++ b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/platform/ProductSearchController.java @@ -84,7 +84,7 @@ public class ProductSearchController { return ServerResponseEntity.success(searchPage); } - @GetMapping("/score_page") + @GetMapping("/scorePage") @Operation(summary = "积分商品搜索（平台端）", description = "积分商品搜索（平台端）") public ServerResponseEntity> scorePage(@Valid EsPageDTO pageDTO, ProductSearchDTO productSearchDTO) { productSearchDTO.setFetchSource(EsConstant.PLATFORM_FETCH_SOURCE); @@ -99,7 +99,7 @@ public class ProductSearchController { return ServerResponseEntity.success(searchPage); } - @GetMapping("/tag_page") + @GetMapping("/tagPage") @Operation(summary = "分组商品列表（平台端）", description = "分组商品列表（平台端）") public ServerResponseEntity> tagPage(@Valid EsPageDTO pageDTO, ProductSearchDTO productSearchDTO) { productSearchDTO.setFetchSource(EsConstant.PLATFORM_TAG_FETCH_SOURCE); @@ -118,7 +118,7 @@ public class ProductSearchController { return ServerResponseEntity.success(searchPage); } - @GetMapping("/renovation_page") + @GetMapping("/renovationPage") @Operation(summary = "商品信息列表(平台装修商品列表)", description = "商品信息列表(平台装修商品列表)") public ServerResponseEntity> renovationPage(@Valid EsPageDTO pageDTO, ProductSearchDTO productSearchDTO) { EsPageVO searchPage = productSearchManager.showSpuTypeRenovationPage(pageDTO, productSearchDTO); diff --git a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/AllotOrderSearchController.java b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/AllotOrderSearchController.java index 5227409..2bdc6e0 100644 --- a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/AllotOrderSearchController.java +++ b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/AllotOrderSearchController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; */ @Tag(name = "调拨订单搜索接口(供应商端)") @RestController("supplierAllotOrderSearchController") -@RequestMapping("/s/allot_order_search") +@RequestMapping("/s/allotOrderSearch") public class AllotOrderSearchController { @Autowired diff --git a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/OrderInvoiceSearchController.java b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/OrderInvoiceSearchController.java index c9be140..ebe6c66 100644 --- a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/OrderInvoiceSearchController.java +++ b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/OrderInvoiceSearchController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController; * @date 2020/11/16 */ @RestController("supplierOrderInvoiceSearchController") -@RequestMapping("/s/order_invoice_search") +@RequestMapping("/s/orderInvoiceSearch") @Tag(name = "supplier-订单发票管理接口") public class OrderInvoiceSearchController { diff --git a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/OrderSearchController.java b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/OrderSearchController.java index c6d349c..9c374a8 100644 --- a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/OrderSearchController.java +++ b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/OrderSearchController.java @@ -47,7 +47,7 @@ public class OrderSearchController { private SupplierDetailFeignClient supplierDetailFeignClient; - @GetMapping("/sold_excel") + @GetMapping("/soldExcel") @Operation(summary = "导出excel", description = "导出订单excel") public ServerResponseEntity orderSoldExcel(HttpServletResponse response, OrderSearchDTO orderSearchDTO) { orderSearchDTO.setSupplierId(AuthUserContext.get().getTenantId()); diff --git a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/ProductSearchController.java b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/ProductSearchController.java index 60cd36e..1c47787 100644 --- a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/ProductSearchController.java +++ b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/ProductSearchController.java @@ -94,7 +94,7 @@ public class ProductSearchController { } - @GetMapping("/page_distribution_spu") + @GetMapping("/pageDistributionSpu") @Operation(summary = "分销商品列表", description = "分销商品列表") public ServerResponseEntity> pageDistributionSpu(@Valid EsPageDTO pageDTO, ProductSearchDTO productSearchDTO) { Long shopId = AuthUserContext.get().getTenantId(); @@ -107,7 +107,7 @@ public class ProductSearchController { return ServerResponseEntity.success(searchPage); } - @GetMapping("/stockWarning_count") + @GetMapping("/stockWarningCount") @Operation(summary = "库存预警数目", description = "库存预警数目") public ServerResponseEntity stockWarningCount() { Long supplierId = AuthUserContext.get().getTenantId(); diff --git a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/PurchaseOrderSearchController.java b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/PurchaseOrderSearchController.java index fe2ceea..5800c35 100644 --- a/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/PurchaseOrderSearchController.java +++ b/tmerclub-search/src/main/java/com/tmerclub/cloud/search/controller/supplier/PurchaseOrderSearchController.java @@ -28,7 +28,7 @@ import java.util.Objects; * @date 2020/11/16 */ @RestController("suplplierPurchaseOrderSearchController") -@RequestMapping("/s/purchase_order_search") +@RequestMapping("/s/purchaseOrderSearch") @Tag(name = "supplier-采购订单管理接口") public class PurchaseOrderSearchController { diff --git a/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/admin/SeckillCategoryController.java b/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/admin/SeckillCategoryController.java index b34b816..3372f0c 100644 --- a/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/admin/SeckillCategoryController.java +++ b/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/admin/SeckillCategoryController.java @@ -30,7 +30,7 @@ import java.util.Objects; * @date 2021-04-19 11:26:35 */ @RestController("adminSeckillCategoryController") -@RequestMapping("/mp/seckill_category") +@RequestMapping("/mp/seckillCategory") @Tag(name = "秒杀分类信息") public class SeckillCategoryController { @@ -87,7 +87,7 @@ public class SeckillCategoryController { return ServerResponseEntity.success(); } - @PutMapping("/update_batch_seq") + @PutMapping("/updateBatchSeq") @Operation(summary = "批量更新秒杀分类排序", description = "批量更新秒杀分类排序") public ServerResponseEntity updateBatchSeq(@Valid @RequestBody SeckillCategoryDTO seckillCategoryDTO) { if (!Objects.equals(AuthUserContext.get().getTenantId(), Constant.PLATFORM_SHOP_ID)) { diff --git a/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/admin/SeckillController.java b/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/admin/SeckillController.java index 4c0ccd2..b010161 100644 --- a/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/admin/SeckillController.java +++ b/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/admin/SeckillController.java @@ -55,26 +55,26 @@ public class SeckillController { @DubboReference private SpuFeignClient spuFeignClient; - @GetMapping("/list_seckill") + @GetMapping("/seckillList") @Operation(summary = "显示最近的秒杀信息列表", description = "显示最近的秒杀信息列表，type字段，0:为即将开场，1：已经开场,specTime时间搜索") - public ServerResponseEntity> listSeckill(@Valid PageDTO pageDTO, @RequestParam("type") Integer type, + public ServerResponseEntity> seckillList(@Valid PageDTO pageDTO, @RequestParam("type") Integer type, @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @RequestParam(value = "specTime", required = false) Long specTime) { Long shopId = AuthUserContext.get().getTenantId(); PageVO adminVOList = seckillService.listByShopId(pageDTO, shopId, type, specTime); return ServerResponseEntity.success(adminVOList); } - @GetMapping("/list_end_seckill") + @GetMapping("/endSeckillList") @Operation(summary = "显示已经结束的秒杀信息列表", description = "显示已经结束的秒杀信息列表,specTime时间搜索") - public ServerResponseEntity> listEndSeckill(@Valid PageDTO pageDTO, @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @RequestParam(value = "specTime", required = false) Long specTime) { + public ServerResponseEntity> endSeckillList(@Valid PageDTO pageDTO, @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @RequestParam(value = "specTime", required = false) Long specTime) { Long shopId = AuthUserContext.get().getTenantId(); PageVO adminVOList = seckillService.listEndSeckillByShopId(pageDTO, shopId, specTime); return ServerResponseEntity.success(adminVOList); } - @GetMapping("/list_seckill_spu_by_time") + @GetMapping("/seckillSpuByTimeList") @Operation(summary = "根据时间、商品名称返回秒杀商品信息列表", description = "显示最近一个月秒杀信息列表") - public ServerResponseEntity> listSeckillSpuByTime(@RequestParam("startTimestamp") Long startTimestamp, + public ServerResponseEntity> seckillSpuByTimeList(@RequestParam("startTimestamp") Long startTimestamp, PageDTO pageDTO, ProductSearchDTO productSearch) { if (!Objects.equals(Constant.PLATFORM_SHOP_ID, AuthUserContext.get().getTenantId())) { productSearch.setShopId(AuthUserContext.get().getTenantId()); @@ -215,7 +215,7 @@ public class SeckillController { return ServerResponseEntity.success(); } - @GetMapping("/get_offline_handle_event/{seckillId}") + @GetMapping("/getOfflineHandleEvent/{seckillId}") @Operation(summary = "获取最新下线的事件", description = "获取最新下线的事件") public ServerResponseEntity getOfflineHandleEvent(@PathVariable Long seckillId) { return ServerResponseEntity.success(seckillService.getOfflineHandleEvent(seckillId)); @@ -249,7 +249,7 @@ public class SeckillController { return ServerResponseEntity.success(); } - @PostMapping("/audit_apply") + @PostMapping("/auditApply") @Operation(summary = "违规活动提交审核", description = "违规活动提交审核") public ServerResponseEntity auditApply(@RequestBody OfflineHandleEventDTO offlineHandleEventDto) { seckillService.auditApply(offlineHandleEventDto); @@ -258,7 +258,7 @@ public class SeckillController { return ServerResponseEntity.success(); } - @GetMapping("/get_join_seckill_merchant_num") + @GetMapping("/getJoinSeckillMerchantNum") @Operation(summary = "获取正在参与秒杀活动的商家数量", description = "获取正在参与秒杀活动的商家数量") public ServerResponseEntity getJoinSeckillMerchantNum() { if (!Objects.equals(AuthUserContext.get().getTenantId(), Constant.PLATFORM_SHOP_ID)) { diff --git a/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/app/SeckillCategoryController.java b/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/app/SeckillCategoryController.java index 1da5af2..03efee8 100644 --- a/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/app/SeckillCategoryController.java +++ b/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/app/SeckillCategoryController.java @@ -21,7 +21,7 @@ import java.util.List; * @date 2021-04-19 11:26:35 */ @RestController("appSeckillCategoryController") -@RequestMapping("/ua/seckill_category") +@RequestMapping("/ua/seckillCategory") @Tag(name = "app-秒杀分类信息") public class SeckillCategoryController { diff --git a/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/app/SeckillController.java b/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/app/SeckillController.java index 888582c..39b5f0e 100644 --- a/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/app/SeckillController.java +++ b/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/app/SeckillController.java @@ -153,9 +153,9 @@ public class SeckillController { } - @GetMapping("/list_seckill_times") + @GetMapping("/seckillTimesList") @Operation(summary = "显示秒杀后台配置信息", description = "显示秒杀后台配置信息") - public ServerResponseEntity listSeckillTimes() { + public ServerResponseEntity seckillTimesList() { String config = configFeignClient.getConfig(ConfigNameConstant.SECKILL_TIME_CONFIG).getData(); if (Objects.isNull(config)) { return ServerResponseEntity.success(); diff --git a/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/app/SeckillOrderController.java b/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/app/SeckillOrderController.java index 4bc57f3..1d8f6dd 100644 --- a/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/app/SeckillOrderController.java +++ b/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/app/SeckillOrderController.java @@ -48,7 +48,7 @@ import java.util.Objects; * @date 2021-04-19 09:36:59 */ @RestController -@RequestMapping("/seckill_order") +@RequestMapping("/seckillOrder") @Tag(name = "秒杀订单接口") public class SeckillOrderController { @@ -75,7 +75,7 @@ public class SeckillOrderController { @Operation(summary = "获取秒杀订单路径") - @GetMapping("/order_path") + @GetMapping("/getOrderPath") public ServerResponseEntity getOrderPath(Long spuId) { Long userId = AuthUserContext.get().getUserId(); SeckillVO seckill = seckillService.getBySpuId(spuId); diff --git a/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/platform/SeckillTimeController.java b/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/platform/SeckillTimeController.java index a5a85a8..8b38403 100644 --- a/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/platform/SeckillTimeController.java +++ b/tmerclub-seckill/src/main/java/com/tmerclub/cloud/seckill/controller/platform/SeckillTimeController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; * @author lhd */ @RestController -@RequestMapping("/p/seckill_time") +@RequestMapping("/p/seckillTime") public class SeckillTimeController { @DubboReference diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/CostPerPopupController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/CostPerPopupController.java index 7569cc1..9ea0a9c 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/CostPerPopupController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/CostPerPopupController.java @@ -38,7 +38,7 @@ import java.util.Objects; * @author TRACK */ @RestController("userCostPerPopupController") -@RequestMapping("/ma/cost_per_popup") +@RequestMapping("/ma/costPerPopup") @Tag(name = "用户弹窗广告") public class CostPerPopupController { diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserAddrController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserAddrController.java index 30f8152..3778a4f 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserAddrController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserAddrController.java @@ -25,7 +25,7 @@ import java.util.List; * @date 2020-12-07 15:50:02 */ @RestController("appUserAddrController") -@RequestMapping("/user_addr") +@RequestMapping("/userAddr") @Tag(name = "app-用户地址") public class UserAddrController { diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserBalanceLogController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserBalanceLogController.java index 550274f..142f815 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserBalanceLogController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserBalanceLogController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; * @date 2021-04-27 15:51:36 */ @RestController("appUserBalanceLogController") -@RequestMapping("/user_balance_log") +@RequestMapping("/userBalanceLog") @Tag(name = "余额记录") public class UserBalanceLogController { diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserBalancePayController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserBalancePayController.java index d028950..a0cf776 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserBalancePayController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserBalancePayController.java @@ -29,7 +29,7 @@ import java.util.Objects; * @date 2021/5/11 */ @RestController -@RequestMapping("/user_balance") +@RequestMapping("/userBalance") @Tag(name = "app-余额支付") public class UserBalancePayController { @@ -42,7 +42,7 @@ public class UserBalancePayController { @Autowired private UserBalanceLogService userBalanceLogService; - @PostMapping("/balance_pay") + @PostMapping("/balancePay") @Operation(summary = "支付", description = "余额支付") public ServerResponseEntity pay(@RequestBody Long payId) { Long userId = AuthUserContext.get().getUserId(); diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserController.java index 162d9cd..f646a97 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserController.java @@ -70,7 +70,7 @@ public class UserController { public static final String UPDATE_PWD_SMS_FLAG = "updatePwdSmsFlag"; - @GetMapping("/simple_info") + @GetMapping("/simpleInfo") @Operation(summary = "用户头像昵称", description = "用户头像昵称") public ServerResponseEntity getByAddrId() { Long userId = AuthUserContext.get().getUserId(); @@ -83,7 +83,7 @@ public class UserController { return ServerResponseEntity.success(userSimpleInfoVO); } - @GetMapping("/user_info") + @GetMapping("/getUserInfo") @Operation(summary = "获取用户信息", description = "返回用户的信息") public ServerResponseEntity getUserInfo() { Long userId = AuthUserContext.get().getUserId(); @@ -103,7 +103,7 @@ public class UserController { return ServerResponseEntity.success(userInfo); } - @GetMapping("/ma/user_detail_info") + @GetMapping("/ma/getUserDetailInfo") @Operation(summary = "获取用户详细信息", description = "返回用户详细信息") public ServerResponseEntity getUserDetailInfo() { UidInfoBO uidInfoBO = AuthUserContext.get(); @@ -127,7 +127,7 @@ public class UserController { return ServerResponseEntity.success(userApiVO); } - @PutMapping("/set_user_info") + @PutMapping("/setUserInfo") @Operation(summary = "设置用户信息", description = "设置用户信息") public ServerResponseEntity setUserInfo(@RequestBody UserDTO userDTO) { Long userId = AuthUserContext.get().getUserId(); @@ -138,7 +138,7 @@ public class UserController { } - @PutMapping("/update_mobile") + @PutMapping("/updateMobile") @Operation(summary = "修改用户手机号", description = "修改用户手机号") public ServerResponseEntity checkPhoneIsBind(@RequestBody CheckSmsDTO checkSmsDTO) { //修改手机号码前后不能相同 @@ -164,9 +164,9 @@ public class UserController { return ServerResponseEntity.success(); } - @GetMapping("/destroy_user") + @GetMapping("/destroyUser") @Operation(summary = "注销账户", description = "注销账户") - public ServerResponseEntity destroy(@RequestParam(value = "forceDestroy", required = false, defaultValue = "false") Boolean forceDestroy) { + public ServerResponseEntity destroyUser(@RequestParam(value = "forceDestroy", required = false, defaultValue = "false") Boolean forceDestroy) { Long userId = AuthUserContext.get().getUserId(); // 检查此账户是否有未完成的订单 ServerResponseEntity orderCountResponseEntity = orderFeignClient.countOrderByUserId(userId); diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserExtensionController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserExtensionController.java index 9a31e36..2a4cb57 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserExtensionController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserExtensionController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController; * @date 2020-12-08 10:16:53 */ @RestController("appUserExtensionController") -@RequestMapping("/user_extension") +@RequestMapping("/userExtension") @Tag(name = "app-用户扩展信息") public class UserExtensionController { @@ -39,7 +39,7 @@ public class UserExtensionController { return ServerResponseEntity.success(userExtensionPage); } - @GetMapping("/get_info") + @GetMapping("/getInfo") @Operation(summary = "获取用户扩展信息", description = "获取用户扩展信息") public ServerResponseEntity getInfo() { Long userId = AuthUserContext.get().getUserId(); diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserGrowthLogController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserGrowthLogController.java index 82afa91..89cd829 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserGrowthLogController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserGrowthLogController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; * @date 2020-12-08 10:16:53 */ @RestController("appUserGrowthLogController") -@RequestMapping("/user_growth_log") +@RequestMapping("/userGrowthLog") @Tag(name = "app-用户成长值记录") public class UserGrowthLogController { diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserLevelController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserLevelController.java index 745ffe1..77114e4 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserLevelController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserLevelController.java @@ -39,7 +39,7 @@ import java.util.Objects; * @date 2020-12-08 10:16:53 */ @RestController("appUserLevelController") -@RequestMapping("/user_level") +@RequestMapping("/userLevel") @Tag(name = "app-会员等级表") public class UserLevelController { @@ -64,9 +64,9 @@ public class UserLevelController { @Autowired private UserService userService; - @GetMapping("/member_info") + @GetMapping("/getMemberInfo") @Operation(summary = "获取用户会员中心信息", description = "获取用户会员中心信息") - public ServerResponseEntity getMemberInfoVO() { + public ServerResponseEntity getMemberInfo() { Long userId = AuthUserContext.get().getUserId(); UserApiVO user = userService.getByUserId(userId); // 查询用户基本信息名称加头像 @@ -89,10 +89,10 @@ public class UserLevelController { return ServerResponseEntity.success(userMemberInfoVO); } - @GetMapping("/ua/list_level_by_type") + @GetMapping("/ua/levelList") @Operation(summary = "会员等级列表信息", description = "会员等级列表信息") @Parameter(name = "levelType", description = "会员等级类型0为根据会员自身情况 1为付费", required = true) - public ServerResponseEntity> listLevel(Integer levelType) { + public ServerResponseEntity> levelList(Integer levelType) { List userLevelVOList = userLevelService.list(levelType); return ServerResponseEntity.success(userLevelVOList); } @@ -102,7 +102,7 @@ public class UserLevelController { * * @return 等级页展示 */ - @GetMapping("/get_level_show") + @GetMapping("/getLevelShow") @Operation(summary = "会员中心页展示", description = "会员中心页展示") public ServerResponseEntity getLevelShow() { String growthDescriptionValue = configFeignClient.getConfig(ConfigNameConstant.MEMBER_GROWTH_DESCRIPTION).getData(); @@ -113,7 +113,7 @@ public class UserLevelController { } - @GetMapping("/get_user_level_term") + @GetMapping("/getUserLevelTerm") @Operation(summary = "会员等级期数表", description = "会员等级期数表列表") @Parameter(name = "userLevelId", description = "用户会员等级id", required = true) public ServerResponseEntity> getUserLevelTerm(Long userLevelId) { @@ -141,7 +141,7 @@ public class UserLevelController { return ServerResponseEntity.success(levelTermVOList); } - @PostMapping("/buy_vip") + @PostMapping("/buyVip") @Operation(summary = "购买付费会员", description = "付费 or 续费，成为付费会员") public ServerResponseEntity save(@Valid @RequestBody UserLevelRechargeOrderDTO userLevelRechargeOrderDTO) { @@ -197,10 +197,10 @@ public class UserLevelController { return ServerResponseEntity.success(userLevelLog.getLevelLogId()); } - @GetMapping("/list_rights_by_level_type") + @GetMapping("/rightsByLevelTypeList") @Operation(summary = "根据会员类型查权益", description = "0普通会员 1付费会员") @Parameter(name = "levelType", description = " 会员等级类型0为根据会员自身情况 1为付费") - public List listRightsByLevelType(Integer levelType) { + public List rightsByLevelTypeList(Integer levelType) { return userLevelService.listRightsByLevelType(levelType, null); } diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserRechargeController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserRechargeController.java index a4da309..02a420a 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserRechargeController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserRechargeController.java @@ -37,7 +37,7 @@ import java.util.List; * @date 2021-04-27 15:51:36 */ @RestController("appUserRechargeController") -@RequestMapping("/user_recharge") +@RequestMapping("/userRecharge") @Tag(name = "app-余额充值") public class UserRechargeController { diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserRechargeCouponController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserRechargeCouponController.java index 5343332..a40fae5 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserRechargeCouponController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserRechargeCouponController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; * @date 2021-04-27 15:51:36 */ @RestController("appUserRechargeCouponController") -@RequestMapping("/user_recharge_coupon") +@RequestMapping("/userRechargeCoupon") @Tag(name = "余额优惠券关联表") public class UserRechargeCouponController { diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserScoreController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserScoreController.java index 17a2943..3aa8ce1 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserScoreController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserScoreController.java @@ -62,9 +62,9 @@ public class UserScoreController { @DubboReference private ConfigFeignClient configFeignClient; - @GetMapping("/update_user_score") + @GetMapping("/signInUserScore") @Operation(summary = "积分签到", description = "积分签到") - public ServerResponseEntity updateUserScore() { + public ServerResponseEntity signInUserScore() { Long userId = AuthUserContext.get().getUserId(); UserExtension extension = userExtensionService.getByUserId(userId); String scoreConfigValue = configFeignClient.getConfig(ConfigNameConstant.SCORE_CONFIG).getData(); @@ -90,7 +90,7 @@ public class UserScoreController { return ServerResponseEntity.success("领取积分成功"); } - @GetMapping("/score_info") + @GetMapping("/scoreInfo") @Operation(summary = "查看积分中心信息", description = "查看积分中心信息") public ServerResponseEntity scoreInfo() { ScoreDataVO scoreDataVO = new ScoreDataVO(); @@ -192,7 +192,7 @@ public class UserScoreController { /** * 配置信息 */ - @GetMapping("/score_config_info/{id}") + @GetMapping("/scoreConfigInfo/{id}") @Operation(summary = "查看积分成长值配置信息", description = "常见问题：SCORE_QUESTION；等级页展示：LEVEL_SHOW；成长值说明：MEMBER_GROWTH_DESCRIPTION") public ServerResponseEntity info(@PathVariable("id") String key) { String config = configFeignClient.getConfig(key).getData(); diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserScoreLogController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserScoreLogController.java index 0b5a8ce..d395222 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserScoreLogController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserScoreLogController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController; * @date 2020-12-08 10:16:53 */ @RestController("appUserScoreLogController") -@RequestMapping("/user_score_log") +@RequestMapping("/userScoreLog") @Tag(name = "app-用户积分记录") public class UserScoreLogController { @@ -44,7 +44,7 @@ public class UserScoreLogController { return ServerResponseEntity.success(userScoreLogPage); } - @GetMapping("/score_prod_page") + @GetMapping("/scoreProdPage") @Operation(summary = "获取用户积分商品兑换记录列表", description = "分页获取用户积分商品兑换记录列表") public ServerResponseEntity> scoreProdPage(@Valid PageDTO pageDTO) { PageVO userScoreLogPage = userScoreLogService.scoreProdPage(pageDTO); diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserWithdrawCashController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserWithdrawCashController.java index 67decda..013ce33 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserWithdrawCashController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/app/UserWithdrawCashController.java @@ -23,7 +23,7 @@ import java.math.BigDecimal; * @date 2023-04-24 */ @RestController("appUserWithdrawController") -@RequestMapping("/user_withdraw") +@RequestMapping("/userWithdraw") @Tag(name = "app-用户提现") public class UserWithdrawCashController { @@ -41,22 +41,22 @@ public class UserWithdrawCashController { return ServerResponseEntity.success(resp); } - @PostMapping("/pay_confirm") + @PostMapping("/payConfirm") @Operation(summary = "提现确认支付(通联)", description = "确认支付") - public ServerResponseEntity payByBackSms(@RequestBody UserWithDrawDTO userWithDrawDTO) { + public ServerResponseEntity payConfirm(@RequestBody UserWithDrawDTO userWithDrawDTO) { userWithDrawDTO.setUserId(AuthUserContext.get().getUserId()); PayByBackSmsResp resp = userWithdrawCashService.payConfirm(userWithDrawDTO); return ServerResponseEntity.success(resp); } - @GetMapping("/get_total_withdraw_amount") + @GetMapping("/getTotalWithdrawAmount") @Operation(summary = "获取用户提现总金额") public ServerResponseEntity getTotalWithdrawAmount() { BigDecimal totalWithdrawAmount = userWithdrawCashService.getTotalWithdrawAmount(AuthUserContext.get().getUserId()); return ServerResponseEntity.success(totalWithdrawAmount); } - @GetMapping("/page_date_user_withdraw_cash") + @GetMapping("/pageDateUserWithdrawCash") @Operation(summary = "分页获取按年月分组的用户提现记录") public ServerResponseEntity> pageDateUserWithdrawCash(PageDTO pageDTO) { PageVO pageVO = userWithdrawCashService.pageDateUserWithdrawCashVOList(AuthUserContext.get().getUserId(), pageDTO); diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/multishop/CostPerPopupController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/multishop/CostPerPopupController.java index b3b2305..f2bb75b 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/multishop/CostPerPopupController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/multishop/CostPerPopupController.java @@ -32,7 +32,7 @@ import java.util.Objects; * @author TRACK */ @RestController("multishopCostPerPopupController") -@RequestMapping("/m/cost_per_popup") +@RequestMapping("/m/costPerPopup") @Tag(name = "multishop-弹窗广告") public class CostPerPopupController { diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/multishop/UserController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/multishop/UserController.java index ee1f293..3fdc1df 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/multishop/UserController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/multishop/UserController.java @@ -44,9 +44,9 @@ public class UserController { private UserExcelManager userExcelManager; - @GetMapping("/shop_customer_page") + @GetMapping("/shopUserPage") @Operation(summary = "获取客户列表", description = "分页获客户列表") - public ServerResponseEntity> userPage(@Valid PageDTO pageDTO, ShopCustomerDTO shopCustomerDTO) { + public ServerResponseEntity> shopUserPage(@Valid PageDTO pageDTO, ShopCustomerDTO shopCustomerDTO) { shopCustomerDTO.setShopId(AuthUserContext.get().getTenantId()); PageVO shopCustomerPageVO = userService.pageShopCustomerByParam(pageDTO, shopCustomerDTO); return ServerResponseEntity.success(shopCustomerPageVO); @@ -62,7 +62,7 @@ public class UserController { return ServerResponseEntity.success(); } - @GetMapping("/user_info") + @GetMapping("/getUserInfo") @Operation(summary = "根据用户id获取会员信息", description = "根据用户id获取会员信息") public ServerResponseEntity info(@RequestParam Long userId) { UserManagerVO param = userService.getUserInfo(userId, AuthUserContext.get().getTenantId()); @@ -71,21 +71,21 @@ public class UserController { return ServerResponseEntity.success(param); } - @GetMapping("/sold_excel") + @GetMapping("/soldExcel") @Operation(summary = "导出excel", description = "导出客户信息excel") public ServerResponseEntity userSoldExcel(HttpServletResponse response, UserManagerDTO userManagerDTO) { userExcelManager.exportUserInfoExcel(response, userManagerDTO); return ServerResponseEntity.success(); } - @GetMapping("/down_model") + @GetMapping("/exportModel") @Operation(summary = "下载客户信息excel模板", description = "下载客户信息excel模板") - public ServerResponseEntity downloadModel(HttpServletResponse response) { + public ServerResponseEntity exportModel(HttpServletResponse response) { userExcelManager.downloadShopCustomerModel(response); return ServerResponseEntity.success(); } - @PostMapping("/import_excel") + @PostMapping("/importExcel") @Operation(summary = "导入excel", description = "导入客户信息excel") public ServerResponseEntity importExcel(@RequestParam("excelFile") MultipartFile file) { if (file == null) { diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/CostPerPopupController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/CostPerPopupController.java index 7f7c4f0..22354c5 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/CostPerPopupController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/CostPerPopupController.java @@ -33,7 +33,7 @@ import java.util.stream.Collectors; * @author TRACK */ @RestController("platformCostPerPopupController") -@RequestMapping("/p/cost_per_popup") +@RequestMapping("/p/costPerPopup") @Tag(name = "platform-弹窗广告") public class CostPerPopupController { diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserController.java index 76874ff..ccbf0e1 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserController.java @@ -50,7 +50,7 @@ public class UserController { @Autowired private UserExcelManager userExcelManager; - @GetMapping("/user_page") + @GetMapping("/userPage") @Operation(summary = "获取会员管理别表列表", description = "分页获取会员管理别表列表") public ServerResponseEntity> userPage(@Valid PageDTO pageDTO, UserManagerDTO userManagerDTO) { PageVO userPage = userService.getUserInfoPage(pageDTO, userManagerDTO); @@ -60,7 +60,7 @@ public class UserController { return ServerResponseEntity.success(userPage); } - @GetMapping("/user_info") + @GetMapping("/getUserInfo") @Operation(summary = "根据用户id获取会员信息", description = "根据用户id获取会员信息") public ServerResponseEntity info(@RequestParam Long userId) { UserManagerVO param = userService.getUserInfo(userId, Constant.PLATFORM_SHOP_ID); @@ -78,22 +78,22 @@ public class UserController { return ServerResponseEntity.success(); } - @GetMapping("/sold_excel") + @GetMapping("/soldExcel") @Operation(summary = "导出excel", description = "导出用户信息excel") public ServerResponseEntity userSoldExcel(HttpServletResponse response, UserManagerDTO userManagerDTO) { userExcelManager.exportUserInfoExcel(response, userManagerDTO); return ServerResponseEntity.success(); } - @GetMapping("/down_model") + @GetMapping("/exportModel") @Operation(summary = "导出用户信息导入excel模板", description = "下载用户信息导入excel模板") - public ServerResponseEntity downloadModel(HttpServletResponse response) { + public ServerResponseEntity exportModel(HttpServletResponse response) { userExcelManager.downloadModel(response); return ServerResponseEntity.success(); } @Operation(summary = "导入文件") - @PostMapping("/import_excel") + @PostMapping("/importExcel") public ServerResponseEntity importExcel(@RequestParam("excelFile") MultipartFile file) { if (file == null) { throw new LuckException("网络繁忙，请稍后重试"); @@ -102,7 +102,7 @@ public class UserController { return ServerResponseEntity.success(info); } - @GetMapping("/get_user_count_info") + @GetMapping("/getUserCountInfo") @Operation(summary = "获取今日客户概况", description = "获取今日客户概况") public ServerResponseEntity getUserCountInfo() { MemberOverviewVO memberOverviewListVO = userService.getUserCountInfo(new Date()); @@ -116,7 +116,7 @@ public class UserController { } @Operation(summary = "更新用户保存的通联信息", description = "同步数据用(慎重使用)") - @PutMapping("/update_user_info_by_allinpay") + @PutMapping("/updateUserByAllinpay") public ServerResponseEntity updateUserByAllinpay() { userService.updateUserInfoByAllinpay(); return ServerResponseEntity.success(); diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserGrowthLogController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserGrowthLogController.java index bd63eb3..6ee2336 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserGrowthLogController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserGrowthLogController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; * @date 2021-05-08 20:16:53 */ @RestController("platformUserGrowthLogController") -@RequestMapping("/p/user_growth_log") +@RequestMapping("/p/userGrowthLog") @Tag(name = "platform-用户成长值记录") public class UserGrowthLogController { diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserLevelController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserLevelController.java index 98141a0..91ad5bb 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserLevelController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserLevelController.java @@ -25,7 +25,7 @@ import java.util.Objects; * @date 2020-12-08 10:16:53 */ @RestController("platformUserLevelController") -@RequestMapping("/p/user_level") +@RequestMapping("/p/userLevel") @Tag(name = "平台-会员等级表") public class UserLevelController { @@ -79,9 +79,9 @@ public class UserLevelController { return ServerResponseEntity.success(); } - @PutMapping("/recruit_status") + @PutMapping("/recruitStatus") @Operation(summary = "付费会员，是否可以招募会员；1可以招募，0停止招募", description = "付费会员，是否可以招募会员；1可以招募，0停止招募") - public ServerResponseEntity updateRecruitStatus(@Valid @RequestBody UserLevelDTO userLevelDTO) { + public ServerResponseEntity recruitStatus(@Valid @RequestBody UserLevelDTO userLevelDTO) { Long userLevelId = userLevelDTO.getUserLevelId(); if (!Objects.equals(userLevelDTO.getLevelType(), LevelTypeEnum.PAY_USER.value())) { // 非付费会员，不可以使用招募 @@ -92,7 +92,7 @@ public class UserLevelController { return ServerResponseEntity.success(); } - @PutMapping("/update_user_level") + @PutMapping("/updateUserLevel") @Operation(summary = "新增/更新用户会员等级", description = "新增/更新用户会员等级") public ServerResponseEntity updateUserLevel() { userLevelService.updateUserLevel(); @@ -100,14 +100,14 @@ public class UserLevelController { return ServerResponseEntity.success(); } - @PutMapping("/update_growth") + @PutMapping("/batchUserGrowth") @Operation(summary = "批量修改会员成长值", description = "批量修改会员成长值") public ServerResponseEntity batchUserGrowth(@RequestBody @Valid UserAdminDTO userAdminDTO) { userLevelService.batchUpdateGrowth(userAdminDTO); return ServerResponseEntity.success(); } - @PutMapping("/batch_user_score") + @PutMapping("/batchUserScore") @Operation(summary = "批量修改会员积分", description = "批量修改会员积分") public ServerResponseEntity batchUserScore(@RequestBody @Valid UserAdminDTO userAdminDTO) { userLevelService.batchUserScore(userAdminDTO); diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserLevelLogController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserLevelLogController.java index c0f5461..bec666d 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserLevelLogController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserLevelLogController.java @@ -19,14 +19,14 @@ import org.springframework.web.bind.annotation.RestController; * @date: 2023/2/3 16:49 */ @RestController("platformUserLevelLogController") -@RequestMapping("/p/user_level_log") +@RequestMapping("/p/userLevelLog") @Tag(name = "用户等级记录") public class UserLevelLogController { @Autowired private UserLevelLogService userLevelLogService; - @GetMapping("/page_buy_level_log") + @GetMapping("/getUserLevelLogPage") @Operation(summary = "获取付费会员购买记录", description = "获取付费会员购买记录") ServerResponseEntity> getUserLevelLogPage(@Valid PageDTO pageDTO, UserLevelLogDTO userLevelLogDTO) { return ServerResponseEntity.success(userLevelLogService.pageBuyLevelLog(pageDTO, userLevelLogDTO)); diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserRechargeController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserRechargeController.java index d89aaeb..8f30cb0 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserRechargeController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserRechargeController.java @@ -27,7 +27,7 @@ import java.util.List; * @date 2021-04-27 15:51:36 */ @RestController("platformUserRechargeController") -@RequestMapping("/p/user_recharge") +@RequestMapping("/p/userRecharge") @Tag(name = "platform-余额充值级别表") public class UserRechargeController { @@ -82,13 +82,13 @@ public class UserRechargeController { return ServerResponseEntity.success(); } - @PutMapping("/update_user_balance") + @PutMapping("/batchUpdateUserBalance") @Operation(summary = "平台批量修改会员余额", description = "平台批量修改会员余额") public ServerResponseEntity batchUpdateUserBalance(@RequestBody @Valid UserAdminDTO userAdminDTO) { return ServerResponseEntity.success(userRechargeService.batchUpdateUserBalance(userAdminDTO)); } - @GetMapping("/page_user_log") + @GetMapping("/getPageByUserId") @Operation(summary = "分页查询某个用户的余额明细", description = "分页查询某个用户的余额明细") public ServerResponseEntity> getPageByUserId(@Valid PageDTO pageDTO, Long userId) { PageVO res = userBalanceLogService.getPageByUserId(pageDTO, userId); diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserRightsController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserRightsController.java index 212c563..b1a7ec7 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserRightsController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserRightsController.java @@ -27,7 +27,7 @@ import java.util.List; * @date 2020-12-08 10:16:53 */ @RestController("platformUserRightsController") -@RequestMapping("/p/user_rights") +@RequestMapping("/p/userRights") @Tag(name = "店铺-用户权益信息") public class UserRightsController { diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserScoreLogController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserScoreLogController.java index 18443ce..f1cb657 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserScoreLogController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserScoreLogController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; * @date 2020-05-06 10:16:53 */ @RestController("platformUserScoreLogController") -@RequestMapping("/p/user_score_log") +@RequestMapping("/p/userScoreLog") @Tag(name = "店铺-用户积分记录") public class UserScoreLogController { diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserTagController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserTagController.java index 9342938..cdc9404 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserTagController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserTagController.java @@ -32,7 +32,7 @@ import java.util.stream.Collectors; * @date 2020-05-17 16:16:53 */ @RestController("platformUserTagController") -@RequestMapping("/p/user_tag") +@RequestMapping("/p/userTag") @Tag(name = "platform-客户标签") public class UserTagController { @@ -108,7 +108,7 @@ public class UserTagController { @Operation(summary = "批量刷新客户标签") @Parameter(name = "tagIds", description = "标签id集合（不传默认刷新全部）") - @GetMapping("/batch_refresh") + @GetMapping("/batchRefreshTag") public ServerResponseEntity batchRefreshTag(@RequestParam(required = false) List tagIds) { // 查询所有条件标签 if (CollectionUtils.isEmpty(tagIds)) { @@ -124,14 +124,14 @@ public class UserTagController { return ServerResponseEntity.success(); } - @GetMapping("/tag_list") + @GetMapping("/getTagList") @Operation(summary = "可以添加的标签列表", description = "可以添加的标签列表") public ServerResponseEntity> getTagList() { return ServerResponseEntity.success(userTagService.list(new UserTag())); } - @GetMapping("/tag_page") + @GetMapping("/tagPage") @Operation(summary = "获取客户标签列表", description = "分页获取客户标签列表") public ServerResponseEntity> getTagPage(@Valid PageDTO pageDTO, UserTagDTO userTagDTO) { PageVO resPage = userTagService.getPage(pageDTO, userTagDTO); diff --git a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserTagUserController.java b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserTagUserController.java index 834e304..410ce71 100644 --- a/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserTagUserController.java +++ b/tmerclub-user/src/main/java/com/tmerclub/cloud/user/controller/platform/UserTagUserController.java @@ -17,20 +17,20 @@ import org.springframework.web.bind.annotation.*; * @date 2020-12-08 10:16:53 */ @RestController("platformUserTagUserController") -@RequestMapping("/p/user_tag_user") +@RequestMapping("/p/userTagUser") @Tag(name = "platform-用户和标签关联表") public class UserTagUserController { @Autowired private UserTagUserService userTagUserService; - @PutMapping("/update_user_Tag") + @PutMapping("/batchUpdateUserTag") @Operation(summary = "平台批量修改会员标签", description = "平台批量修改会员标签") public ServerResponseEntity batchUpdateUserTag(@RequestBody UserAdminDTO userAdminDTO) { return ServerResponseEntity.success(userTagUserService.batchUpdateUserTag(userAdminDTO)); } - @DeleteMapping("/delete_user_tag") + @DeleteMapping("/deleteUserTag") @Operation(summary = "删除会员的某个标签", description = "删除会员的某个标签") public ServerResponseEntity deleteUserTag(@RequestBody UserTagUserDTO userTagUserDTO) { return ServerResponseEntity.success(userTagUserService.removeByUserIdAndTagId(userTagUserDTO.getUserId(), userTagUserDTO.getUserTagId()));