From bde23d1c3d9164e55799f29c4d04c57648deaca1 Mon Sep 17 00:00:00 2001
From: luozukai <luozukai@okjiaoyu.cn>
Date: Wed, 26 Jun 2019 11:30:48 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8D=B7][=E4=BF=AE=E6=94=B9][=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=BC=96=E8=BE=91=E5=8D=B7=E5=88=97=E8=A1=A8=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=B7=B2=E4=B8=8B=E6=9E=B6]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/WxCouponMapper.xml      | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
index 633101793..07c2167ab 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
@@ -38,11 +38,6 @@
         <result column="credit_price" jdbcType="INTEGER" property="creditPrice"/>
         <result column="credit_refund" jdbcType="INTEGER" property="creditRefund"/>
         <result column="is_del" property="isDel"/>
-        <result column="put_apply_status" property="putApplyStatus"/>
-        <result column="stock_apply_status" property="stockApplyStatus"/>
-        <result column="cancle_apply_status" property="cancleApplyStatus"/>
-        <result column="conditions" jdbcType="VARCHAR" property="conditions"/>
-
     </resultMap>
     <resultMap id="statisMap" type="com.iformall.domain.vo.WxCouponStatisVo">
         <id column="id" jdbcType="BIGINT" property="id"/>
@@ -95,8 +90,7 @@
         `id`,`tenant_id`,`type`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`,
         `valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`,
         `remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`,
-        `press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`,put_apply_status,stock_apply_status,cancle_apply_status
-        `press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`,`conditions`
+        `press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`
     </sql>
 
     <sql id="dynamicWhereConditions">
@@ -471,7 +465,6 @@
         <result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/>
         <result column="press_limit_num" jdbcType="INTEGER" property="pressLimitNum"/>
         <result column="press_limit_hours" jdbcType="INTEGER" property="pressLimitHours"/>
-        <result column="conditions" jdbcType="VARCHAR" property="conditions"/>
 
         <collection column="{productId=id}" property="merchantVoList"
                     ofType="com.iformall.domain.vo.WxMerchantVo"
@@ -825,7 +818,7 @@ where cpd.tenant_id=#{tenantId}
         wc.tenant_id,wc.`type`,wc.`cover_img`,wc.`cover_picture`,wc.`detail_picture`,wc.`title`,wc.`sub_title`,wc.`sale_price`,wc.`use_price`,wc.`use_limit_quantity`,wc.`send_type`,
         wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.`valid_days`,wc.`detail`,wc.`price`,wc.`unit`,wc.`remain_inventory`,wc.`inventory`,
         wc.`remark`,wc.`status`,wc.`create_date`,wc.`update_date`,wc.`business`,wc.`sub_business`,wc.`support_transfer`,wc.`subsidy_num`,wc.`subsidy_type`,
-        wc.`press_limit_num`, wc.`press_limit_hours`, wc.`auto_refund`,wc.`credit_price`,wc.`credit_refund`,wc.`conditions`
+        wc.`press_limit_num`, wc.`press_limit_hours`, wc.`auto_refund`,wc.`credit_price`,wc.`credit_refund`
         ,wc.title as couponName,wc.`cover_img` as couponPic,wc.`cover_picture` as couponPicture,wc.`detail_picture` as detailPicture,wc.id as couponId from wx_coupon_channel ct left join
 		wx_coupon wc on wc.id = ct.coupon_id
 		where ct.`sub_target_id` = #{id}