@@ -356,7 +356,10 @@ export default {
text-align: right;
}
.filter-input {
- width: 180px;
+ width: 150px;
+}
+.date-range-width {
+ width: 350px;
}
.overview-card--all .hint-text {
display: block;
diff --git a/backend-adminend/src/views/integral-external/user/index.vue b/backend-adminend/src/views/integral-external/user/index.vue
index ec78ca1..87303d7 100644
--- a/backend-adminend/src/views/integral-external/user/index.vue
+++ b/backend-adminend/src/views/integral-external/user/index.vue
@@ -5,7 +5,7 @@
-
+
-
+
+
+
+
+
+
-
+
搜索
重置
@@ -114,6 +127,7 @@ export default {
},
userFrom: {
keywords: '',
+ uid: null,
dateLimit: '',
page: 1,
limit: 15,
@@ -129,6 +143,7 @@ export default {
this.listLoading = true;
const params = { ...this.userFrom };
if (!params.keywords) delete params.keywords;
+ if (!params.uid) delete params.uid;
if (!params.dateLimit) delete params.dateLimit;
getExternalUserList(params)
@@ -146,7 +161,7 @@ export default {
this.getList();
},
handleReset() {
- this.userFrom = { keywords: '', dateLimit: '', page: 1, limit: 15 };
+ this.userFrom = { keywords: '', uid: null, dateLimit: '', page: 1, limit: 15 };
this.timeVal = [];
this.getList();
},
@@ -201,6 +216,9 @@ export default {
text-align: right;
}
.selWidth {
- width: 200px;
+ width: 160px;
+}
+.date-range-width {
+ width: 350px;
}
diff --git a/backend/crmeb-common/src/main/java/com/zbkj/common/request/UserSearchRequest.java b/backend/crmeb-common/src/main/java/com/zbkj/common/request/UserSearchRequest.java
index 96ecc6a..0244f23 100644
--- a/backend/crmeb-common/src/main/java/com/zbkj/common/request/UserSearchRequest.java
+++ b/backend/crmeb-common/src/main/java/com/zbkj/common/request/UserSearchRequest.java
@@ -37,6 +37,9 @@ public class UserSearchRequest implements Serializable {
@ApiModelProperty(value = "关键字")
private String keywords;
+ @ApiModelProperty(value = "用户uid")
+ private Integer uid;
+
@ApiModelProperty(value = "时间")
private String dateLimit;
diff --git a/backend/crmeb-common/src/main/java/com/zbkj/common/response/UserIntegralRecordResponse.java b/backend/crmeb-common/src/main/java/com/zbkj/common/response/UserIntegralRecordResponse.java
index 8c742d9..c265d03 100644
--- a/backend/crmeb-common/src/main/java/com/zbkj/common/response/UserIntegralRecordResponse.java
+++ b/backend/crmeb-common/src/main/java/com/zbkj/common/response/UserIntegralRecordResponse.java
@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -51,7 +52,7 @@ public class UserIntegralRecordResponse implements Serializable {
private String title;
@ApiModelProperty(value = "积分")
- private Integer integral;
+ private BigDecimal integral;
@ApiModelProperty(value = "剩余")
private Integer balance;
diff --git a/backend/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserIntegralRecordServiceImpl.java b/backend/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserIntegralRecordServiceImpl.java
index 2799ce8..a531658 100644
--- a/backend/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserIntegralRecordServiceImpl.java
+++ b/backend/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserIntegralRecordServiceImpl.java
@@ -19,9 +19,11 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.zbkj.common.utils.CrmebDateUtil;
import com.zbkj.common.vo.DateLimitUtilVo;
+import com.zbkj.common.model.consignment.WaSelfbonusLog;
import com.zbkj.common.model.user.User;
import com.zbkj.common.model.user.UserIntegralRecord;
import com.zbkj.service.dao.UserIntegralRecordDao;
+import com.zbkj.service.dao.consignment.WaSelfbonusLogDao;
import com.zbkj.service.service.UserIntegralRecordService;
import com.zbkj.service.service.UserService;
import org.slf4j.Logger;
@@ -33,7 +35,9 @@ import org.springframework.transaction.support.TransactionTemplate;
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -62,6 +66,9 @@ public class UserIntegralRecordServiceImpl extends ServiceImpl lqw = Wrappers.lambdaQuery();
lqw.select(UserIntegralRecord::getId, UserIntegralRecord::getTitle, UserIntegralRecord::getBalance, UserIntegralRecord::getIntegral,
UserIntegralRecord::getMark, UserIntegralRecord::getUid, UserIntegralRecord::getUpdateTime,
- UserIntegralRecord::getType, UserIntegralRecord::getLinkType, UserIntegralRecord::getStatus, UserIntegralRecord::getCreateTime);
+ UserIntegralRecord::getType, UserIntegralRecord::getLinkType, UserIntegralRecord::getStatus, UserIntegralRecord::getCreateTime,
+ UserIntegralRecord::getWaSelfbonusLogid);
lqw.eq(UserIntegralRecord::getStatus, IntegralRecordConstants.INTEGRAL_RECORD_STATUS_COMPLETE);
String nameKey = StrUtil.isNotBlank(request.getNickName()) ? request.getNickName() : request.getKeywords();
@@ -213,9 +221,28 @@ public class UserIntegralRecordServiceImpl extends ServiceImpl selfBonusLogIds = list.stream()
+ .map(UserIntegralRecord::getWaSelfbonusLogid)
+ .filter(ObjectUtil::isNotNull)
+ .distinct()
+ .collect(Collectors.toList());
+ Map selfBonusIntegralMap = new HashMap<>();
+ if (CollUtil.isNotEmpty(selfBonusLogIds)) {
+ waSelfbonusLogDao.selectBatchIds(selfBonusLogIds).forEach(log -> {
+ if (ObjectUtil.isNotNull(log) && ObjectUtil.isNotNull(log.getMoney())) {
+ selfBonusIntegralMap.put(log.getId(), log.getMoney().multiply(new BigDecimal("0.5")).setScale(3, RoundingMode.DOWN));
+ }
+ });
+ }
List responseList = list.stream().map(i -> {
UserIntegralRecordResponse response = new UserIntegralRecordResponse();
BeanUtils.copyProperties(i, response);
+ if (ObjectUtil.isNotNull(i.getWaSelfbonusLogid())) {
+ BigDecimal convertedIntegral = selfBonusIntegralMap.get(i.getWaSelfbonusLogid());
+ if (ObjectUtil.isNotNull(convertedIntegral)) {
+ response.setIntegral(convertedIntegral);
+ }
+ }
// 获取用户昵称
User user = userService.getById(i.getUid());
if (ObjectUtil.isNotNull(user)) {
diff --git a/backend/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java b/backend/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java
index f0b3708..f8d3eb1 100644
--- a/backend/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java
+++ b/backend/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java
@@ -142,6 +142,10 @@ public class UserServiceImpl extends ServiceImpl implements UserS
map.put("isPromoter", request.getIsPromoter() ? 1 : 0);
}
+ if (request.getUid() != null) {
+ map.put("uid", request.getUid());
+ }
+
if (StrUtil.isNotBlank(request.getGroupId())) {
List groupIdList = CrmebUtil.stringToArray(request.getGroupId());
map.put("groupIdList", groupIdList);
diff --git a/backend/crmeb-service/src/main/resources/mapper/user/UserMapper.xml b/backend/crmeb-service/src/main/resources/mapper/user/UserMapper.xml
index c6063ba..0d88ca3 100644
--- a/backend/crmeb-service/src/main/resources/mapper/user/UserMapper.xml
+++ b/backend/crmeb-service/src/main/resources/mapper/user/UserMapper.xml
@@ -29,6 +29,9 @@
and u.is_promoter = #{isPromoter}
+
+ and u.uid = #{uid}
+
and u.group_id in