From 46dc84c9fb9aa7a53ff1c2479de66275115b0b87 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 11:22:44 +0800
Subject: [PATCH] 20210707
---
gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java | 18 ++++----
gc-user/src/main/java/com/xzx/gc/user/service/UserService.java | 58 ++++++++++++++--------------
2 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java b/gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java
index 71e7cba..99ca15e 100644
--- a/gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java
+++ b/gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java
@@ -78,18 +78,18 @@
* 登陆时间
*/
String loginTime;
- @ApiModelProperty("推广人数")
- Integer extensionNum;
- @ApiModelProperty("订单数")
- Integer allOrderNum;
- @ApiModelProperty("环保金")
- BigDecimal money;
- @ApiModelProperty("积分数")
- BigDecimal collectScore;
+// @ApiModelProperty("推广人数")
+// Integer extensionNum;
+// @ApiModelProperty("订单数")
+// Integer allOrderNum;
+// @ApiModelProperty("环保金")
+// BigDecimal money;
+// @ApiModelProperty("积分数")
+// BigDecimal collectScore;
@ApiModelProperty("1:已删除 0：未删除")
String delFlag;
- @ApiModelProperty("1:已删除 0：未删除")
+// @ApiModelProperty("1:已删除 0：未删除")
Integer orderStatus3;
Integer orderStatus5;
//入库重量
diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java b/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java
index e429360..f94c4d1 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java
@@ -403,35 +403,35 @@
orderStatus2.add("7");
for (UserModel mx : map) {
- //推广人数(暂时没有推广关系为空)，订单数，环保金，积分
- if (userModel.getExportFlag() == 0) {
- //订单数
- Integer orderNum = 0;
- Example exampleOrder = new Example(OrderInfo.class);
- Example.Criteria criteriaOrder = exampleOrder.createCriteria();
- criteriaOrder.andEqualTo("userId",mx.getUserId());
- criteriaOrder.andNotEqualTo("orderStatus",6);
- List<OrderInfo> orderInfos = orderMapper.selectByExample(exampleOrder);
- if(CollUtil.isNotEmpty(orderInfos)){
- orderNum = orderNum + orderInfos.size();
- }
-
- List<JhyOrder> jhyOrders = orderMapper.selectJhyOrderByUserId(mx.getUserId());
- if(CollUtil.isNotEmpty(jhyOrders)){
- orderNum = orderNum + jhyOrders.size();
- }
- mx.setAllOrderNum(orderNum);
- //环保金，积分
- AccountInfo accountInfo = accountService.findByUserId(mx.getUserId());
- if(ObjectUtil.isNotEmpty(accountInfo)){
- String money = accountInfo.getMoney();
- mx.setMoney(new BigDecimal(StrUtil.isEmpty(money) ? "0" : money).setScale( 2, BigDecimal.ROUND_DOWN ));
-
- String collectScore = StrUtil.isEmpty(accountInfo.getCollectScore()) ? "0":accountInfo.getCollectScore();
- mx.setCollectScore(new BigDecimal(collectScore).setScale( 2, BigDecimal.ROUND_DOWN ));
- }
-
- }
+// //推广人数(暂时没有推广关系为空)，订单数，环保金，积分
+// if (userModel.getExportFlag() == 0) {
+// //订单数
+// Integer orderNum = 0;
+// Example exampleOrder = new Example(OrderInfo.class);
+// Example.Criteria criteriaOrder = exampleOrder.createCriteria();
+// criteriaOrder.andEqualTo("userId",mx.getUserId());
+// criteriaOrder.andNotEqualTo("orderStatus",6);
+// List<OrderInfo> orderInfos = orderMapper.selectByExample(exampleOrder);
+// if(CollUtil.isNotEmpty(orderInfos)){
+// orderNum = orderNum + orderInfos.size();
+// }
+//
+// List<JhyOrder> jhyOrders = orderMapper.selectJhyOrderByUserId(mx.getUserId());
+// if(CollUtil.isNotEmpty(jhyOrders)){
+// orderNum = orderNum + jhyOrders.size();
+// }
+// mx.setAllOrderNum(orderNum);
+// //环保金，积分
+// AccountInfo accountInfo = accountService.findByUserId(mx.getUserId());
+// if(ObjectUtil.isNotEmpty(accountInfo)){
+// String money = accountInfo.getMoney();
+// mx.setMoney(new BigDecimal(StrUtil.isEmpty(money) ? "0" : money).setScale( 2, BigDecimal.ROUND_DOWN ));
+//
+// String collectScore = StrUtil.isEmpty(accountInfo.getCollectScore()) ? "0":accountInfo.getCollectScore();
+// mx.setCollectScore(new BigDecimal(collectScore).setScale( 2, BigDecimal.ROUND_DOWN ));
+// }
+//
+// }
//设置登录时间
if (userModel.getExportFlag() == 0) {
--
Gitblit v1.9.1