From f32cc15f60bf3b5c47267ee256a0deb3bdd01eec Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 23 四月 2020 14:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
index 0cdc1d6..3272ee6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
@@ -10,7 +10,6 @@
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.mybatis.HongBaoV2CountMapper;
-import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.vo.order.HongBaoV2VO;
@@ -158,8 +157,8 @@
@Override
- public long counOrderByUidAndOrderType(Long uid, BigDecimal payment,int type) {
- Long count = hongBaoV2CountMapper.counOrderByUidAndOrderType(uid, payment, type);
+ public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment) {
+ Long count = hongBaoV2CountMapper.countMyDirectOrderByCashArrival(uid, payment);
if (count == null) {
count = 0L;
}
--
Gitblit v1.8.0