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 | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 f7a6efb..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,6 +400,7 @@
orderStatus1.add("3");
orderStatus2.add("4");
orderStatus2.add("5");
+
orderStatus2.add("7");
for (UserModel mx : map) {
@@ -407,11 +408,11 @@
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);
+// Example exampleOrder = new Example(OrderInfo.class);
+// Example.Criteria criteriaOrder = exampleOrder.createCriteria();
+// criteriaOrder.andEqualTo("userId",mx.getUserId());
+// criteriaOrder.andNotEqualTo("orderStatus",6);
+ List<OrderInfo> orderInfos = orderMapper.selectOrderByUserId(mx.getUserId(),6);
if(CollUtil.isNotEmpty(orderInfos)){
orderNum = orderNum + orderInfos.size();
}
@@ -850,6 +851,10 @@
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("money", DoubleUtil.roundTwo(map.get("money").toString()));
+// 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("status", map.get("status"));
@@ -857,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