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
c0058797
Commit
c0058797
authored
Nov 08, 2021
by
陈斌
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update3
parent
64325305
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
79 additions
and
0 deletions
+79
-0
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
+13
-0
order-application-service/src/main/java/cn/freemud/entities/dto/order/OrderInvoiceConfigVo.java
+18
-0
order-application-service/src/main/java/cn/freemud/entities/vo/order/GetInvoiceConfigRequest.java
+20
-0
order-application-service/src/main/java/cn/freemud/service/Orderservice.java
+4
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+24
-0
No files found.
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
View file @
c0058797
...
@@ -16,12 +16,14 @@ import cn.freemud.annotations.IsConvertEN;
...
@@ -16,12 +16,14 @@ import cn.freemud.annotations.IsConvertEN;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.entities.dto.order.CreateCashierOrderDto
;
import
cn.freemud.entities.dto.order.CreateCashierOrderDto
;
import
cn.freemud.entities.dto.order.InvoiceCreateResponseVo
;
import
cn.freemud.entities.dto.order.InvoiceCreateResponseVo
;
import
cn.freemud.entities.dto.order.OrderInvoiceConfigVo
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.encircle.CreateReserveOrderVo
;
import
cn.freemud.entities.vo.encircle.CreateReserveOrderVo
;
import
cn.freemud.entities.vo.encircle.EncircleReserveBaseVo
;
import
cn.freemud.entities.vo.encircle.EncircleReserveBaseVo
;
import
cn.freemud.entities.vo.order.CreateCashierOrderVo
;
import
cn.freemud.entities.vo.order.CreateCashierOrderVo
;
import
cn.freemud.entities.vo.order.CreateOrderInvoiceRequest
;
import
cn.freemud.entities.vo.order.CreateOrderInvoiceRequest
;
import
cn.freemud.entities.vo.order.OrderAppealVo
;
import
cn.freemud.entities.vo.order.OrderAppealVo
;
import
cn.freemud.entities.vo.order.GetInvoiceConfigRequest
;
import
cn.freemud.handler.OrderReportJobHandler
;
import
cn.freemud.handler.OrderReportJobHandler
;
import
cn.freemud.monitorcenter.tools.HealthUtil
;
import
cn.freemud.monitorcenter.tools.HealthUtil
;
import
cn.freemud.service.*
;
import
cn.freemud.service.*
;
...
@@ -481,5 +483,16 @@ public class OrderController {
...
@@ -481,5 +483,16 @@ public class OrderController {
return
orderservice
.
createAndGetOrderInvoice
(
request
);
return
orderservice
.
createAndGetOrderInvoice
(
request
);
}
}
/**
* 查询发票配置
* @param
* @return
*/
@ApiAnnotation
(
logMessage
=
"queryInvoiceConfig"
)
@PostMapping
(
"/queryInvoiceConfig"
)
public
BaseResponse
<
OrderInvoiceConfigVo
>
queryInvoiceConfig
(
@Validated
@LogParams
@RequestBody
GetInvoiceConfigRequest
request
)
{
return
orderservice
.
queryInvoiceConfig
(
request
);
}
}
}
order-application-service/src/main/java/cn/freemud/entities/dto/order/OrderInvoiceConfigVo.java
0 → 100644
View file @
c0058797
package
cn
.
freemud
.
entities
.
dto
.
order
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
public
class
OrderInvoiceConfigVo
{
@ApiModelProperty
(
"商户号"
)
private
String
partnerId
;
@ApiModelProperty
(
"发票说明"
)
private
String
remark
;
@ApiModelProperty
(
"状态 0启用 1禁用"
)
private
Integer
state
;
}
order-application-service/src/main/java/cn/freemud/entities/vo/order/GetInvoiceConfigRequest.java
0 → 100644
View file @
c0058797
package
cn
.
freemud
.
entities
.
vo
.
order
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.validation.constraints.NotEmpty
;
@Data
public
class
GetInvoiceConfigRequest
{
@ApiModelProperty
(
"会话Id"
)
@NotEmpty
(
message
=
"会话Id不能为空"
)
private
String
sessionId
;
@ApiModelProperty
(
"商户号"
)
@NotEmpty
(
message
=
"商户号不能为空"
)
private
String
partnerId
;
}
order-application-service/src/main/java/cn/freemud/service/Orderservice.java
View file @
c0058797
...
@@ -2,8 +2,10 @@ package cn.freemud.service;
...
@@ -2,8 +2,10 @@ package cn.freemud.service;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.entities.dto.ConfirmOrderDto
;
import
cn.freemud.entities.dto.ConfirmOrderDto
;
import
cn.freemud.entities.dto.order.OrderInvoiceConfigVo
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.order.CreateOrderInvoiceRequest
;
import
cn.freemud.entities.vo.order.CreateOrderInvoiceRequest
;
import
cn.freemud.entities.vo.order.GetInvoiceConfigRequest
;
import
cn.freemud.entities.vo.order.OrderAppealVo
;
import
cn.freemud.entities.vo.order.OrderAppealVo
;
import
com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1
;
import
com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1
;
import
com.freemud.application.sdk.api.ordercenter.response.OrderCountResp
;
import
com.freemud.application.sdk.api.ordercenter.response.OrderCountResp
;
...
@@ -200,4 +202,6 @@ public interface Orderservice extends OrderFactoryService{
...
@@ -200,4 +202,6 @@ public interface Orderservice extends OrderFactoryService{
BaseResponse
createAndGetOrderInvoice
(
CreateOrderInvoiceRequest
request
);
BaseResponse
createAndGetOrderInvoice
(
CreateOrderInvoiceRequest
request
);
BaseResponse
<
OrderInvoiceConfigVo
>
queryInvoiceConfig
(
GetInvoiceConfigRequest
request
);
}
}
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
c0058797
...
@@ -39,6 +39,7 @@ import cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto;
...
@@ -39,6 +39,7 @@ import cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto;
import
cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto
;
import
cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.order.CreateOrderInvoiceRequest
;
import
cn.freemud.entities.vo.order.CreateOrderInvoiceRequest
;
import
cn.freemud.entities.vo.order.GetInvoiceConfigRequest
;
import
cn.freemud.entities.vo.order.OrderAppealVo
;
import
cn.freemud.entities.vo.order.OrderAppealVo
;
import
cn.freemud.entities.vo.order.QueryOrderAppealResponseVo
;
import
cn.freemud.entities.vo.order.QueryOrderAppealResponseVo
;
import
cn.freemud.enums.OrderType
;
import
cn.freemud.enums.OrderType
;
...
@@ -3449,6 +3450,29 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -3449,6 +3450,29 @@ public class OrderServiceImpl implements Orderservice {
return
ResponseUtil
.
success
(
responseVo
);
return
ResponseUtil
.
success
(
responseVo
);
}
}
@Override
public
BaseResponse
<
OrderInvoiceConfigVo
>
queryInvoiceConfig
(
GetInvoiceConfigRequest
request
){
AssortmentCustomerInfoVo
userLoginInfoDto
=
customerInfoManager
.
getCustomerInfoByObject
(
request
.
getSessionId
());
if
(
userLoginInfoDto
==
null
||
StringUtils
.
isEmpty
(
userLoginInfoDto
.
getMemberId
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
NOT_LOGIN
);
}
// 查询发票配置
QueryInvoiceConfigRequest
configRequest
=
new
QueryInvoiceConfigRequest
();
configRequest
.
setPartnerId
(
request
.
getPartnerId
());
BaseResponse
<
OrderInvoiceResponse
>
orderInvoiceConfigResponse
=
microOpenplatformClient
.
QueryInvoiceConfigByPartnerId
(
configRequest
);
if
(!
Objects
.
equals
(
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
,
orderInvoiceConfigResponse
.
getCode
()))
{
return
ResponseUtil
.
error
(
orderInvoiceConfigResponse
.
getCode
(),
orderInvoiceConfigResponse
.
getMessage
());
}
OrderInvoiceResponse
orderInvoiceConfig
=
orderInvoiceConfigResponse
.
getResult
();
if
(
null
==
orderInvoiceConfig
)
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_INVOICE_CONFIG_IS_NULL
);
}
OrderInvoiceConfigVo
configVo
=
new
OrderInvoiceConfigVo
();
BeanUtil
.
convertBean
(
orderInvoiceConfig
,
configVo
);
return
ResponseUtil
.
success
(
configVo
);
}
/**
/**
* 标准点餐参数校验
* 标准点餐参数校验
*
*
...
...
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