From ff97c9b2c1028b2d03e83bfc4f05629968bb22ed Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 08 Dec 2021 11:20:59 +0800
Subject: [PATCH] fix
---
gc-user/src/main/java/com/xzx/gc/user/service/UserService.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 5d897d2..3789202 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
@@ -23,8 +23,10 @@
import com.xzx.gc.model.user.*;
import com.xzx.gc.user.dto.AddressDto;
import com.xzx.gc.user.dto.RayaltyDto;
+import com.xzx.gc.user.dto.TgmxInfoListDto;
import com.xzx.gc.user.mapper.*;
import com.xzx.gc.user.vo.CategaryVo;
+import com.xzx.gc.user.vo.TgmxInfoListVo;
import com.xzx.gc.user.vo.UserIdentityVo;
import com.xzx.gc.util.DoubleUtil;
import lombok.extern.slf4j.Slf4j;
@@ -467,9 +469,11 @@
mx.setNickName(com.xzx.gc.common.utils.StringUtils.decode(mx.getNickName()));
}
// 待完成订单总数
- Map<String, Object> osMap = orderMapper.queryCuserOrderByUserIdCount1(mx.getUserId());
- mx.setOrderStatus3(Integer.parseInt(osMap.get("count1").toString()));
- mx.setOrderStatus5(Integer.parseInt(osMap.get("count").toString()));
+// Map<String, Object> osMap = orderMapper.queryCuserOrderByUserIdCount1(mx.getUserId());
+ Map<String, Object> orderIng = orderMapper.queryCuserOrderByUserIdOrderIng(mx.getUserId());
+ Map<String, Object> orderDone = orderMapper.queryCuserOrderByUserIdOrderDone(mx.getUserId());
+ mx.setOrderStatus3(Integer.parseInt(orderIng.get("count").toString()));
+ mx.setOrderStatus5(Integer.parseInt(orderDone.get("count").toString()));
//查询用户首次下单时间和最近下单时间
List<OrderInfo> byCreateUserId = orderService.findByCreateUserId(mx.getUserId(), null);
@@ -904,4 +908,15 @@
userMapper.insertSelective(userInfo);
}
+ public Map<String, Object> tgmxInfo(TgmxInfoListDto model) {
+ PageHelper.startPage(model.getPage(), model.getLimit());
+ List<TgmxInfoListVo> maps = userMapper.tgmxInfo(model);
+ PageInfo pageInfo = new PageInfo(maps);
+ int count = Convert.toInt(pageInfo.getTotal());
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", maps);
+ map.put("count", count);
+ map.put("code", 0);
+ return map;
+ }
}
--
Gitblit v1.9.1