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
3f91a45d
Commit
3f91a45d
authored
Jul 30, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单模块 预定单开发
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
88be67b0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
4 deletions
+12
-4
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+12
-4
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
3f91a45d
...
@@ -45,6 +45,7 @@ import cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto;
...
@@ -45,6 +45,7 @@ import cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto;
import
cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto
;
import
cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.enums.*
;
import
cn.freemud.enums.*
;
import
cn.freemud.enums.OrderType
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request
;
import
cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request
;
import
cn.freemud.management.entities.dto.response.activity.GroupWorkRefundResponse
;
import
cn.freemud.management.entities.dto.response.activity.GroupWorkRefundResponse
;
...
@@ -80,10 +81,7 @@ import com.freemud.application.sdk.api.couponcenter.offline.service.OfflineCoupo
...
@@ -80,10 +81,7 @@ import com.freemud.application.sdk.api.couponcenter.offline.service.OfflineCoupo
import
com.freemud.application.sdk.api.log.ErrorLog
;
import
com.freemud.application.sdk.api.log.ErrorLog
;
import
com.freemud.application.sdk.api.log.LogThreadLocal
;
import
com.freemud.application.sdk.api.log.LogThreadLocal
;
import
com.freemud.application.sdk.api.ordercenter.entities.PayItem
;
import
com.freemud.application.sdk.api.ordercenter.entities.PayItem
;
import
com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType
;
import
com.freemud.application.sdk.api.ordercenter.enums.*
;
import
com.freemud.application.sdk.api.ordercenter.enums.OrderClientType
;
import
com.freemud.application.sdk.api.ordercenter.enums.PayChannelType
;
import
com.freemud.application.sdk.api.ordercenter.enums.RefundModeEnum
;
import
com.freemud.application.sdk.api.ordercenter.request.*
;
import
com.freemud.application.sdk.api.ordercenter.request.*
;
import
com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCreateReq
;
import
com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCreateReq
;
import
com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse
;
import
com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse
;
...
@@ -1868,6 +1866,16 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -1868,6 +1866,16 @@ public class OrderServiceImpl implements Orderservice {
}
}
}
}
// fisherman 预定单前置校验-> bizType=7
if
(
BizTypeEnum
.
ADVANCE_ORDER
.
getBizType
().
compareTo
(
orderBean
.
getBizType
())
==
0
)
{
// 预定时间 前一天都可退款
Long
gmtExpect
=
orderBean
.
getGmtExpect
();
if
(
Objects
.
isNull
(
gmtExpect
))
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER__ERRORREFUND
.
getCode
(),
"预期送达时间为空,请联系售后"
);
}
}
/**
/**
* 已接单,制作完成,配送中,未接单,用户可申请退款
* 已接单,制作完成,配送中,未接单,用户可申请退款
*
*
...
...
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