From 32169b0b5af53ae87ccde57c31c1d6ad6e44a055 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Jul 2021 16:51:32 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-user/src/main/java/com/xzx/gc/user/service/UserService.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 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 f3f3230..ce6eb09 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
@@ -24,6 +24,8 @@
import com.xzx.gc.user.dto.AddressDto;
import com.xzx.gc.user.dto.RayaltyDto;
import com.xzx.gc.user.mapper.*;
+import com.xzx.gc.user.vo.CategaryVo;
+import com.xzx.gc.user.vo.UserIdentityVo;
import com.xzx.gc.util.DoubleUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.binary.Base64;
@@ -106,6 +108,15 @@
userInfo.setDelFlag(Constants.DEL_NOT_FLAG);
List<UserInfo> userInfo1 = userMapper.select(userInfo);
return userInfo1;
+ }
+
+ public UserIdentityVo userIdentity(String userId) {
+ AccountInfo accountInfo = accountService.findByUserIdForbidden(userId);
+
+ UserIdentityVo userIdentityVo = new UserIdentityVo();
+ userIdentityVo.setIsHead(accountInfo.getIsHead());
+
+ return userIdentityVo;
}
@@ -855,15 +866,25 @@
// map.put("weight", DoubleUtil.roundThree(map.get("weight").toString()));
// map.put("orderid", map.get("orderId").toString());
// map.put("createtime", map.get("createTime").toString());
- map.put("orderid", map.get("orderId").toString());
- map.put("address", map.get("address").toString());
+ map.put("orderid", String.valueOf(map.get("orderId")));
+ map.put("address", String.valueOf(map.get("address")));
map.put("status", map.get("status"));
map.put("type", map.get("type"));
- 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("createtime", map.get("createTime").toString());
+ map.put("money", DoubleUtil.roundTwo(String.valueOf(map.get("money"))));
+ map.put("score", DoubleUtil.roundTwo(String.valueOf(map.get("score"))));
+ map.put("weight", DoubleUtil.roundThree(String.valueOf(map.get("weight"))));
+ map.put("name", String.valueOf((ObjectUtil.isEmpty(map.get("name"))?"-":map.get("name"))));
+ map.put("createtime", String.valueOf(map.get("createTime")));
+
+ String type = String.valueOf(map.get("type"));
+ if("1".equals(type)){
+ List<CategaryVo> categaryVos = orderMapper.selectListByOrderId(String.valueOf(map.get("orderId")));
+ map.put("categary",categaryVos);
+ }
+ if("2".equals(type)){
+ List<CategaryVo> categaryVos = orderMapper.selectJHYListByOrderId(String.valueOf(map.get("orderId")));
+ map.put("categary",categaryVos);
+ }
}
m.put("orderList", odlist);
m.put("count", pageInfo.getTotal());
--
Gitblit v1.9.1