列表展示项

# 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/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/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/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