Compare commits
81 Commits
master_bac
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
0f4ae36549 | ||
|
|
68f95bd6ac | ||
|
|
a9bf6204f1 | ||
|
|
e2fc42ab47 | ||
|
|
00efed6258 | ||
|
|
83e0e13647 | ||
|
|
6955a3973e | ||
|
|
688c6a0933 | ||
|
|
c0d929e390 | ||
|
|
f0a269825f | ||
|
|
29dea10241 | ||
|
|
538feb17b2 | ||
|
|
7523b5e88f | ||
|
|
772efaaa3d | ||
|
|
6a927d5093 | ||
|
|
6c74c399aa | ||
|
|
eb2c706121 | ||
|
|
4f8d52c93a | ||
|
|
093952b77d | ||
|
|
a9437b4c91 | ||
|
|
ebd00f134e | ||
|
|
7d65a5d640 | ||
|
|
66190dd55d | ||
|
|
1da65447da | ||
|
|
b9e67e7c43 | ||
|
|
6b3834f16b | ||
|
|
fcd917c201 | ||
|
|
f78118572f | ||
|
|
2b8394e88c | ||
|
|
92e7053f94 | ||
|
|
7da820e9a6 | ||
|
|
fc46f21a27 | ||
|
|
71d852724d | ||
|
|
6d93aa9155 | ||
|
|
388f534b4b | ||
|
|
ee29f2640b | ||
|
|
437a88b9bd | ||
|
|
a61b7a71d8 | ||
|
|
aece26a198 | ||
|
|
db5b13c7ab | ||
|
|
87636f8f24 | ||
|
|
c184554e19 | ||
|
|
e0513fa526 | ||
|
|
66337d1bcf | ||
|
|
fa547223a4 | ||
|
|
6923032b67 | ||
|
|
ab23712adc | ||
|
|
5352019d63 | ||
|
|
544cb4b3ff | ||
|
|
07c182b9fe | ||
|
|
655fbe5eb3 | ||
|
|
659871efda | ||
|
|
f83ccac538 | ||
|
|
962a3ee5b5 | ||
|
|
d32dbefd58 | ||
|
|
3b85b8bd40 | ||
|
|
0f46cb0389 | ||
|
|
3a70f3fc25 | ||
|
|
ddb7392b16 | ||
|
|
e1d14dfe48 | ||
|
|
c5a6f8eb38 | ||
|
|
9da989153f | ||
|
|
4c9b30cbbe | ||
|
|
c8a77cc381 | ||
|
|
5b23e3bfde | ||
|
|
b6992b6d30 | ||
|
|
7f3934b57c | ||
|
|
1d6d8d00b5 | ||
|
|
f350827684 | ||
|
|
4fe14d8a68 | ||
|
|
067195ff69 | ||
|
|
e0c41b11f1 | ||
|
|
42c0797b3b | ||
|
|
fa0ab06606 | ||
|
|
ea4eb72d64 | ||
|
|
c5659a31ad | ||
|
|
dd5d2bb32d | ||
|
|
7e8fcbfe2c | ||
|
|
93dae8a599 | ||
|
|
2956e69854 | ||
|
|
0385d97d14 |
1
pom.xml
1
pom.xml
@ -24,6 +24,7 @@
|
|||||||
<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>
|
||||||
|
|||||||
@ -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/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);
|
return JSON.parseArray(JSON.toJSONString(Json.parseObject(JSON.toJSONString(HttpUtil.get(url, PageVO.class, UrlEnum.PLATFORM)), PageVO.class).getList()), MongoShopWalletLogBO.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -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/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) {
|
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 {
|
||||||
@ -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.moyuer.cloud.systemtest.api.order.OrderApi;
|
import com.tmerclub.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
Loading…
x
Reference in New Issue
Block a user