From 799622ea4d37aa6bb9fee457967532aa93d18594 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 21 Mar 2021 20:17:05 +0800
Subject: [PATCH] 扣除用户积分

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

diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml
index 8ec31fb..c699faf 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml
@@ -33,6 +33,7 @@
 			<result property="storeName" column="shop_name" />
 			<result property="orderType" column="order_type" />
 			<result property="applyStatus" column="apply_status" />
+			<result property="scorePay" column="score_pay" />
 			<result property="companyId" column="company_id" />
 	</resultMap>
 
@@ -66,6 +67,7 @@
 			<result property="postage" column="postage" />
 			<result property="orderType" column="order_type" />
 			<result property="storeName" column="shop_name" />
+		<result property="scorePay" column="score_pay" />
 			<result property="companyId" column="company_id" />
 		<result property="activityType" column="activity_type" />
 		<!--支付时间-->
@@ -127,6 +129,7 @@
 			postage,
 			order_type,
 			activity_type,
+score_pay,
 			company_id
 	</sql>
 	
@@ -159,6 +162,7 @@
 			#{item.postage},
 			#{item.orderType},
 			#{item.activityType},
+			#{item.scorePay},
 			#{item.companyId}
 	</sql>
 	
@@ -337,6 +341,9 @@
 			<if test="_parameter.containsKey('orderType')">
 				order_type  = #{orderType},
 			</if>
+			<if test="_parameter.containsKey('scorePay')">
+				score_pay  = #{scorePay},
+			</if>
 		</set>
 		WHERE id=#{id} 
 	</update> 
@@ -405,6 +412,9 @@
 			</if>
 			<if test="record.postage != null and record.postage != '' ">
 				postage  = #{record.postage},
+			</if>
+			<if test="record.scorePay != null and record.scorePay != '' ">
+				score_pay  = #{record.scorePay},
 			</if>
 			<if test="true">
 				update_time  = now(),
@@ -558,6 +568,7 @@
 		o.postage,
 		s.shop_name,
 		o.order_type,
+		o.score_pay,
 		o.apply_status
 		from shop_order o
 		INNER JOIN sys_shop_info s on o.store_id = s.ID
@@ -629,6 +640,7 @@
 		o.pay_result,
 		o.postage,
 		s.store_name,
+		s.score_pay,
 		o.order_type
 		from shop_order o
 		LEFT JOIN shop_store s on o.store_id = s.store_id

--
Gitblit v1.9.1