pipIrr-SV.git - Gitblit

			@@ -275,10 +275,6 @@
			cli.address,
			card.money,
			cardNum,
			<!-- CASE-->
			<!-- WHEN card.cardNum LIKE '10%' THEN CONCAT(SUBSTRING(card.cardNum, 7, 6),SUBSTRING(card.cardNum, 14, 4))-->
			<!-- ELSE card.cardNum-->
			<!-- END AS cardNum,-->
			IFNULL(ope.card_cost,0) AS cardCost,
			IFNULL(ope.trade_amount, 0) AS amount,
			IFNULL(ope.refund_amount, 0) AS refundAmount,
			@@ -310,14 +306,6 @@
			<if test = "cardNum != null and cardNum !=''">
			AND card.cardNum like CONCAT('%',#{cardNum},'%')
			</if>

			<!-- <if test = "paymentId != null and paymentId > 0">-->
			<!-- AND ope.payment_id = ${paymentId}-->
			<!-- </if>-->

			<!-- <if test = "rechargeTimeStart != null and rechargeTimeStop != null">-->
			<!-- AND ope.operate_dt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}-->
			<!-- </if>-->
			</where>
			ORDER BY ope.operate_dt DESC
			<trim prefix="limit " >
			@@ -331,39 +319,81 @@
			<select id="getTransactionRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
			SELECT
			COUNT(*) AS recordCount
			FROM v_trade_details
			FROM se_card_operate ope
			INNER JOIN se_client cli ON ope.client_id = cli.id
			INNER JOIN se_client_card card ON card.id = ope.card_id
			LEFT JOIN se_payment_method pay ON ope.payment_id = pay.id
			INNER JOIN ba_user us ON ope.operator = us.id
			<where>
			AND ope.operate_type IN(1,2,3,5)

			<if test = "villageId != null and villageId > 0">
			AND villageId = #{villageId}
			AND cli.villageId = #{villageId}
			</if>

			<if test = "operateTimeStart != null and operateTimeStop != null">
			AND tradeTime BETWEEN #{operateTimeStart} AND #{operateTimeStop}
			AND ope.operate_dt BETWEEN #{operateTimeStart} AND #{operateTimeStop}
			</if>

			<if test = "cashierId != null and cashierId > 0">
			AND cashierId = #{cashierId}
			AND us.id = #{cashierId}
			</if>
			</where>
			</select>

			<!--根据指定条件获取交易记录-->
			<select id="getTransactions" resultType="com.dy.pipIrrGlobal.voSe.VoTradeDetails">
			SELECT * FROM v_trade_details
			SELECT
			ope.id AS orderNumber,
			cli.name AS clientName,
			card.cardNum AS cardNum,
			cli.idCard,
			cli.clientNum,
			cli.phone,
			(CASE ope.operate_type
			WHEN 1 THEN '开卡'
			WHEN 2 THEN '充值'
			WHEN 3 THEN '销卡'
			WHEN 5 THEN '补扣'
			END) AS operateType,
			(IFNULL(ope.trade_amount,0.00) + IFNULL(ope.card_cost,0.00)) AS tradeAmount,
			IFNULL(ope.trade_amount,0.00) AS waterCost,
			IFNULL(ope.card_cost,0.00) AS cardCost,
			IFNULL(ope.gift,0.00) AS gift,
			IFNULL(ope.refund_amount,0.00) AS refundAmount,
			ope.money,
			pay.name AS paymentName,
			ope.operate_dt as tradeTime,
			us.id AS cashierId,
			us.name AS cashierName,
			(CASE card.state
			WHEN 1 THEN '正常'
			WHEN 2 THEN '已注销'
			WHEN 3 THEN '已挂失'
			END) AS cardState,
			cli.districtTitle,
			cli.villageId AS villageId
			FROM se_card_operate ope
			INNER JOIN se_client cli ON ope.client_id = cli.id
			INNER JOIN se_client_card card ON card.id = ope.card_id
			LEFT JOIN se_payment_method pay ON ope.payment_id = pay.id
			INNER JOIN ba_user us ON ope.operator = us.id
			<where>
			AND ope.operate_type IN(1,2,3,5)

			<if test = "villageId != null and villageId > 0">
			AND villageId = #{villageId}
			AND cli.villageId = #{villageId}
			</if>

			<if test = "operateTimeStart != null and operateTimeStop != null">
			AND tradeTime BETWEEN #{operateTimeStart} AND #{operateTimeStop}
			AND ope.operate_dt BETWEEN #{operateTimeStart} AND #{operateTimeStop}
			</if>

			<if test = "cashierId != null and cashierId > 0">
			AND cashierId = #{cashierId}
			AND us.id = #{cashierId}
			</if>
			</where>
			ORDER BY tradeTime
			ORDER BY ope.operate_dt
			<trim prefix="limit ">
			<if test="start != null and count != null">
			#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
			@@ -852,4 +882,65 @@
			</if>
			</trim>
			</select>

			<!--获取充值记录数量，管理平台充值列表使用，APP未使用-->
			<select id="getRechargesCountNew" resultType="java.lang.Long">
			SELECT COUNT(*) AS recordCount
			FROM se_client_card card
			INNER JOIN se_client cli ON cli.id = card.clientId
			LEFT JOIN se_recharge_history rch ON rch.cardId = card.id
			LEFT JOIN se_payment_method pay ON pay.id = rch.paymentId
			INNER JOIN ba_user us ON us.id = rch.operator
			<where>
			<if test = "clientName != null and clientName !=''">
			AND cli.name like CONCAT('%',#{clientName},'%')
			</if>

			<if test = "clientNum != null and clientNum > 0">
			AND cli.clientNum like CONCAT('%',#{clientNum},'%')
			</if>

			<if test = "cardNum != null and cardNum !=''">
			AND card.cardNum like CONCAT('%',#{cardNum},'%')
			</if>
			</where>
			</select>

			<!--获取充值记录，管理平台充值列表使用，APP未使用-->
			<select id="getRechargesNew" resultType="com.dy.pipIrrGlobal.voSe.VoRechargeNew">
			SELECT
			cli.name AS clientName,
			cli.clientNum,
			card.cardNum,
			IFNULL(rch.amount, 0) AS amount,
			IFNULL(rch.gift, 0) AS gift,
			IFNULL(rch.afterRecharge, 0) AS afterRecharge,
			pay.name AS paymentName,
			us.name AS operator,
			rch.operateDt AS operateTime
			FROM se_client_card card
			INNER JOIN se_client cli ON cli.id = card.clientId
			LEFT JOIN se_recharge_history rch ON rch.cardId = card.id
			LEFT JOIN se_payment_method pay ON pay.id = rch.paymentId
			INNER JOIN ba_user us ON us.id = rch.operator
			<where>
			<if test = "clientName != null and clientName !=''">
			AND cli.name like CONCAT('%',#{clientName},'%')
			</if>

			<if test = "clientNum != null and clientNum > 0">
			AND cli.clientNum like CONCAT('%',#{clientNum},'%')
			</if>

			<if test = "cardNum != null and cardNum !=''">
			AND card.cardNum like CONCAT('%',#{cardNum},'%')
			</if>
			</where>
			ORDER BY rch.operateDt DESC
			<trim prefix="limit " >
			<if test="start != null and count != null">
			#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
			</if>
			</trim>
			</select>
			</mapper>