flowerbackend-v2.git

			@@ -13,6 +13,9 @@
			<result column="supplier_id" property="supplierId" />
			<result column="wallet_id" property="walletId" />
			<result column="type" property="type" />

			<result column="withdraw_type" property="withdrawType" />

			<result column="type_detail" property="typeDetail" />
			<result column="transfer_id" property="transferId" />
			<result column="method" property="method" />
			@@ -22,11 +25,44 @@
			<result column="transfer_detail_id" property="transferDetailId" />
			<result column="open_id" property="openId" />
			</resultMap>
			<select id="getPage" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">
			select wbr.*, u.nick_name AS approveName
			from t_wallet_bill_record wbr
			LEFT JOIN t_user u ON wbr.approve_by = u.id
			where wbr.DELETED=0
			<if test="dto.supplierId != null and dto.supplierId != ''">
			and wbr.supplier_id= #{dto.supplierId}
			</if>
			<if test="dto.startDate != null">
			and DATE_FORMAT(wbr.create_time, '%Y-%m-%d') >= #{dto.startDate}
			</if>
			<if test="dto.endDate != null">
			and DATE_FORMAT(wbr.create_time, '%Y-%m-%d') <= #{dto.endDate}
			</if>
			order by wbr.create_time asc
			</select>

			<select id="getPageByDesc" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">
			select wbr.*, u.nick_name AS approveName
			from t_wallet_bill_record wbr
			LEFT JOIN t_user u ON wbr.approve_by = u.id
			where wbr.DELETED=0
			<if test="dto.supplierId != null and dto.supplierId != ''">
			and wbr.supplier_id= #{dto.supplierId}
			</if>
			<if test="dto.startDate != null">
			and DATE_FORMAT(wbr.create_time, '%Y-%m-%d') >= #{dto.startDate}
			</if>
			<if test="dto.endDate != null">
			and DATE_FORMAT(wbr.create_time, '%Y-%m-%d') <= #{dto.endDate}
			</if>
			order by wbr.create_time desc
			</select>
			<select id="queryPage" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">
			select t.* ,s.name supplierName from t_wallet_bill_record t
			select t.* ,s.name supplierName ,w.approve_time as approveTime ,u.nick_name AS approveName from t_wallet_bill_record t
			left join t_supplier_info s on t.supplier_id = s.id
			left join t_order o on t.order_id = o.id
			left join t_wallet_withdraw_record w on t.withdraw_record_id = w.id
			LEFT JOIN t_user u ON t.approve_by = u.id
			where t.deleted= 0
			<if test="dto.supplierName != null and dto.supplierName != ''">
			and s.name like concat('%', #{dto.supplierName}, '%')
			@@ -35,40 +71,31 @@
			and t.supplier_id = #{dto.supplierId}
			</if>
			<if test="dto.type != null and dto.type != ''">
			and t.type = #{type}
			and t.type = #{dto.type}
			</if>
			<if test="dto.orderNo != null and dto.orderNo != ''">
			and o.order_no = like concat('%', #{orderNo}, '%')
			and t.order_no like concat('%', #{dto.orderNo}, '%')
			</if>
			<if test="dto.createStartDate!=null ">
			<![CDATA[
			AND w.create_time >= #{dto.createStartDate}
			]]>
			AND DATE_FORMAT(t.create_time, '%Y-%m-%d') >= #{dto.createStartDate}
			</if>
			<if test="dto.endEndDate!=null ">
			<![CDATA[
			AND w.create_time <= #{dto.endEndDate}
			]]>
			AND DATE_FORMAT(t.create_time, '%Y-%m-%d') <= #{dto.endEndDate}
			</if>
			<if test="dto.approveStartDate!=null ">
			<![CDATA[
			AND w.approve_time >= #{dto.approveStartDate}
			]]>
			AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') >= #{dto.approveStartDate}
			</if>
			<if test="dto.approveEndDate!=null ">
			<![CDATA[
			AND w.approve_time <= #{dto.approveStartDate}
			]]>
			AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') <= #{dto.approveEndDate}
			</if>

			order by t.create_time
			order by t.create_time desc
			</select>

			<select id="queryWalletBillRecordList" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">
			select t.* ,s.name supplierName from t_wallet_bill_record t
			select t.* , s.name supplierName, w.approve_time as approveTime, u.nick_name AS approveName from t_wallet_bill_record t
			left join t_supplier_info s on t.supplier_id = s.id
			left join t_order o on t.order_id = o.id
			left join t_wallet_withdraw_record w on t.withdraw_record_id = w.id
			LEFT JOIN t_user u ON t.approve_by = u.id
			where t.deleted= 0
			<if test="dto.supplierName != null and dto.supplierName != ''">
			and s.name like concat('%', #{dto.supplierName}, '%')
			@@ -77,32 +104,23 @@
			and t.supplier_id = #{dto.supplierId}
			</if>
			<if test="dto.type != null and dto.type != ''">
			and t.type = #{type}
			and t.type = #{dto.type}
			</if>
			<if test="dto.orderNo != null and dto.orderNo != ''">
			and o.order_no = like concat('%', #{orderNo}, '%')
			and t.order_no like concat('%', #{dto.orderNo}, '%')
			</if>
			<if test="dto.createStartDate!=null ">
			<![CDATA[
			AND w.create_time >= #{dto.createStartDate}
			]]>
			AND DATE_FORMAT(t.create_time, '%Y-%m-%d') >= #{dto.createStartDate}
			</if>
			<if test="dto.endEndDate!=null ">
			<![CDATA[
			AND w.create_time <= #{dto.endEndDate}
			]]>
			AND DATE_FORMAT(t.create_time, '%Y-%m-%d') <= #{dto.endEndDate}
			</if>
			<if test="dto.approveStartDate!=null ">
			<![CDATA[
			AND w.approve_time >= #{dto.approveStartDate}
			]]>
			AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') >= #{dto.approveStartDate}
			</if>
			<if test="dto.approveEndDate!=null ">
			<![CDATA[
			AND w.approve_time <= #{dto.approveStartDate}
			]]>
			AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') <= #{dto.approveEndDate}
			</if>

			order by t.create_time
			</select>
			</mapper>