Compare commits

..

2 Commits

Author SHA1 Message Date
wzgaoyn
516aa30e74 注册公网ip 2025-04-07 17:00:16 +08:00
wzgaoyn
87c960b96d 注册公网ip 2025-04-07 16:57:21 +08:00
1301 changed files with 88510 additions and 11750 deletions

View File

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

View File

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

View File

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

View File

@ -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.OrderAddrVO;
import com.tmerclub.cloud.common.order.vo.OrderVO; import com.tmerclub.cloud.common.order.vo.OrderVO;
import com.tmerclub.cloud.order.dto.OrderAddrDTO; import com.tmerclub.cloud.order.dto.OrderAddrDTO;
import com.tmerclub.cloud.systemtest.api.order.OrderApi; import com.moyuer.cloud.systemtest.api.order.OrderApi;
/** /**
* @author Tu * @author Tu

Some files were not shown because too many files have changed in this diff Show More