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
f7ad917c
Commit
f7ad917c
authored
May 10, 2021
by
hanghang.wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
统一升级华莱士微商城sdk
parent
1d575dda
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
9 additions
and
11 deletions
+9
-11
assortment-ordercenter-sdk/pom.xml
+2
-2
assortment-ordercenter-sdk/readme.md
+1
-0
order-application-service/pom.xml
+1
-1
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+0
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+1
-2
ordercenter-sdk/pom.xml
+1
-1
ordercenter-sdk/readme.md
+3
-2
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderDownLoadSdkService.java
+0
-1
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
+0
-2
No files found.
assortment-ordercenter-sdk/pom.xml
View file @
f7ad917c
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<version>
2.1.5
4
-RELEASE
</version>
<version>
2.1.5
5
-RELEASE
</version>
<dependencies>
<dependencies>
<dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
<dependency>
<dependency>
<groupId>
cn.freemud
</groupId>
<groupId>
cn.freemud
</groupId>
<artifactId>
ordercenter-sdk
</artifactId>
<artifactId>
ordercenter-sdk
</artifactId>
<version>
2.9.11-SNAPSHOT
</version>
<version>
1.3.50.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
...
...
assortment-ordercenter-sdk/readme.md
View file @
f7ad917c
...
@@ -129,3 +129,4 @@
...
@@ -129,3 +129,4 @@
| 2.1.52-RELEASE | 更新围餐sdk | 王航航 | 2021-04-20 |
| 2.1.52-RELEASE | 更新围餐sdk | 王航航 | 2021-04-20 |
| 2.1.52-RELEASE | sdk更新 | 张志恒 | 2021-04-26|
| 2.1.52-RELEASE | sdk更新 | 张志恒 | 2021-04-26|
| 2.1.54-RELEASE | 基础订单sdk qa/预发布、生产/环境使用LoadBalanced | wuping | 2021-04-26|
| 2.1.54-RELEASE | 基础订单sdk qa/预发布、生产/环境使用LoadBalanced | wuping | 2021-04-26|
| 2.1.55-RELEASE | 统一升级华莱士微商城SDK | 王航航 | 2021-05-10|
order-application-service/pom.xml
View file @
f7ad917c
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
<dependency>
<dependency>
<groupId>
cn.freemud
</groupId>
<groupId>
cn.freemud
</groupId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<version>
2.1.5
4
-RELEASE
</version>
<version>
2.1.5
5
-RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
...
...
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
f7ad917c
This diff is collapsed.
Click to expand it.
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
f7ad917c
...
@@ -183,7 +183,7 @@ import java.util.function.Function;
...
@@ -183,7 +183,7 @@ import java.util.function.Function;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
static
cn
.
freemud
.
constant
.
OrderRefundConstant
.
ALLOW_REFUND
;
import
static
cn
.
freemud
.
constant
.
OrderRefundConstant
.
ALLOW_REFUND
;
@Slf4j
@Service
@Service
public
class
OrderServiceImpl
implements
Orderservice
{
public
class
OrderServiceImpl
implements
Orderservice
{
...
@@ -4186,7 +4186,6 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -4186,7 +4186,6 @@ public class OrderServiceImpl implements Orderservice {
@Override
@Override
public
BaseResponse
spellGroupOrderFailRefund
(
SpellGroupFailRefundVo
refundVo
)
{
public
BaseResponse
spellGroupOrderFailRefund
(
SpellGroupFailRefundVo
refundVo
)
{
log
.
info
(
"拼团失败取消订单 -> refundVo:{}"
,
refundVo
);
List
<
String
>
orderCodeList
=
refundVo
.
getOrderCodeList
();
List
<
String
>
orderCodeList
=
refundVo
.
getOrderCodeList
();
if
(
CollectionUtils
.
isEmpty
(
orderCodeList
)
||
orderCodeList
.
stream
().
anyMatch
(
StringUtils:
:
isBlank
))
{
if
(
CollectionUtils
.
isEmpty
(
orderCodeList
)
||
orderCodeList
.
stream
().
anyMatch
(
StringUtils:
:
isBlank
))
{
return
ResponseUtil
.
error
(
ResponseResult
.
PARAMETER_MISSING
.
getCode
(),
"订单号不能为空"
);
return
ResponseUtil
.
error
(
ResponseResult
.
PARAMETER_MISSING
.
getCode
(),
"订单号不能为空"
);
...
...
ordercenter-sdk/pom.xml
View file @
f7ad917c
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<version>
1.0.0
</version>
<version>
1.0.0
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<version>
1.3.
49
.RELEASE
</version>
<version>
1.3.
50
.RELEASE
</version>
<artifactId>
ordercenter-sdk
</artifactId>
<artifactId>
ordercenter-sdk
</artifactId>
<dependencies>
<dependencies>
...
...
ordercenter-sdk/readme.md
View file @
f7ad917c
...
@@ -79,4 +79,6 @@
...
@@ -79,4 +79,6 @@
| 1.3.45.RELEASE | 月享卡2.0 | 徐康 | 2021-04-15 |
| 1.3.45.RELEASE | 月享卡2.0 | 徐康 | 2021-04-15 |
| 1.3.46.RELEASE | 更新sdk | 徐康 | 2021-04-19 |
| 1.3.46.RELEASE | 更新sdk | 徐康 | 2021-04-19 |
| 1.3.48.RELEASE | 支付方式新增英文字段 | 王航航 | 2021-04-20 |
| 1.3.48.RELEASE | 支付方式新增英文字段 | 王航航 | 2021-04-20 |
| 1.3.49.RELEASE | 基础订单sdk qa/预发布、生产/环境使用LoadBalanced | 伍平 | 2021-03-22 |
| 1.3.49.RELEASE | 基础订单sdk qa/预发布、生产/环境使用LoadBalanced | 伍平 | 2021-03-22 |
\ No newline at end of file
| 1.3.50.RELEASE | 华莱士商城SDK统一升级 | 王航航 | 2021-05-10 |
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderDownLoadSdkService.java
View file @
f7ad917c
...
@@ -56,7 +56,6 @@ public class OrderDownLoadSdkService {
...
@@ -56,7 +56,6 @@ public class OrderDownLoadSdkService {
*/
*/
public
BaseDownLoadResponse
<
List
<
OrderInfoReqs
>>
queryOrderByConditions
(
OrderConditionsReq
request
,
String
trackingNo
)
{
public
BaseDownLoadResponse
<
List
<
OrderInfoReqs
>>
queryOrderByConditions
(
OrderConditionsReq
request
,
String
trackingNo
)
{
long
begin
=
System
.
currentTimeMillis
();
long
begin
=
System
.
currentTimeMillis
();
log
.
info
(
JSON
.
toJSONString
(
request
));
BaseDownLoadResponse
<
List
<
OrderInfoReqs
>>
responseDTO
=
RequestThirdPartyUtils
.
httpJsonReqComplexDownLoad
(
restTemplate
,
InterfaceAddressConstant
.
QUERY_ORDER_BY_CONDITIONS
,
BaseDownLoadResponse
<
List
<
OrderInfoReqs
>>
responseDTO
=
RequestThirdPartyUtils
.
httpJsonReqComplexDownLoad
(
restTemplate
,
InterfaceAddressConstant
.
QUERY_ORDER_BY_CONDITIONS
,
createBaseRequest
(
request
,
trackingNo
),
new
ParameterizedTypeReference
<
BaseDownLoadResponse
<
List
<
OrderInfoReqs
>>>()
{
createBaseRequest
(
request
,
trackingNo
),
new
ParameterizedTypeReference
<
BaseDownLoadResponse
<
List
<
OrderInfoReqs
>>>()
{
});
});
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
View file @
f7ad917c
...
@@ -63,7 +63,6 @@ public class OrderSdkService {
...
@@ -63,7 +63,6 @@ public class OrderSdkService {
* 创建订单
* 创建订单
*/
*/
public
BaseResponse
<
OrderInfoReqs
>
createOrder
(
CreateOrderRequest
request
,
String
trackingNo
)
{
public
BaseResponse
<
OrderInfoReqs
>
createOrder
(
CreateOrderRequest
request
,
String
trackingNo
)
{
log
.
info
(
JSON
.
toJSONString
(
request
));
OrderBaseResp
<
OrderInfoReqs
>
responseDTO
=
RequestThirdPartyUtils
.
httpJsonReqComplexNew
(
restTemplate
,
InterfaceAddressConstant
.
CREATE_ORDER
,
OrderBaseResp
<
OrderInfoReqs
>
responseDTO
=
RequestThirdPartyUtils
.
httpJsonReqComplexNew
(
restTemplate
,
InterfaceAddressConstant
.
CREATE_ORDER
,
createBaseRequest
(
request
,
trackingNo
),
new
ParameterizedTypeReference
<
OrderBaseResp
<
OrderInfoReqs
>>()
{
createBaseRequest
(
request
,
trackingNo
),
new
ParameterizedTypeReference
<
OrderBaseResp
<
OrderInfoReqs
>>()
{
});
});
...
@@ -160,7 +159,6 @@ public class OrderSdkService {
...
@@ -160,7 +159,6 @@ public class OrderSdkService {
if
(
StringUtils
.
isNotEmpty
(
request
.
getCompleteOrderCode
()))
{
if
(
StringUtils
.
isNotEmpty
(
request
.
getCompleteOrderCode
()))
{
url
=
InterfaceAddressConstant
.
FATHER_ORDER_PAY_SUCCESS
;
url
=
InterfaceAddressConstant
.
FATHER_ORDER_PAY_SUCCESS
;
}
}
log
.
info
(
JSONObject
.
toJSONString
(
request
));
OrderBaseResp
<
PaySuccessResp
>
responseDTO
=
RequestThirdPartyUtils
.
httpJsonReqComplexNew
(
restTemplate
,
url
,
OrderBaseResp
<
PaySuccessResp
>
responseDTO
=
RequestThirdPartyUtils
.
httpJsonReqComplexNew
(
restTemplate
,
url
,
createBaseRequest
(
request
,
trackingNo
),
new
ParameterizedTypeReference
<
OrderBaseResp
<
PaySuccessResp
>>()
{
createBaseRequest
(
request
,
trackingNo
),
new
ParameterizedTypeReference
<
OrderBaseResp
<
PaySuccessResp
>>()
{
});
});
...
...
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