~jiangyouyao/beauty-erp.git

			@@ -16,6 +16,7 @@
			<result property="vipId" column="vip_id" />
			<result property="payMethod" column="pay_method" />
			<result property="cardId" column="card_id" />
			<result property="cardName" column="card_name" />
			<result property="isGift" column="is_gift" />

			<result property="orderNo" column="order_no" />
			@@ -65,10 +66,14 @@
			create_time=#{payTime}
			where order_id=#{orderId}
			</update>
			<delete id="deleteByOrderId">
			delete from sys_order_flow where order_id=#{orderId}
			</delete>

			<select id="selectByOrderId" resultMap="SysOrderFlowMap">
			select a.*, b.order_no from sys_order_flow a
			select a.*, b.order_no,c.card_name from sys_order_flow a
			left join sys_order b on a.order_id=b.id
			left join money_card_use c on a.card_id=c.id
			where order_id=#{orderId}
			</select>

			@@ -94,12 +99,15 @@
			a.pay_method as payMethod,
			a.flow_no as flowNo,
			d.shop_short_name as shopName,
			f.card_name as cardName,
			e.su_name as staffName
			from sys_order_flow a
			LEFT JOIN sys_order b on a.order_id=b.ID
			LEFT JOIN sys_vip_info c on a.vip_id=c.ID
			LEFT JOIN sys_shop_info d on a.shop_id=d.ID
			LEFT JOIN sys_users e on e.su_id=b.STAFF_ID
			left join money_card_use f on a.card_id=f.id

			<where>

			and a.company_id=#{record.companyId}