From 8fad7f1e6226aad23ad4ce6505f81bf0291c9a7a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 14:32:46 +0800
Subject: [PATCH] 20210707
---
gc-user/src/main/java/com/xzx/gc/user/service/UserService.java | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
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 764f894..b22744f 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
@@ -400,38 +400,39 @@
orderStatus1.add("3");
orderStatus2.add("4");
orderStatus2.add("5");
+
orderStatus2.add("7");
for (UserModel mx : map) {
-// //推广人数(暂时没有推广关系为空)，订单数，环保金，积分
-// if (userModel.getExportFlag() == 0) {
-// //订单数
-// Integer orderNum = 0;
+ //推广人数(暂时没有推广关系为空)，订单数，环保金，积分
+ 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 ));
-// }
-//
-// }
+ List<OrderInfo> orderInfos = orderMapper.selectOrderByUserId(mx.getUserId(),6);
+ 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) {
@@ -861,7 +862,7 @@
map.put("money", DoubleUtil.roundTwo(map.get("money").toString()));
map.put("score", DoubleUtil.roundTwo(map.get("score").toString()));
map.put("weight", DoubleUtil.roundThree(map.get("weight").toString()));
- map.put("name", map.get("name").toString());
+ map.put("name", (map.get("name")==null?"":m.get("name")).toString());
map.put("createtime", map.get("createTime").toString());
}
m.put("orderList", odlist);
--
Gitblit v1.9.1