pipIrr-SV.git - Gitblit

			@@ -272,13 +272,15 @@
			cli.phone,
			cli.idCard,
			cli.clientNum,
			dis.name AS villageName,
			cli.address,
			card.money,
			cardNum,
			IFNULL(ope.card_cost,0) AS cardCost,
			IFNULL(ope.trade_amount, 0) AS amount,
			IFNULL(ope.gift, 0) AS gift,
			IFNULL(ope.refund_amount, 0) AS refundAmount,
			(IFNULL(ope.money, 0) + IFNULL(ope.trade_amount, 0)) AS afterRecharge,
			(IFNULL(ope.money, 0) + IFNULL(ope.trade_amount, 0) + IFNULL(ope.gift, 0)) AS afterRecharge,
			pay.name AS paymentName,
			ope.price,
			us.name AS opr,
			@@ -291,6 +293,7 @@
			FROM se_card_operate ope
			INNER JOIN se_client_card card ON ope.card_id = card.id
			INNER JOIN se_client cli ON ope.client_id = cli.id
			LEFT JOIN ba_district dis ON dis.id = cli.villageId
			INNER JOIN ba_user us ON ope.operator = us.id
			Left JOIN se_payment_method pay ON ope.payment_id = pay.id
			<where>
			@@ -361,7 +364,8 @@
			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,
			<!--ope.money,-->
			(IFNULL(ope.money, 0) + IFNULL(ope.trade_amount, 0) + IFNULL(ope.gift, 0)) AS money,
			pay.name AS paymentName,
			ope.operate_dt as tradeTime,
			us.id AS cashierId,
			@@ -374,10 +378,10 @@
			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_client cli ON ope.client_id = cli.id
			LEFT 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
			LEFT JOIN ba_user us ON ope.operator = us.id
			<where>
			AND ope.operate_type IN(1,2,3,5)

			@@ -661,6 +665,7 @@
			pay.`name` AS paymentName,
			us.`name` AS operatorName,
			ope.operate_dt AS operateTime,
			ope.operator AS cashierId,
			NOW() AS currentTime
			FROM se_card_operate ope
			INNER JOIN se_client cli ON ope.client_id = cli.id
			@@ -704,12 +709,12 @@
			SELECT
			SUM(IFNULL(ope.trade_amount,0) + IFNULL(ope.card_cost,0)) AS totalAmount
			FROM se_card_operate ope
			INNER JOIN se_client cli ON ope.client_id = cli.id
			INNER JOIN se_client_card card ON ope.card_id = card.id
			INNER JOIN se_payment_method pay ON ope.payment_id = pay.id
			INNER JOIN ba_user us ON ope.operator = us.id
			INNER JOIN ba_district vil ON cli.villageId = vil.id
			INNER JOIN ba_district tow ON cli.townId = tow.id
			LEFT JOIN se_client cli ON ope.client_id = cli.id
			LEFT JOIN se_client_card card ON ope.card_id = card.id
			LEFT JOIN se_payment_method pay ON ope.payment_id = pay.id
			LEFT JOIN ba_user us ON ope.operator = us.id
			LEFT JOIN ba_district vil ON cli.villageId = vil.id
			LEFT JOIN ba_district tow ON cli.townId = tow.id
			<where>
			AND ope.operate_type IN(1,2)
			<if test = "operateId != null and operateId > 0">