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
baea128f
Commit
baea128f
authored
Aug 08, 2023
by
rui.zhu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改售后单退款明细字段
parent
b41d1ccc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+1
-6
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/AfterSalesOperateReq.java
+1
-1
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
baea128f
...
@@ -55,9 +55,7 @@ import cn.freemud.enums.*;
...
@@ -55,9 +55,7 @@ import cn.freemud.enums.*;
import
cn.freemud.handler.MemberBlacklistHandler
;
import
cn.freemud.handler.MemberBlacklistHandler
;
import
cn.freemud.handler.WeChatLiveMsgHandle
;
import
cn.freemud.handler.WeChatLiveMsgHandle
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.management.adapter.OrderCancelReqAdapter
;
import
cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request
;
import
cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request
;
import
cn.freemud.management.entities.dto.request.order.OrderManagerRequest
;
import
cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto
;
import
cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto
;
import
cn.freemud.management.entities.dto.response.pay.OrderRefundResponse
;
import
cn.freemud.management.entities.dto.response.pay.OrderRefundResponse
;
import
cn.freemud.management.entities.dto.response.pay.PayBatchRefundResponse
;
import
cn.freemud.management.entities.dto.response.pay.PayBatchRefundResponse
;
...
@@ -116,9 +114,7 @@ import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
...
@@ -116,9 +114,7 @@ import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import
com.freemud.application.sdk.api.storecenter.service.StoreCenterService
;
import
com.freemud.application.sdk.api.storecenter.service.StoreCenterService
;
import
com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto
;
import
com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto
;
import
com.freemud.application.sdk.api.structure.service.MessageCenterClient
;
import
com.freemud.application.sdk.api.structure.service.MessageCenterClient
;
import
com.freemud.sdk.api.assortment.message.enums.MessageEventType
;
import
com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest
;
import
com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest
;
import
com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest
;
import
com.freemud.sdk.api.assortment.message.service.IMessageTemplatePushService
;
import
com.freemud.sdk.api.assortment.message.service.IMessageTemplatePushService
;
import
com.freemud.sdk.api.assortment.order.enums.AutoOrderConfigTime
;
import
com.freemud.sdk.api.assortment.order.enums.AutoOrderConfigTime
;
import
com.freemud.sdk.api.assortment.order.enums.OperationClientEnum
;
import
com.freemud.sdk.api.assortment.order.enums.OperationClientEnum
;
...
@@ -133,7 +129,6 @@ import com.google.common.collect.Lists;
...
@@ -133,7 +129,6 @@ import com.google.common.collect.Lists;
import
com.google.common.collect.Maps
;
import
com.google.common.collect.Maps
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.collections4.MapUtils
;
import
org.apache.commons.lang.ObjectUtils
;
import
org.apache.commons.lang.ObjectUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -627,7 +622,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -627,7 +622,7 @@ public class OrderServiceImpl implements Orderservice {
refundItem
.
setPayChannelName
(
PayChannelType
.
getByEbcode
(
requestVo
.
getPayCode
()).
getName
());
refundItem
.
setPayChannelName
(
PayChannelType
.
getByEbcode
(
requestVo
.
getPayCode
()).
getName
());
refundItem
.
setAmount
(
requestVo
.
getRefundAmount
());
refundItem
.
setAmount
(
requestVo
.
getRefundAmount
());
refundItem
.
setRefundTradeNo
(
requestVo
.
getRefundTradeNo
());
refundItem
.
setRefundTradeNo
(
requestVo
.
getRefundTradeNo
());
refundItem
.
setRefund
Dat
e
(
DateUtil
.
convert2Date
(
requestVo
.
getRefundTime
(),
"yyyyMMddHHmmss"
).
getTime
());
refundItem
.
setRefund
Tim
e
(
DateUtil
.
convert2Date
(
requestVo
.
getRefundTime
(),
"yyyyMMddHHmmss"
).
getTime
());
refundItemList
.
add
(
refundItem
);
refundItemList
.
add
(
refundItem
);
request
.
setPayRefundItemList
(
refundItemList
);
request
.
setPayRefundItemList
(
refundItemList
);
BaseOrderResponse
response
=
orderCenterSdkService
.
orderRefundComplete
(
request
);
BaseOrderResponse
response
=
orderCenterSdkService
.
orderRefundComplete
(
request
);
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/AfterSalesOperateReq.java
View file @
baea128f
...
@@ -84,7 +84,7 @@ public class AfterSalesOperateReq {
...
@@ -84,7 +84,7 @@ public class AfterSalesOperateReq {
/**
/**
* 退款时间 单位毫秒
* 退款时间 单位毫秒
*/
*/
private
Long
refund
Dat
e
;
private
Long
refund
Tim
e
;
/**
/**
* 退款储值卡卡号(退款渠道为储值卡时,则必须传递)
* 退款储值卡卡号(退款渠道为储值卡时,则必须传递)
*/
*/
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
View file @
baea128f
...
@@ -125,7 +125,7 @@ public class OrderCancelReq {
...
@@ -125,7 +125,7 @@ public class OrderCancelReq {
/**
/**
* 退款时间 单位毫秒
* 退款时间 单位毫秒
*/
*/
private
Long
refund
Dat
e
;
private
Long
refund
Tim
e
;
/**
/**
* 退款储值卡卡号(退款渠道为储值卡时,则必须传递)
* 退款储值卡卡号(退款渠道为储值卡时,则必须传递)
*/
*/
...
...
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