From dc3beb5e2c9c62bfc40330201ace94f781d28fd2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 14:11:28 +0800
Subject: [PATCH] 20210707
---
gc-user/src/main/java/com/xzx/gc/user/service/UserService.java | 11 ++++++-----
gc-user/src/main/resources/mapper/user/OrderMapper.xml | 10 ++++++++++
gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java | 1 +
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java b/gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java
index c4e82c9..c972db9 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java
@@ -59,5 +59,6 @@
List<JhyOrder> selectJhyOrderByUserId(@Param("userId")String userId);
+ List<OrderInfo> selectOrderByUserId(String userId, int i);
}
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 b8bea3a..f3f3230 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();
}
diff --git a/gc-user/src/main/resources/mapper/user/OrderMapper.xml b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
index bfd5802..c449fc1 100644
--- a/gc-user/src/main/resources/mapper/user/OrderMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
@@ -574,4 +574,14 @@
a.status != '5'
and a.user_id = #{userId}
</select>
+
+ <select id="selectOrderByUserId" resultType="com.xzx.gc.entity.OrderInfo">
+ SELECT
+ a.*
+ FROM
+ xzx_order_info a
+ WHERE
+ a.order_status != '6'
+ and a.create_user_id = #{userId}
+ </select>
</mapper>
--
Gitblit v1.9.1