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
b43a848b
Commit
b43a848b
authored
Nov 12, 2020
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
同意退款添加工具类
parent
9bc35aab
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
84 deletions
+3
-84
order-application-service/src/main/java/cn/freemud/OrderApplication.java
+1
-1
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+1
-0
order-management/pom.xml
+1
-1
order-management/src/main/java/cn/freemud/management/entities/dto/request/coupon/MCCafeCouponLockRequest.java
+0
-82
No files found.
order-application-service/src/main/java/cn/freemud/OrderApplication.java
View file @
b43a848b
...
@@ -44,7 +44,7 @@ import java.util.concurrent.ThreadPoolExecutor;
...
@@ -44,7 +44,7 @@ import java.util.concurrent.ThreadPoolExecutor;
@EnableSwagger2
@EnableSwagger2
@EnableCircuitBreaker
@EnableCircuitBreaker
@SpringBootApplication
@SpringBootApplication
//
@EnableDiscoveryClient
@EnableDiscoveryClient
@EnableAspectJAutoProxy
@EnableAspectJAutoProxy
@ComponentScan
({
"cn.freemud"
,
"com.freemud"
})
@ComponentScan
({
"cn.freemud"
,
"com.freemud"
})
@MapperScan
({
"cn.freemud.*.dao"
,
"com.freemud.sdk.api.assortment.orderdistributor.mapper"
,
"com.freemud.api.assortment.datamanager.manager"
,
@MapperScan
({
"cn.freemud.*.dao"
,
"com.freemud.sdk.api.assortment.orderdistributor.mapper"
,
"com.freemud.api.assortment.datamanager.manager"
,
...
...
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
b43a848b
...
@@ -83,6 +83,7 @@ import org.apache.commons.lang.StringUtils;
...
@@ -83,6 +83,7 @@ import org.apache.commons.lang.StringUtils;
import
org.apache.commons.lang.time.FastDateFormat
;
import
org.apache.commons.lang.time.FastDateFormat
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
java.awt.geom.Point2D
;
import
java.awt.geom.Point2D
;
...
...
order-management/pom.xml
View file @
b43a848b
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
<dependency>
<dependency>
<groupId>
cn.freemud
</groupId>
<groupId>
cn.freemud
</groupId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<version>
2.1.
0-RELEASE
</version>
<version>
2.1.
6-SNAPSHOT
</version>
<scope>
provided
</scope>
<scope>
provided
</scope>
</dependency>
</dependency>
<dependency>
<dependency>
...
...
order-management/src/main/java/cn/freemud/management/entities/dto/request/coupon/MCCafeCouponLockRequest.java
deleted
100644 → 0
View file @
9bc35aab
package
cn
.
freemud
.
management
.
entities
.
dto
.
request
.
coupon
;
import
lombok.Data
;
import
java.util.List
;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: CouponCodeVerificationReqVO
* @Package cn.freemud.entities.dto
* @Description:
* @author: biao.zhang
* @date: 2018/7/17 14:45
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/
@Data
public
class
MCCafeCouponLockRequest
{
private
Integer
ver
;
/**
* 71 核销
* 89 锁定
* 90 解锁
*/
private
Integer
reqType
;
/**
* 核销渠道
* 1:线下Pos
* 2:线上
* 3:pickup:麦当劳点餐
* 4:delivery:麦当劳外送
* 5:mccafe:麦当劳咖啡
* 6:mc_dessert麦当劳甜品站
* 7:SOK
* 8:ECP/CMA
* 9:mcd_alipay:麦当劳支付宝点餐
*/
private
String
channel
;
//商户编号
private
String
partnerId
;
//商家门店号
private
String
storeId
;
//营业员编号
private
String
operatorId
;
//POS机编号
private
String
stationId
;
//交易序号
private
String
transId
;
//券编号
private
String
coupon
;
//三方券号
private
String
offerId
;
//锁定/解锁次数
private
String
number
;
private
String
appFlag
;
private
String
businessDate
;
//----非必传---
//预约订单时间,为空则为及时单,如:2020-06-17 12:00:00
private
String
advancedOrderTime
;
//签名
private
String
sign
;
private
List
<
MCCafeTransactionVo
>
transactions
;
}
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