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
c3a6cf6f
Commit
c3a6cf6f
authored
Nov 24, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
extinfo 新增储值卡支付 卡号记录
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
b5217d6e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
+4
-5
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
+5
-0
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
View file @
c3a6cf6f
...
@@ -7,19 +7,16 @@ import cn.freemud.constant.RedisKeyConstant;
...
@@ -7,19 +7,16 @@ import cn.freemud.constant.RedisKeyConstant;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.entities.dto.SvcComPayRequestDto
;
import
cn.freemud.entities.dto.SvcComPayRequestDto
;
import
cn.freemud.entities.dto.SvcComPayResponseDto
;
import
cn.freemud.entities.dto.SvcComPayResponseDto
;
import
cn.freemud.entities.dto.order.CreateOrderOperateDto
;
import
cn.freemud.entities.dto.order.CreatePrepayRequestDto
;
import
cn.freemud.entities.dto.order.CreatePrepayRequestDto
;
import
cn.freemud.entities.dto.order.FacePayRequestDto
;
import
cn.freemud.entities.dto.order.FacePayRequestDto
;
import
cn.freemud.entities.dto.order.UnifiedPayResponseDto
;
import
cn.freemud.entities.dto.order.UnifiedPayResponseDto
;
import
cn.freemud.entities.dto.pay.*
;
import
cn.freemud.entities.dto.pay.*
;
import
cn.freemud.entities.dto.pay.svc.SVCCardAmountRequestDto
;
import
cn.freemud.entities.dto.pay.svc.SVCCardAmountRequestDto
;
import
cn.freemud.entities.dto.pay.svc.SVCCardAmountResponseDto
;
import
cn.freemud.entities.dto.pay.svc.SVCCardAmountResponseDto
;
import
cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto
;
import
cn.freemud.entities.vo.CreateOrderResponseVo
;
import
cn.freemud.entities.vo.CreateOrderResponseVo
;
import
cn.freemud.entities.vo.CreateOrderVo
;
import
cn.freemud.entities.vo.PaysuccessNoticeMessage
;
import
cn.freemud.entities.vo.PaysuccessNoticeMessage
;
import
cn.freemud.entities.vo.order.PlugInParameter
;
import
cn.freemud.entities.vo.order.CreateOrderUnionPayCardVo
;
import
cn.freemud.entities.vo.order.CreateOrderUnionPayCardVo
;
import
cn.freemud.entities.vo.order.PlugInParameter
;
import
cn.freemud.enums.*
;
import
cn.freemud.enums.*
;
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
;
...
@@ -60,7 +57,6 @@ import com.freemud.application.sdk.api.paymentcenter.client.response.CodePayResp
...
@@ -60,7 +57,6 @@ import com.freemud.application.sdk.api.paymentcenter.client.response.CodePayResp
import
com.freemud.application.sdk.api.paymentcenter.client.response.PaymentCloseUnifiedOrderResponse
;
import
com.freemud.application.sdk.api.paymentcenter.client.response.PaymentCloseUnifiedOrderResponse
;
import
com.freemud.application.sdk.api.paymentcenter.client.response.PaymentQueryResponse
;
import
com.freemud.application.sdk.api.paymentcenter.client.response.PaymentQueryResponse
;
import
com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService
;
import
com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService
;
import
com.freemud.application.sdk.api.storecenter.response.StoreResponse
;
import
com.freemud.sdk.api.assortment.order.constant.OrderRedisKeyConstant
;
import
com.freemud.sdk.api.assortment.order.constant.OrderRedisKeyConstant
;
import
com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest
;
import
com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest
;
import
com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest
;
import
com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest
;
...
@@ -199,6 +195,9 @@ public class PayServiceImpl {
...
@@ -199,6 +195,9 @@ public class PayServiceImpl {
}
}
createOrderResponse
=
orderAdapter
.
convent2CreateFatherSonOrderResponseVo
(
orderPayResponse
,
createPrepayRequestDto
.
getProductOrderBean
());
createOrderResponse
=
orderAdapter
.
convent2CreateFatherSonOrderResponseVo
(
orderPayResponse
,
createPrepayRequestDto
.
getProductOrderBean
());
//更新订单支付信息
//更新订单支付信息
if
(
Objects
.
nonNull
(
createPrepayRequestDto
.
getOrderExtInfoDTO
())
&&
StringUtils
.
isNotBlank
(
cardCode
))
{
createPrepayRequestDto
.
getOrderExtInfoDTO
().
setCardCode
(
cardCode
);
}
BaseResponse
baseEditResponse
=
this
.
updateOrderInfo
(
orderPayResponse
,
createPrepayRequestDto
.
getOrderExtInfoDTO
(),
createPrepayRequestDto
.
getProductOrderBean
(),
LogThreadLocal
.
getTrackingNo
());
BaseResponse
baseEditResponse
=
this
.
updateOrderInfo
(
orderPayResponse
,
createPrepayRequestDto
.
getOrderExtInfoDTO
(),
createPrepayRequestDto
.
getProductOrderBean
(),
LogThreadLocal
.
getTrackingNo
());
if
(
baseEditResponse
!=
null
)
{
if
(
baseEditResponse
!=
null
)
{
throw
new
ServiceException
(
baseEditResponse
.
getCode
(),
baseEditResponse
.
getMessage
());
throw
new
ServiceException
(
baseEditResponse
.
getCode
(),
baseEditResponse
.
getMessage
());
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
View file @
c3a6cf6f
...
@@ -221,4 +221,9 @@ public class OrderExtInfoDto {
...
@@ -221,4 +221,9 @@ public class OrderExtInfoDto {
* 包装费 收费规则 1= 商品级别 2=订单级别
* 包装费 收费规则 1= 商品级别 2=订单级别
*/
*/
private
Integer
packageAmountCollectType
;
private
Integer
packageAmountCollectType
;
/**
* svc卡支付时使用的 cardCode
*/
private
String
cardCode
;
}
}
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