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
24cb6642
Commit
24cb6642
authored
Nov 12, 2020
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改返回名字
parent
b4b5a739
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
109 deletions
+2
-109
order-management/src/main/java/cn/freemud/management/entities/dto/request/coupon/MCCafeCouponRequest.java
+0
-107
order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
+2
-2
No files found.
order-management/src/main/java/cn/freemud/management/entities/dto/request/coupon/MCCafeCouponRequest.java
deleted
100644 → 0
View file @
b4b5a739
package
cn
.
freemud
.
management
.
entities
.
dto
.
request
.
coupon
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
java.util.List
;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public
class
MCCafeCouponRequest
{
/**
* 接口版本
*/
@NotNull
private
Integer
ver
;
/**
* kdg.Y 开个店渠道且需要回调三方
* kgd.N 开个店渠道且不需要回调三方
*/
private
String
appFlag
;
/**
* 需要查询的券码,仅供查询券使用
*/
private
String
coupon
;
/**
* 请求操作类型,0是卡券查询,2是卡券交易查询,3是卡券冲正,71是卡券核销
*/
@NotNull
(
message
=
"操作不能为空"
)
private
Integer
reqtype
;
/**
* 商家门店号
*/
@NotBlank
(
message
=
"商家门店号不能为空"
)
private
String
store_id
;
/**
* 子品牌 ID 可以为空
*/
private
String
organize_id
;
/**
* 组织机构ID(注意和channle的区别)
*/
private
List
<
String
>
channel_ids
;
/**
* 组织机构code(注意和channle的区别)
*/
private
List
<
String
>
channel_codes
;
/**
* 商家POS机编号
*/
@NotBlank
(
message
=
"商家POS机编号不能为空"
)
private
String
station_id
;
/**
* 营业员编号
*/
@NotBlank
(
message
=
"营业员编号不能为空"
)
private
String
operator_id
;
/**
* 商户编号
*/
@NotNull
(
message
=
"商户编号不能为空"
)
private
Integer
partnerId
;
private
Integer
checkValue
;
private
Integer
clientReqCount
;
/**
* POS交易序号
*/
private
String
trans_id
;
/**
* 营业日
*/
private
String
business_date
;
/**
* 优惠券列表
*/
private
List
<
MCCafeTransactionVo
>
transactions
;
/**
* 签名
*/
private
String
sign
;
/**
* 追加key
*/
private
String
appSecret
;
private
String
openid
;
private
String
transactionuuid
;
private
String
status
;
private
Boolean
isManual
;
private
String
channel
;
}
order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
View file @
24cb6642
...
...
@@ -53,7 +53,7 @@ public class PaymentHandle {
@Autowired
private
OrderSdkService
orderSdkService
;
@Autowired
private
MulitiOrderPaymentClient
mulitiPaymentClient
;
private
MulitiOrderPaymentClient
muliti
Order
PaymentClient
;
@Autowired
private
RedisCache
redisCache
;
/**
...
...
@@ -145,7 +145,7 @@ public class PaymentHandle {
public
PayRefundResponse
multiRefund
(
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
){
PayRefundStatus
refundStatus
=
PayRefundStatus
.
SUCCESS
;
MultiOrderRefundRequest
multiOrderRefundRequest
=
paymentSdkAdapter
.
getMultiOrderPayRefundRequest
(
orderBean
);
MultiOrderRefundResponse
<
MultiOrderRefundResponse
.
Data
>
multiOrderRefundResponse
=
mulitiPaymentClient
.
paymentApplicationRefund
(
multiOrderRefundRequest
,
orderBean
.
getCompanyId
());
MultiOrderRefundResponse
<
MultiOrderRefundResponse
.
Data
>
multiOrderRefundResponse
=
muliti
Order
PaymentClient
.
paymentApplicationRefund
(
multiOrderRefundRequest
,
orderBean
.
getCompanyId
());
if
(
multiOrderRefundResponse
==
null
||
multiOrderRefundResponse
.
getData
()
==
null
||
!
com
.
freemud
.
sdk
.
api
.
assortment
.
order
.
domain
.
ResponseCodeConstant
.
ORDER_PAY_RESPONSE_SUCCESS
.
equals
(
multiOrderRefundResponse
.
getCode
()))
{
throw
new
OrderServiceException
(
ResponseResult
.
REFUND_EXCEPTION
);
}
...
...
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