From de78e1c4d9e054a8a72f1786ad44eb2d39c386d8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Dec 2022 16:44:28 +0800
Subject: [PATCH] 20221221
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 4 ++--
src/main/java/cc/mrbird/febs/mall/vo/ApiMallSubsidyAmountInfoVo.java | 2 +-
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 96edc5b..02ec4c6 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -701,8 +701,8 @@
//今日补贴
BigDecimal todayAmount = this.baseMapper.selectTodayAmountByCreateTimeAndMemberId(yyyyMMddToday,member.getId());
apiMallSubsidyAmountInfoVo.setTodayAmount(todayAmount);
- //今日累计接单
- Integer todayTotalCnt = this.baseMapper.selectCountByCreateTimeAndMemberId(yyyyMMddToday,member.getId());
+ //累计接单
+ Integer todayTotalCnt = this.baseMapper.selectCountByCreateTimeAndMemberId(null,member.getId());
apiMallSubsidyAmountInfoVo.setTodayTotalCnt(todayTotalCnt);
//昨日补贴
BigDecimal yesterdayAmount = this.baseMapper.selectTodayAmountByCreateTimeAndMemberId(yyyyMMddYesterday,member.getId());
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ApiMallSubsidyAmountInfoVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ApiMallSubsidyAmountInfoVo.java
index dac1ffa..bf20e19 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/ApiMallSubsidyAmountInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/ApiMallSubsidyAmountInfoVo.java
@@ -16,7 +16,7 @@
@ApiModelProperty(value = "今日补贴")
private BigDecimal todayAmount = BigDecimal.ZERO;
- @ApiModelProperty(value = "今日累计接单")
+ @ApiModelProperty(value = "累计接单")
private Integer todayTotalCnt = 0;
@ApiModelProperty(value = "昨日补贴")
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index decccd9..db95fed 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -323,7 +323,7 @@
count(a.id)
from mall_order_info a
where
- a.status <![CDATA[>= ]]> 4
+ a.status = 4
and a.member_id = #{memberId}
<if test="createdTime != null">
and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime}
@@ -336,7 +336,7 @@
ifnull(sum(a.subsidy_amount),0)
from mall_order_info a
where
- a.status <![CDATA[>= ]]> 4
+ a.status = 4
and a.member_id = #{memberId}
<if test="createdTime != null">
and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime}
--
Gitblit v1.9.1