Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
86133194
Commit
86133194
authored
Nov 16, 2020
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
拒单添加退款
parent
ea8c3761
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
13 deletions
+26
-13
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+1
-0
order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java
+24
-13
order-management/src/main/java/cn/freemud/management/adapter/PaymentSdkAdapter.java
+1
-0
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
86133194
...
@@ -2129,6 +2129,7 @@ public class OrderAdapter {
...
@@ -2129,6 +2129,7 @@ public class OrderAdapter {
multiQueryRequest
.
setNotifyUrl
(
refundNotifyCallback
);
multiQueryRequest
.
setNotifyUrl
(
refundNotifyCallback
);
multiQueryRequest
.
setVer
(
"V1"
);
multiQueryRequest
.
setVer
(
"V1"
);
multiQueryRequest
.
setVer3
(
false
);
multiQueryRequest
.
setVer3
(
false
);
multiQueryRequest
.
setOutOrderNo
(
orderBean
.
getOid
());
return
multiQueryRequest
;
return
multiQueryRequest
;
}
}
...
...
order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java
View file @
86133194
...
@@ -3,6 +3,9 @@ package cn.freemud.service.impl;
...
@@ -3,6 +3,9 @@ package cn.freemud.service.impl;
import
cn.freemud.management.entities.dto.request.order.OrderManagerRequest
;
import
cn.freemud.management.entities.dto.request.order.OrderManagerRequest
;
import
cn.freemud.management.service.adapter.OrderManagerAdapter
;
import
cn.freemud.management.service.adapter.OrderManagerAdapter
;
import
cn.freemud.management.thirdparty.MulitiPaymentClient
;
import
cn.freemud.management.thirdparty.MulitiPaymentClient
;
import
com.alibaba.fastjson.JSON
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq
;
import
com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService
;
import
com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest
;
import
com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest
;
import
com.freemud.sdk.api.assortment.order.response.order.MultiOrderRefundResponse
;
import
com.freemud.sdk.api.assortment.order.response.order.MultiOrderRefundResponse
;
import
org.junit.Test
;
import
org.junit.Test
;
...
@@ -13,6 +16,7 @@ import org.springframework.boot.test.context.SpringBootTest;
...
@@ -13,6 +16,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import
org.springframework.cloud.client.discovery.EnableDiscoveryClient
;
import
org.springframework.cloud.client.discovery.EnableDiscoveryClient
;
import
org.springframework.cloud.netflix.feign.EnableFeignClients
;
import
org.springframework.cloud.netflix.feign.EnableFeignClients
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
springfox.documentation.spring.web.json.Json
;
@RunWith
(
SpringRunner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
@SpringBootTest
...
@@ -22,16 +26,19 @@ import org.springframework.test.context.junit4.SpringRunner;
...
@@ -22,16 +26,19 @@ import org.springframework.test.context.junit4.SpringRunner;
public
class
MallOrderServiceImplTest
{
public
class
MallOrderServiceImplTest
{
@Autowired
@Autowired
private
MallOrderServiceImpl
mallOrder
Service
;
private
OrderDownLoadSdkService
orderDownLoadSdk
Service
;
@Autowired
// @Autowired
private
MCCafeOrderServiceImpl
mcCafeOrderService
;
// private MallOrderServiceImpl mallOrderService;
//
@Autowired
// @Autowired
private
MulitiPaymentClient
mulitiPaymentClient
;
// private MCCafeOrderServiceImpl mcCafeOrderService;
//
@Autowired
// @Autowired
private
OrderManagerAdapter
orderManagerAdapter
;
// private MulitiPaymentClient mulitiPaymentClient;
//
// @Autowired
// private OrderManagerAdapter orderManagerAdapter;
// @Before
// @Before
// public void before() throws Exception {
// public void before() throws Exception {
...
@@ -92,10 +99,14 @@ public class MallOrderServiceImplTest {
...
@@ -92,10 +99,14 @@ public class MallOrderServiceImplTest {
// multiOrderRefundRequest.setOutOrderNo("3900472893821604933666");
// multiOrderRefundRequest.setOutOrderNo("3900472893821604933666");
// MultiOrderRefundResponse<MultiOrderRefundResponse.Data> multiOrderRefundResponseDto = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest,"1864");
// MultiOrderRefundResponse<MultiOrderRefundResponse.Data> multiOrderRefundResponseDto = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest,"1864");
// System.out.println(2345678);
// System.out.println(2345678);
OrderManagerRequest
orderManagerRequest
=
new
OrderManagerRequest
();
// OrderManagerRequest orderManagerRequest = new OrderManagerRequest();
orderManagerRequest
.
setOrderId
(
"19404015572678969200003"
);
// orderManagerRequest.setOrderId("19404015572678969200003");
orderManagerRequest
.
setPartnerId
(
"1864"
);
// orderManagerRequest.setPartnerId("1864");
orderManagerAdapter
.
orderAgreeRefund
(
orderManagerRequest
);
// orderManagerAdapter.orderAgreeRefund(orderManagerRequest);
OrderConditionsReq
request
;
String
str
=
"{\"abnormalStatuses\":[],\"afterSalesStatus\":0,\"appId\":\"\",\"bizType\":0,\"bizTypes\":[1,6,97,98],\"dispenseStatus\":0,\"endTimestamp\":1605542399,\"endUpdateTimestamp\":0,\"expressType\":0,\"externalObjectIds\":[],\"finishStatus\":false,\"isDeleted\":0,\"mobile\":\"\",\"orderClients\":[],\"orderCode\":\"19356550932276285500005\",\"orderCodes\":[],\"orderStatus\":0,\"orderStatuses\":[],\"orderTypes\":[],\"pageNum\":1,\"pageSize\":10,\"partnerId\":\"2655\",\"payStatuses\":[2,3,4],\"payTypes\":[],\"printNum\":0,\"productId\":\"\",\"productName\":\"\",\"settlementTypes\":[],\"startTimestamp\":1604160000,\"startUpdateTimestamp\":0,\"storeIds\":[],\"suspendState\":0,\"thirdOrderCode\":\"\",\"userId\":\"\",\"userName\":\"\"}"
;
request
=
JSON
.
toJavaObject
(
JSON
.
parseObject
(
str
),
OrderConditionsReq
.
class
);
orderDownLoadSdkService
.
queryOrderByConditions
(
request
,
""
);
}
}
...
...
order-management/src/main/java/cn/freemud/management/adapter/PaymentSdkAdapter.java
View file @
86133194
...
@@ -55,6 +55,7 @@ public class PaymentSdkAdapter {
...
@@ -55,6 +55,7 @@ public class PaymentSdkAdapter {
multiQueryRequest
.
setNotifyUrl
(
refundNotifyCallback
);
multiQueryRequest
.
setNotifyUrl
(
refundNotifyCallback
);
multiQueryRequest
.
setVer
(
"V1"
);
multiQueryRequest
.
setVer
(
"V1"
);
multiQueryRequest
.
setVer3
(
false
);
multiQueryRequest
.
setVer3
(
false
);
multiQueryRequest
.
setOutOrderNo
(
orderBean
.
getOid
());
return
multiQueryRequest
;
return
multiQueryRequest
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment