From 8d08ca6bdfc3dd61b0aaa7daa27308c3d59f0df1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Jul 2021 15:03:11 +0800
Subject: [PATCH] 202107014
---
gc-user/src/main/java/com/xzx/gc/user/service/UserService.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 b172628..b783a35 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,7 @@
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.util.DoubleUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.binary.Base64;
@@ -862,9 +863,18 @@
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"))?"-":m.get("name"))));
+ 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