From 7684b1d3c0ff74401977b2e3322f490bc6fb4c08 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 22 Dec 2020 19:50:51 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java | 2
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 18 +++++----
zq-erp/src/main/java/com/matrix/system/app/vo/UserAchieveVo.java | 63 ++++++++++++++++++-------------
3 files changed, 48 insertions(+), 35 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
index 36a6899..e517a1f 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
@@ -26,7 +26,7 @@
private AchieveNewService achieveNewService;
- @ApiOperation(value = "获取用户业绩接口 type 1-今日 2-昨天 3-本月 4-上月")
+ @ApiOperation(value = "个人中心--获取用户业绩接口 type 1-今日 2-昨天 3-本月 4-上月")
@ApiResponses({
@ApiResponse(code = 200, message = "ok", response = UserAchieveVo.class)
})
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/UserAchieveVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/UserAchieveVo.java
index 71cd735..0c98178 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/UserAchieveVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/UserAchieveVo.java
@@ -12,54 +12,65 @@
@ApiModel(value = "UserAchieveVo", description = "员工业绩返回类")
public class UserAchieveVo {
- @ApiModelProperty(value = "总现金业绩")
- private BigDecimal allCash;
+ @ApiModelProperty(value = "用户ID")
+ private Long id;
- @ApiModelProperty(value = "售卡业绩")
- private BigDecimal card;
+ @ApiModelProperty(value = "订单业绩")
+ private BigDecimal orderCash;
- @ApiModelProperty(value = "项目业绩")
- private BigDecimal project;
+ @ApiModelProperty(value = "现金业绩")
+ private BigDecimal cash;
- @ApiModelProperty(value = "产品业绩")
- private BigDecimal product;
-
- @ApiModelProperty(value = "余额划扣业绩")
+ @ApiModelProperty(value = "划扣业绩")
private BigDecimal cardUse;
+
+ @ApiModelProperty(value = "本金消耗")
+ private BigDecimal hisConsume;
+
+ @ApiModelProperty(value = "赠送消耗")
+ private BigDecimal freeConsume;
@ApiModelProperty(value = "服务提成")
private BigDecimal projCommission;
- public BigDecimal getAllCash() {
- return allCash;
+ public Long getId() {
+ return id;
}
- public void setAllCash(BigDecimal allCash) {
- this.allCash = allCash;
+ public void setId(Long id) {
+ this.id = id;
}
- public BigDecimal getCard() {
- return card;
+ public BigDecimal getOrderCash() {
+ return orderCash;
}
- public void setCard(BigDecimal card) {
- this.card = card;
+ public void setOrderCash(BigDecimal orderCash) {
+ this.orderCash = orderCash;
}
- public BigDecimal getProject() {
- return project;
+ public BigDecimal getCash() {
+ return cash;
}
- public void setProject(BigDecimal project) {
- this.project = project;
+ public void setCash(BigDecimal cash) {
+ this.cash = cash;
}
- public BigDecimal getProduct() {
- return product;
+ public BigDecimal getHisConsume() {
+ return hisConsume;
}
- public void setProduct(BigDecimal product) {
- this.product = product;
+ public void setHisConsume(BigDecimal hisConsume) {
+ this.hisConsume = hisConsume;
+ }
+
+ public BigDecimal getFreeConsume() {
+ return freeConsume;
+ }
+
+ public void setFreeConsume(BigDecimal freeConsume) {
+ this.freeConsume = freeConsume;
}
public BigDecimal getCardUse() {
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
index 9eb3473..ebe9c0b 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -927,14 +927,16 @@
<select id="selectUserAchieveByTime" resultType="com.matrix.system.app.vo.UserAchieveVo">
select
- sum(IFNULL(proj_cash,0) + IFNULL(goods_cash,0) + IFNULL(card_cash,0)) allCash,
- sum(card_cash) card,
- sum(proj_cash) project,
- sum(goods_cash) product,
- sum(consume) cardUse,
- sum(proj_percentage) projCommission
- from achieve_new
+ sale_id id,
+ sum(IFNULL(proj_cash,0) + IFNULL(goods_cash,0) + IFNULL(card_cash,0) + IFNULL(consume, 0) + IFNULL(b.arrears, 0)) orderCash,
+ sum(IFNULL(proj_cash,0) + IFNULL(goods_cash,0) + IFNULL(card_cash,0) + IFNULL(b.arrears, 0)) cash,
+ sum(IFNULL(consume, 0)) cardUse,
+ sum(IFNULL(his_consume, 0)) hisConsume,
+ sum(IFNULL(free_consume, 0)) freeConsume,
+ sum(IFNULL(proj_percentage, 0)) projCommission
+ from achieve_new a
+ left join sys_order b on a.sale_id=b.STAFF_ID and (date_format(b.ORDER_TIME, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') >= date_format(b.ORDER_TIME, '%Y-%m-%d'))
where sale_id=#{userId}
- and (date_format(datatime, "%Y-%m-%d") >= #{startTime} or #{endTime} >= date_format(datatime, "%Y-%m-%d"))
+ and (date_format(datatime, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') >= date_format(datatime, '%Y-%m-%d'))
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1