Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
b1e45338
Commit
b1e45338
authored
Nov 25, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
后台修改用户会员记录
parent
2ddebc2d
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
123 additions
and
0 deletions
+123
-0
QueryCriteria.java
...main/java/com/xxfc/platform/order/pojo/QueryCriteria.java
+39
-0
BaseOrderBiz.java
...c/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
+7
-0
TotalPerformanceBiz.java
...java/com/xxfc/platform/order/biz/TotalPerformanceBiz.java
+23
-0
BaseOrderMapper.java
.../java/com/xxfc/platform/order/mapper/BaseOrderMapper.java
+2
-0
TotalPerformanceStatementController.java
.../rest/background/TotalPerformanceStatementController.java
+27
-0
BaseOrderMapper.xml
...rder-server/src/main/resources/mapper/BaseOrderMapper.xml
+25
-0
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/QueryCriteria.java
0 → 100644
View file @
b1e45338
package
com
.
xxfc
.
platform
.
order
.
pojo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.util.Date
;
/**
* 总业绩查询条件
* @author Administrator
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel
public
class
QueryCriteria
{
@ApiModelProperty
(
value
=
"开始时间"
)
private
Date
startDate
;
@ApiModelProperty
(
value
=
"结束时间"
)
private
Date
endDate
;
@ApiModelProperty
(
value
=
"订单类型:1-租车 2-旅游 3-会员 null-全部"
)
private
Integer
orderType
;
@ApiModelProperty
(
value
=
"业绩所属公司"
)
private
Integer
companyId
;
@ApiModelProperty
(
value
=
"支付方式: 1-微信支付 2-支付宝支付 3-银联支付 null-全部"
)
private
Integer
paymentMethod
;
@ApiModelProperty
(
value
=
"账目类型: 0-入账 1-出账"
)
private
Integer
type
=
0
;
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
View file @
b1e45338
...
...
@@ -26,6 +26,7 @@ import com.xxfc.platform.order.contant.enumerate.*;
import
com.xxfc.platform.order.entity.*
;
import
com.xxfc.platform.order.mapper.BaseOrderMapper
;
import
com.xxfc.platform.order.pojo.DedDetailDTO
;
import
com.xxfc.platform.order.pojo.QueryCriteria
;
import
com.xxfc.platform.order.pojo.account.OrderAccountDetail
;
import
com.xxfc.platform.order.pojo.calculate.InProgressVO
;
import
com.xxfc.platform.order.pojo.dto.MemberOrderBo
;
...
...
@@ -886,6 +887,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
return
userFeign
;
}
/**
* 订单查询类
*/
...
...
@@ -908,4 +911,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
return
Lists
.
newArrayList
();
}
public
void
selectTotalStatistical
(
QueryCriteria
queryCriteria
)
{
mapper
.
selectTotalStatistical
(
queryCriteria
);
}
}
\ No newline at end of file
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/TotalPerformanceBiz.java
0 → 100644
View file @
b1e45338
package
com
.
xxfc
.
platform
.
order
.
biz
;
import
com.xxfc.platform.order.pojo.QueryCriteria
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
/**
* 总业绩报表service层
*
* @author Administrator
*/
@Service
@RequiredArgsConstructor
(
onConstructor
=
@__
(
@Autowired
))
public
class
TotalPerformanceBiz
{
private
final
BaseOrderBiz
baseOrderBiz
;
private
final
OrderAccountBiz
accountBiz
;
public
void
statisticalData
(
QueryCriteria
queryCriteria
)
{
baseOrderBiz
.
selectTotalStatistical
(
queryCriteria
);
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java
View file @
b1e45338
package
com
.
xxfc
.
platform
.
order
.
mapper
;
import
com.xxfc.platform.order.entity.BaseOrder
;
import
com.xxfc.platform.order.pojo.QueryCriteria
;
import
com.xxfc.platform.order.pojo.bg.BgOrderListVo
;
import
com.xxfc.platform.order.pojo.dto.MemberOrderBo
;
import
com.xxfc.platform.order.pojo.dto.MemberOrderFindDTO
;
...
...
@@ -39,4 +40,5 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
public
List
<
BgOrderListVo
>
getAllOrderList
(
Map
<
String
,
Object
>
paramMap
);
void
selectTotalStatistical
(
QueryCriteria
queryCriteria
);
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/TotalPerformanceStatementController.java
0 → 100644
View file @
b1e45338
package
com
.
xxfc
.
platform
.
order
.
rest
.
background
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.rest.CommonBaseController
;
import
com.xxfc.platform.order.biz.TotalPerformanceBiz
;
import
com.xxfc.platform.order.pojo.QueryCriteria
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
/**
* 总业绩报表
* @author Administrator
*/
@RestController
()
@RequestMapping
(
"/reportForm"
)
@RequiredArgsConstructor
(
onConstructor
=
@__
(
@Autowired
))
public
class
TotalPerformanceStatementController
extends
CommonBaseController
{
private
final
TotalPerformanceBiz
totalPerformanceBiz
;
@RequestMapping
()
public
ObjectRestResponse
statisticalData
(
QueryCriteria
queryCriteria
){
totalPerformanceBiz
.
statisticalData
(
queryCriteria
);
}
}
xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
View file @
b1e45338
...
...
@@ -410,4 +410,29 @@
) AS `omd` ON omd.order_id=bo.id
ORDER BY bo.`creatTime` DESC
</select>
@ApiModelProperty(value ="开始时间" )
private Date startDate;
@ApiModelProperty(value = "结束时间")
private Date endDate;
@ApiModelProperty(value = "订单类型:1-租车 2-旅游 3-会员 null-全部")
private Integer orderType;
@ApiModelProperty(value = "业绩所属公司")
private Integer companyId;
@ApiModelProperty(value = "支付方式: 1-微信支付 2-支付宝支付 3-银联支付 null-全部")
private Integer paymentMethod;
@ApiModelProperty(value = "账目类型: 0-入账 1-出账")
private Integer type = 0;
<select
id=
"selectTotalStatistical"
parameterType=
"com.xxfc.platform.order.pojo.QueryCriteria"
resultType=
""
>
select * from base_order
<where>
</where>
</select>
</mapper>
\ No newline at end of file
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