From 8b3c82c0788e23acd889e6f67a91c855693352fd Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 13 五月 2020 16:38:29 +0800
Subject: [PATCH] 团队分红统计
---
fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java b/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java
index ffafaaf..3dd53e0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.dao.user.invite;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -37,10 +38,10 @@
update.set("stateValid", record.getStateValid());
if (record.getTaobaoBind() != null)
update.set("taobaoBind", record.getTaobaoBind());
- if (record.getWeixinBind() != null)
- update.set("weixinBind", record.getWeixinBind());
if (record.getWeixinId() != null)
update.set("weixinId", record.getWeixinId());
+ if (record.getWeixinIdExist() != null)
+ update.set("weixinIdExist", record.getWeixinIdExist());
if (record.getPhone() != null)
update.set("phone", record.getPhone());
if (record.getPhoneOpen() != null)
@@ -120,7 +121,7 @@
list.add(Criteria.where("taobaoBind").is(focusDTO.getTaobaoBind()));
if (focusDTO.getWeixinBind() != null)
- list.add(Criteria.where("weixinBind").is(focusDTO.getWeixinBind()));
+ list.add(Criteria.where("weixinIdExist").is(focusDTO.getWeixinBind()));
if (!StringUtil.isNullOrEmpty(focusDTO.getLevel()))
list.add(Criteria.where("level").is(focusDTO.getLevel()));
@@ -143,11 +144,16 @@
if (!StringUtil.isNullOrEmpty(focusDTO.getMaxActiveTime()))
list.add(Criteria.where("activeTime").lte(focusDTO.getMaxActiveTime()));
- if (focusDTO.getMinIncome() != null)
- list.add(Criteria.where("income").gte(focusDTO.getMinIncome()));
+ if (focusDTO.getMinIncome() != null) {
+ int income = focusDTO.getMinIncome().multiply(BigDecimal.valueOf(100)).setScale(2, BigDecimal.ROUND_DOWN).intValue();
+ list.add(Criteria.where("income").lte(income));
+ }
- if (focusDTO.getMaxIncome() != null)
- list.add(Criteria.where("income").lte(focusDTO.getMaxIncome()));
+ if (focusDTO.getMaxIncome() != null) {
+ int income = focusDTO.getMaxIncome().multiply(BigDecimal.valueOf(100)).setScale(2, BigDecimal.ROUND_DOWN).intValue();
+ list.add(Criteria.where("income").lte(income));
+ }
+
if (!StringUtil.isNullOrEmpty(focusDTO.getKey())) {
if (type == 1) {
--
Gitblit v1.8.0