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
843cb081
Commit
843cb081
authored
Oct 18, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增百旺二期开发 接口对接
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
2c428293
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
67 additions
and
0 deletions
+67
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderInvoiceAdapter.java
+10
-0
order-application-service/src/main/java/cn/freemud/entities/dto/order/OrderInvoiceResponse.java
+3
-0
order-application-service/src/main/java/cn/freemud/entities/dto/pay/InvoiceCreateRequest.java
+22
-0
order-application-service/src/main/java/cn/freemud/enums/OrderInvoiceConfigEnum.java
+32
-0
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderInvoiceAdapter.java
View file @
843cb081
...
...
@@ -11,6 +11,7 @@ import cn.freemud.entities.dto.pay.OrderInvoiceRequest;
import
cn.freemud.entities.dto.pay.QueryInvoiceByCodesRequest
;
import
cn.freemud.entities.vo.order.CreateOrderInvoiceRequest
;
import
cn.freemud.enums.InvoiceTypeCodeEnum
;
import
cn.freemud.enums.OrderInvoiceConfigEnum
;
import
cn.freemud.enums.OrderStatus
;
import
cn.freemud.enums.ResponseResult
;
import
cn.freemud.service.thirdparty.OrderServiceClient
;
...
...
@@ -161,6 +162,15 @@ public class OrderInvoiceAdapter {
invoiceDetailRequest
.
setGoodsTotalTax
(
goodsTotalTax
);
productDetailList
.
add
(
invoiceDetailRequest
);
request
.
setProductDetailList
(
productDetailList
);
// fisherman 新增缺少字段
request
.
setAppKey
(
orderInvoiceConfig
.
getAppKey
());
request
.
setAppSercret
(
orderInvoiceConfig
.
getAppSercret
());
// 百旺云
request
.
setClientCode
(
OrderInvoiceConfigEnum
.
getClientCode
(
orderInvoiceConfig
.
getChannelType
()));
request
.
setSalt
(
orderInvoiceConfig
.
getSalt
());
request
.
setTaxNo
(
orderInvoiceConfig
.
getTaxNo
());
request
.
setUserName
(
orderInvoiceConfig
.
getUserName
());
request
.
setPassword
(
orderInvoiceConfig
.
getPassword
());
return
request
;
}
...
...
order-application-service/src/main/java/cn/freemud/entities/dto/order/OrderInvoiceResponse.java
View file @
843cb081
...
...
@@ -36,6 +36,9 @@ public class OrderInvoiceResponse {
@ApiModelProperty
(
"userName"
)
private
String
userName
;
@ApiModelProperty
(
"password"
)
private
String
password
;
@ApiModelProperty
(
"盐值,加密盐"
)
private
String
salt
;
...
...
order-application-service/src/main/java/cn/freemud/entities/dto/pay/InvoiceCreateRequest.java
View file @
843cb081
...
...
@@ -41,4 +41,26 @@ public class InvoiceCreateRequest {
@ApiModelProperty
(
value
=
"发票明细"
)
private
List
<
InvoiceProductDetailRequest
>
productDetailList
;
@ApiModelProperty
(
"appKey"
)
private
String
appKey
;
@ApiModelProperty
(
"appSercret"
)
private
String
appSercret
;
@ApiModelProperty
(
"clientCode"
)
private
String
clientCode
;
@ApiModelProperty
(
"盐值,加密盐"
)
private
String
salt
;
@ApiModelProperty
(
"税号"
)
private
String
taxNo
;
@ApiModelProperty
(
"userName"
)
private
String
userName
;
@ApiModelProperty
(
"password"
)
private
String
password
;
}
order-application-service/src/main/java/cn/freemud/enums/OrderInvoiceConfigEnum.java
0 → 100644
View file @
843cb081
package
cn
.
freemud
.
enums
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
import
java.util.Arrays
;
/**
* @author : xh.Z
* @email : fisherman0510@163.com
* @Date : 2021/10/18 下午6:17
* @description : 发票配置 渠道映射关系
*/
@AllArgsConstructor
@Getter
public
enum
OrderInvoiceConfigEnum
{
/**
* 百旺云渠道类型
*/
BAIWANGYUN
(
"baiwangyun"
,
"10990"
);
private
String
channelType
;
private
String
clientCode
;
public
static
String
getClientCode
(
String
channelType
)
{
OrderInvoiceConfigEnum
orderInvoiceConfigEnum
=
Arrays
.
stream
(
OrderInvoiceConfigEnum
.
values
())
.
filter
(
e
->
e
.
getChannelType
().
equals
(
channelType
))
.
findFirst
()
.
orElseGet
(()
->
BAIWANGYUN
);
return
orderInvoiceConfigEnum
.
getClientCode
();
}
}
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