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
f484f5dd
Commit
f484f5dd
authored
Sep 14, 2022
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【【老订单聚合、老购物车聚合】购物车、下单新增购物车行加料数量字段】
https://www.tapd.cn/43862731/prong/stories/view/1143862731001052565
parent
e2f4a92a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
7 deletions
+2
-7
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+2
-7
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
f484f5dd
...
@@ -13,10 +13,7 @@
...
@@ -13,10 +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.*
;
import
cn.freemud.constant.CustomerScoreConstant
;
import
cn.freemud.constant.RedisKeyConstant
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.entities.bo.CreateOrderBONew
;
import
cn.freemud.entities.bo.CreateOrderBONew
;
import
cn.freemud.entities.dto.*
;
import
cn.freemud.entities.dto.*
;
import
cn.freemud.entities.dto.order.CreateOrderOperateDto
;
import
cn.freemud.entities.dto.order.CreateOrderOperateDto
;
...
@@ -96,8 +93,6 @@ import java.util.*;
...
@@ -96,8 +93,6 @@ import java.util.*;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
import
java.util.stream.Stream
;
import
static
cn
.
freemud
.
constant
.
OrderRefundConstant
.
ALLOW_REFUND
;
@Component
@Component
public
class
OrderAdapter
{
public
class
OrderAdapter
{
...
@@ -1855,7 +1850,7 @@ public class OrderAdapter {
...
@@ -1855,7 +1850,7 @@ public class OrderAdapter {
break
;
break
;
}
}
}
}
canRefund
=
ALLOW_REFUND
.
equals
(
orderRefund
);
canRefund
=
OrderRefundConstant
.
ALLOW_REFUND
.
equals
(
orderRefund
);
// 如果是订单完成状态的 支持退款, 这里还需要校验一下是否在退款时间范围内
// 如果是订单完成状态的 支持退款, 这里还需要校验一下是否在退款时间范围内
if
(
OrderStatusV1
.
COMPLETE
.
getCode
().
equals
(
status
.
getCode
())
&&
canRefund
)
{
if
(
OrderStatusV1
.
COMPLETE
.
getCode
().
equals
(
status
.
getCode
())
&&
canRefund
)
{
long
currentTime
=
System
.
currentTimeMillis
();
long
currentTime
=
System
.
currentTimeMillis
();
...
...
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