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
f8487a87
Commit
f8487a87
authored
Aug 23, 2021
by
胡博文
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加查询接口 是否可申诉按钮控制
parent
c01c87b3
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
3 deletions
+28
-3
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+16
-2
order-application-service/src/main/java/cn/freemud/constant/CommonsConstant.java
+6
-0
order-application-service/src/main/java/cn/freemud/constant/KgdRedisKeyConstant.java
+4
-1
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
+2
-0
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
f8487a87
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
package
cn
.
freemud
.
adapter
;
package
cn
.
freemud
.
adapter
;
import
cn.freemud.base.util.DateUtil
;
import
cn.freemud.base.util.DateUtil
;
import
cn.freemud.constant.CommonsConstant
;
import
cn.freemud.constant.CustomerScoreConstant
;
import
cn.freemud.constant.CustomerScoreConstant
;
import
cn.freemud.constant.KgdRedisKeyConstant
;
import
cn.freemud.constant.KgdRedisKeyConstant
;
import
cn.freemud.constant.RedisKeyConstant
;
import
cn.freemud.constant.RedisKeyConstant
;
...
@@ -1167,9 +1168,20 @@ public class OrderAdapter {
...
@@ -1167,9 +1168,20 @@ public class OrderAdapter {
if
(
CollectionUtils
.
isEmpty
(
ordersBeans
))
{
if
(
CollectionUtils
.
isEmpty
(
ordersBeans
))
{
return
Collections
.
emptyList
();
return
Collections
.
emptyList
();
}
}
List
<
QueryOrderResponseVo
>
list
=
Lists
.
newArrayList
();
List
<
QueryOrderResponseVo
>
list
=
Lists
.
newArrayList
();
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
=
ordersBeans
.
get
(
0
);
String
partnerId
=
""
;
if
(
null
!=
orderBean
)
{
partnerId
=
orderBean
.
getCompanyId
();
}
String
configStr
=
redisCache
.
hashGet
(
MessageFormat
.
format
(
KgdRedisKeyConstant
.
ORDER_COMPLAIN_KEY
,
partnerId
,
wxAppId
),
KgdRedisKeyConstant
.
ORDER_COMPLAIN_TYPE
);
Boolean
buttonComplain
=
true
;
if
(
CommonsConstant
.
ORDER_COMPLAIN_CLOSE
.
equals
(
configStr
))
{
buttonComplain
=
false
;
}
for
(
QueryOrdersResponse
.
DataBean
.
OrderBean
ordersBean
:
ordersBeans
)
{
ordersBeans
.
forEach
(
ordersBean
->
{
QueryOrderResponseVo
responseVo
=
new
QueryOrderResponseVo
();
QueryOrderResponseVo
responseVo
=
new
QueryOrderResponseVo
();
responseVo
.
setOid
(
ordersBean
.
getOid
());
responseVo
.
setOid
(
ordersBean
.
getOid
());
responseVo
.
setShopId
(
ordersBean
.
getShopId
());
responseVo
.
setShopId
(
ordersBean
.
getShopId
());
...
@@ -1177,6 +1189,7 @@ public class OrderAdapter {
...
@@ -1177,6 +1189,7 @@ public class OrderAdapter {
responseVo
.
setShopNameEn
(
ordersBean
.
getShopNameEn
());
responseVo
.
setShopNameEn
(
ordersBean
.
getShopNameEn
());
responseVo
.
setShopAddress
(
ordersBean
.
getShopAddress
());
responseVo
.
setShopAddress
(
ordersBean
.
getShopAddress
());
responseVo
.
setShopPhone
(
ordersBean
.
getShopPhone
());
responseVo
.
setShopPhone
(
ordersBean
.
getShopPhone
());
responseVo
.
setButtonComplain
(
buttonComplain
);
responseVo
.
setReceiveAddress
(
ordersBean
.
getAddress
());
responseVo
.
setReceiveAddress
(
ordersBean
.
getAddress
());
if
(
OrderClientType
.
SAASMALL
.
getIndex
().
toString
()
==
ordersBean
.
getOrderClient
())
{
if
(
OrderClientType
.
SAASMALL
.
getIndex
().
toString
()
==
ordersBean
.
getOrderClient
())
{
responseVo
.
setReceiveUsername
(
ordersBean
.
getContactsName
());
responseVo
.
setReceiveUsername
(
ordersBean
.
getContactsName
());
...
@@ -1533,7 +1546,8 @@ public class OrderAdapter {
...
@@ -1533,7 +1546,8 @@ public class OrderAdapter {
responseVo
.
setAutoReviceTime
(
null
==
orderExtInfoDto
?
null
:
orderExtInfoDto
.
getAutoReceiveTime
());
responseVo
.
setAutoReviceTime
(
null
==
orderExtInfoDto
?
null
:
orderExtInfoDto
.
getAutoReceiveTime
());
responseVo
.
setAfterSalesOrderResp
(
ordersBean
.
getAfterSalesOrderResp
());
responseVo
.
setAfterSalesOrderResp
(
ordersBean
.
getAfterSalesOrderResp
());
list
.
add
(
responseVo
);
list
.
add
(
responseVo
);
});
}
AppLogUtil
.
infoLog
(
"fisherman orderBean:"
,
JSON
.
toJSONString
(
ordersBeans
),
JSON
.
toJSONString
(
list
));
AppLogUtil
.
infoLog
(
"fisherman orderBean:"
,
JSON
.
toJSONString
(
ordersBeans
),
JSON
.
toJSONString
(
list
));
return
list
;
return
list
;
}
}
...
...
order-application-service/src/main/java/cn/freemud/constant/CommonsConstant.java
View file @
f8487a87
...
@@ -6,4 +6,9 @@ public class CommonsConstant {
...
@@ -6,4 +6,9 @@ public class CommonsConstant {
public
final
static
Integer
WEIGHT_PRODUCT
=
1
;
public
final
static
Integer
WEIGHT_PRODUCT
=
1
;
public
static
final
String
ORDER_COMPLAIN_OPEN
=
"open"
;
public
static
final
String
ORDER_COMPLAIN_CLOSE
=
"close"
;
}
}
\ No newline at end of file
order-application-service/src/main/java/cn/freemud/constant/KgdRedisKeyConstant.java
View file @
f8487a87
...
@@ -27,10 +27,13 @@ public class KgdRedisKeyConstant {
...
@@ -27,10 +27,13 @@ public class KgdRedisKeyConstant {
*/
*/
public
static
final
String
REFUND_CFG_TAKE_OUT
=
"takeOutType"
;
public
static
final
String
REFUND_CFG_TAKE_OUT
=
"takeOutType"
;
public
static
final
String
ORDER_COMPLAIN_KEY
=
"kgd:order_config_{0}_{1}"
;
public
static
final
String
ORDER_COMPLAIN_KEY
=
"kgd:order_config_{0}_{1}"
;
public
static
final
String
ORDER_COMPLAIN_TYPE
=
"orderComplaintType"
;
public
static
final
String
ORDER_COMPLAIN_TYPE
=
"orderComplaintType"
;
}
}
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
View file @
f8487a87
...
@@ -196,6 +196,8 @@ public class QueryOrderResponseVo {
...
@@ -196,6 +196,8 @@ public class QueryOrderResponseVo {
* 申请退款按钮
* 申请退款按钮
*/
*/
private
Boolean
buttonRefund
;
private
Boolean
buttonRefund
;
private
Boolean
buttonComplain
;
/**
/**
* 联系商家按钮
* 联系商家按钮
*/
*/
...
...
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