From ccdc5690f7f4705611a2f57a7cf45da352b6e7e4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Apr 2021 17:51:58 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
index c99b814..1e20546 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -17,6 +17,7 @@
 		<result property="vipId" column="vip_id" />
 		<result property="freeConsume" column="free_consume" />
 		<result property="hisConsume" column="his_consume" />
+		<result property="consume" column="consume" />
 		<result property="goodsCash" column="goods_cash" />
 		<result property="projNum" column="proj_num" />
 		<result property="numberOfPeople" column="number_of_people" />
@@ -725,6 +726,9 @@
 			<if test="record.t9 != null and record.t9 != '' ">
 				t9 = #{record.t9},
 			</if>
+			<if test="record.payMethod != null and record.payMethod != '' ">
+				pay_method = #{record.payMethod},
+			</if>
 		</set>
 		WHERE id=#{record.id}
 	</update>
@@ -1066,4 +1070,12 @@
 		group by a.shop_id
 		order by amount desc, a.shop_id
 	</select>
+
+	<select id="selectAchieveByServiceOrderId" resultMap="AchieveNewMap">
+		select * from achieve_new where service_order_id=#{serviceOrderId}
+	</select>
+
+	<select id="selectAchieveForOrder" resultMap="AchieveNewMap">
+		select * from achieve_new where order_type='订单'
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1