From 9fb1a68d11a8928f2ba602dd68dc00d19ca7429f Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 27 Feb 2024 15:47:57 +0800
Subject: [PATCH] 抽奖

---
 src/main/resources/mapper/modules/MallOrderInfoMapper.xml |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 8e07beb..1120b05 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -47,6 +47,7 @@
         select a.*,
                b.name memberName,
                b.bind_phone memberBindPhone,
+               b.account_login accountLogin,
                b.phone memberPhone,
                c.goods_name
         from mall_order_item c
@@ -71,6 +72,9 @@
                 </if>
                 <if test="record.name != null and record.name != ''">
                     and b.name like CONCAT('%', CONCAT(#{record.name}, '%'))
+                </if>
+                <if test="record.accountLogin != null and record.accountLogin != ''">
+                    and b.account_login like CONCAT('%', CONCAT(#{record.accountLogin}, '%'))
                 </if>
                 <if test="record.startTime != null and record.startTime != ''">
                     and a.order_time &gt;= #{record.startTime}
@@ -110,6 +114,10 @@
         <result column="carriage" property="carriage" />
         <result column="remark" property="remark" />
         <result column="del_flag" property="delFlag" />
+        <result column="deliver_type" property="deliverType" />
+        <result column="shop_id" property="shopId" />
+        <result column="score_amount" property="scoreAmount" />
+        <result column="score_cnt" property="scoreCnt" />
         <collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
             <id property="id" column="item_id" />
             <result property="orderId" column="order_id" />
@@ -307,4 +315,28 @@
             #{item}
         </foreach>
     </select>
+
+
+    <select id="getChouJiangListInPage" resultType="cc.mrbird.febs.mall.entity.CjInfo">
+        select
+        a.*,
+        c.phone
+        from cj_info a
+        left join mall_member c on a.member_id = c.id
+        <where>
+            <if test="record.phone != null and record.phone != ''">
+                and c.phone=#{record.phone}
+            </if>
+            <if test="record.kjNo != null and record.kjNo != ''">
+                and a.kj_no=#{record.kjNo}
+            </if>
+            <if test="record.kjState != null and record.kjState != ''">
+                and a.kj_state=#{record.kjState}
+            </if>
+            <if test="record.zjState != null and record.zjState != ''">
+                and a.zj_state=#{record.zjState}
+            </if>
+        </where>
+        order by a.created_time desc
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1