From 9108fe37516a05b7af57953cb036e361ae3c86d2 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 19 Mar 2021 16:00:40 +0800
Subject: [PATCH] 积分商城8

---
 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDetailsDao.xml |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDetailsDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDetailsDao.xml
index c1263ab..d513e38 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDetailsDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDetailsDao.xml
@@ -19,6 +19,7 @@
 			<result property="sTitle" column="s_title" />
 			<result property="discountExplain" column="discount_explain" />
 			<result property="discountAmount" column="discount_amount" />
+			<result property="payType" column="pay_type" />
 	</resultMap>
 
 	<!-- 定义ShopOrderDetails 的复杂map -->
@@ -37,6 +38,7 @@
 			<result property="sTitle" column="s_title" />
 			<result property="discountExplain" column="discount_explain" />
 			<result property="discountAmount" column="discount_amount" />
+		<result property="payType" column="pay_type" />
 		<!--产品信息-->
 		<association property="shopProduct" column="p_id"
 			select="com.matrix.system.shopXcx.dao.ShopProductDao.selectById"/>
@@ -48,11 +50,6 @@
 					 select="selectProductionEnterpriseByPid"/>
 	</resultMap>
 
-	<!--查询产品生产企业-->
-	<select id="selectProductionEnterpriseByPid" resultType="java.lang.String">
-		select ifnull(param_value, '') from shop_product_param_ref
-		where p_id = ${pId} and param_name = '生产企业'
-	</select>
 	
 	<!-- 字段sql -->
 	<sql id="columns">
@@ -69,7 +66,8 @@
 			total_price,
 			s_title,
 			discount_explain,
-			discount_amount
+			discount_amount,
+			pay_type
 	</sql>
 	
 	<!-- 属性sql -->
@@ -87,7 +85,8 @@
 			#{item.totalPrice},
 			#{item.sTitle},
 			#{item.discountExplain},
-			#{item.discountAmount}
+			#{item.discountAmount},
+			#{item.payType}
 	</sql>
 	
 	<!-- where sql -->
@@ -124,6 +123,9 @@
 			<if test="(record.discountAmount!=null and record.discountAmount!='') or  (record.discountAmount!='' and record.discountAmount==0)  ">
 				and discount_amount  = #{record.discountAmount} 
 			</if>
+			<if test="(record.payType!=null and record.payType!='') or  (record.payType!='' and record.payType==0)  ">
+				and pay_type  = #{record.payType}
+			</if>
 		</if>
 		 
 	</sql>

--
Gitblit v1.9.1