From 0ee32743618b87562571f4e3df60fdc9742736b8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 11:09:19 +0800
Subject: [PATCH] 20210707
---
gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java | 1 -
gc-user/src/main/java/com/xzx/gc/user/service/UserService.java | 16 ++++++++++------
gc-user/src/main/resources/mapper/user/OrderMapper.xml | 8 +-------
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java b/gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java
index 48790e2..45fbe44 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java
@@ -467,7 +467,6 @@
@ApiImplicitParam(paramType="query", name = "userType", value = "用户类型(1为普通用户,2为回收员,3为代丢员,4入库员,5运营员)", required = true, dataType = "String"),
@ApiImplicitParam(paramType="query", name = "mobilePhone", value = "手机号", required = true, dataType = "String")
})
-// @ApiResponses({@ApiResponse( code = 200, message = "success", response = UserModel.class)})
public JsonResult<Map<String, Object>> queryUserApiList(@RequestBody UserModel userModel){
Map<String, Object> map = userService.queryCuserForTimeList(userModel);
return JsonResult.success(map);
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 f7a6efb..e429360 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
@@ -850,15 +850,19 @@
List<Map<String, Object>> odlist = orderMapper.queryCuserOrderFinishList(userId, x);
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(odlist);
for (Map<String, Object> map : odlist) {
- map.put("orderid", map.get("orderId").toString());
- map.put("address", map.get("address").toString());
- 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("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("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());
}
m.put("orderList", odlist);
m.put("count", pageInfo.getTotal());
diff --git a/gc-user/src/main/resources/mapper/user/OrderMapper.xml b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
index 70cd892..74ceced 100644
--- a/gc-user/src/main/resources/mapper/user/OrderMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
@@ -308,13 +308,7 @@
</select>
<select id="queryCuserOrderFinishList" resultType="java.util.HashMap">
- SELECT a.order_id as orderId,
- sum(d.money) as money,
- a.address as address,
- a.order_type as orderType,
- sum(d.weight) as weight,
- a.create_time as createTime
- FROM
+ SELECT a.order_id as orderId, sum(d.money) as money,sum(d.weight) as weight,a.create_time as createTime FROM
xzx_order_info a
LEFT JOIN xzx_order_item_info d on a.order_id = d.order_id
WHERE a.create_user_id=#{userId}
--
Gitblit v1.9.1