Merge branch 'changeurl'

# Conflicts:
#	tmerclub-search/src/main/resources/bootstrap.yml

pom.xml

@@ -24,6 +24,7 @@
         <module>tmerclub-seckill</module>
         <module>tmerclub-flow</module>
         <module>tmerclub-im</module>
+        <module>tmerclub-local</module>
         <!--        <module>system-test</module>-->
     </modules>
     <packaging>pom</packaging>

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<UserAddrVO> 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);
     }
 

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;
     }

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);
     }
 }

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);
     }
 }

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<CouponAppVO> 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);
     }
 }

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);
     }
 

system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/DistributionProdApi.java

@@ -21,7 +21,7 @@ public class DistributionProdApi {
      * 获取分销商品列表
      */
     public static List<SpuAdminVO> 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);
     }
 }

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<GroupActivityVO> 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<Long> 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<AppGroupTeamVO> 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<Long> 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);
     }
 

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<SeckillCategory> 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<SeckillAdminVO> 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<SeckillSpuVO> 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);
     }
 

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);
     }
 }

system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/OrderApi.java

@@ -53,13 +53,13 @@ public class OrderApi {
     }
 
     public static List<DeliveryOrderFeignVO> 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<DeliveryOrderFeignVO> deliveryOrderFeignVos = HttpUtil.get(url, List.class,UrlEnum.SHOP);
         return deliveryOrderFeignVos;
     }
 
     public static void updateOrderDelivery(List<DeliveryOrderDTO> 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);
     }
 

system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/ShopOrderRefundApi.java

@@ -46,7 +46,7 @@ public class ShopOrderRefundApi {
      * 根据订单号查询退款记录
      */
     public static List<EsOrderRefundVO> 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);
     }
 }

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<StationDetailVO> 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);
     }
 }

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);
     }
 

system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/PlatformWalletApi.java

@@ -19,7 +19,7 @@ public class PlatformWalletApi {
      * 根据订单号查询结算记录
      */
     public static List<MongoShopWalletLogBO> getMongoShopWalletLogBO(Long orderId) {
-        String url = Constant.API_URL + "/tmerclub_admin/mp/shop_wallet/page?platformIoType=&amountType=&orderId=" + orderId + "&refundId=&reason=&pageNum=1&pageSize=10";
+        String url = Constant.API_URL + "/tmerclub_admin/ma/shopWallet/page?platformIoType=&amountType=&orderId=" + orderId + "&refundId=&reason=&pageNum=1&pageSize=10";
         return JSON.parseArray(JSON.toJSONString(Json.parseObject(JSON.toJSONString(HttpUtil.get(url, PageVO.class, UrlEnum.PLATFORM)), PageVO.class).getList()), MongoShopWalletLogBO.class);
     }
 

system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/ScoreOrderApi.java

@@ -24,13 +24,13 @@ public class ScoreOrderApi {
     }
 
     public static List<DeliveryOrderFeignVO> 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<DeliveryOrderFeignVO> deliveryOrderFeignVos = HttpUtil.get(url, List.class,UrlEnum.PLATFORM);
         return deliveryOrderFeignVos;
     }
 
     public static void updateOrderDelivery(List<DeliveryOrderDTO> 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);
     }
 }

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);
     }
 }

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);
     }
 }

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);
     }
 }

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<ShopRefundAddrVO> 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);
     }
 }

system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/ShopWalletApi.java

@@ -19,7 +19,7 @@ public class ShopWalletApi {
      * 根据订单号查询结算记录
      */
     public static List<MongoShopWalletLogBO> getMongoShopWalletLogBO(Long orderId, Boolean isMainShop) {
-        String url = Constant.API_URL + "/tmerclub_admin/mp/shop_wallet/page?shopIoType=&amountType=&orderId=" + orderId + "&refundId=&reason=&pageNum=1&pageSize=10";
+        String url = Constant.API_URL + "/tmerclub_admin/ma/shopWallet/page?shopIoType=&amountType=&orderId=" + orderId + "&refundId=&reason=&pageNum=1&pageSize=10";
         if(isMainShop) {
             return JSON.parseArray(JSON.toJSONString(Json.parseObject(JSON.toJSONString(HttpUtil.get(url, PageVO.class, UrlEnum.SHOP)), PageVO.class).getList()), MongoShopWalletLogBO.class);
         } else {

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<DeliveryOrderDTO> 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);
     }
 }

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);
     }
 }

system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/OrderAddrDtoData.java

@@ -3,7 +3,7 @@ package com.tmerclub.cloud.systemtest.data.order;
 import com.tmerclub.cloud.common.order.vo.OrderAddrVO;
 import com.tmerclub.cloud.common.order.vo.OrderVO;
 import com.tmerclub.cloud.order.dto.OrderAddrDTO;
-import com.moyuer.cloud.systemtest.api.order.OrderApi;
+import com.tmerclub.cloud.systemtest.api.order.OrderApi;
 
 /**
  * @author Tu