From 0741dc7f25811ea2acb4127fc43d1dc9a802221c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Jun 2021 21:37:07 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
index 423755c..abb1a85 100644
--- a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
@@ -2,4 +2,33 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xzx.gc.order.mapper.JhyOrderMapper">
+ <select id="selectJhyOrderList" resultType="com.xzx.gc.order.vo.JhyOrderListVo">
+ select
+ a.id orderid
+ ,a.username
+ ,CONCAT(a.area, a.address) address
+ ,a.longitude
+ ,a.latitude
+ ,a.weight
+ ,a.status
+ ,a.remark
+ ,CONCAT(a.reserve_date, ' ', a.reserve_time) reserveTime
+ ,GROUP_CONCAT(b.title) items
+ from xzx_jhy_order a
+ inner join xzx_jhy_order_items b on a.id=b.order_id
+ <where>
+ <if test="record.type == 1">
+ and user_id=#{record.userId}
+ </if>
+ <if test="record.type == 2">
+ <if test="record.status != 1">
+ and jhy_id=#{record.userId}
+ </if>
+ </if>
+ <if test="record.status != null and record.status != ''">
+ and a.status = #{record.status}
+ </if>
+ </where>
+ group by a.id
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1