From f74db84df0e3797e0a2db1faa50adcb778a5150a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 六月 2025 11:33:35 +0800
Subject: [PATCH] 1、完善水肥、墒情、气象相关Mapper代码； 2、解决表阀一体机远程关阀出现的订单号不一致专制不能关阀问题（王江海测试发现）。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
index 84dc129..f039398 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -386,7 +386,7 @@
WHEN 2 THEN '鍏呭��'
WHEN 3 THEN '閿�鍗�'
WHEN 5 THEN '琛ユ墸'
- WHEN 10 THEN '鍙嶅啓'
+<!-- WHEN 6 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,
@@ -411,7 +411,7 @@
LEFT JOIN se_payment_method pay ON ope.payment_id = pay.id
LEFT JOIN ba_user us ON ope.operator = us.id
<where>
- AND ope.operate_type IN(1,2,3,5,10)
+ AND ope.operate_type IN(1,2,3,5)
AND ope.operate_valid = 2
<if test = "villageId != null and villageId > 0">
AND cli.villageId = #{villageId}
@@ -1083,9 +1083,64 @@
);
</update>
+ <!--鍏呭�兼満鐢ㄦ牴鎹鍗曞彿灏嗘搷浣滆褰曟敼涓烘湁鏁�-->
+ <update id="turnOperateValidByOrderNumber">
+ UPDATE se_card_operate
+ SET operate_valid = 2
+ WHERE operate_valid = 1 AND order_no = #{orderNumber}
+ </update>
+
+ <!--鍏呭�兼満鐢ㄨ幏鍙栧厖鍊兼搷浣滃悗鏂扮殑浣欓鍙婂厖鍊兼椂闂�-->
+ <select id="getBalanceAfterRecharge" resultType="com.dy.pipIrrGlobal.voSe.VoAfterRecharge">
+ SELECT
+ (money + trade_amount + gift) AS balanceAfterRecharge,
+ operate_dt AS operateTime
+ FROM se_card_operate
+ WHERE order_no = #{orderNumber}
+ </select>
+
+ <!--鍏呭�兼満鐢ㄦ牴鎹按鍗D鑾峰彇鍚屾鍏呭�艰褰曟暟閲�-->
+ <select id="getPlusRechargeCount" resultType="java.lang.Integer">
+ SELECT COUNT(*)
+ FROM se_card_operate
+ WHERE operate_type = 2 AND order_no = CONCAT((SELECT order_no FROM se_card_operate WHERE operate_type = 1 AND card_id = #{cardId}),'p')
+ </select>
+
<!--鏍规嵁鎿嶄綔绫诲瀷銆佹按鍗D鑾峰彇鑾峰彇鏈�鍚庝竴鏉¤褰�-->
<select id="getCardOperate" resultType="com.dy.pipIrrGlobal.pojoSe.SeCardOperate">
SELECT * FROM se_card_operate
WHERE operate_type = #{operateType} AND card_id = #{cardId} ORDER BY operate_dt DESC LIMIT 1
</select>
+
+ <!--鍏呭�兼満鐢ㄦ牴鎹鍗曞彿鑾峰彇闈炰氦鏄撻噾棰�-->
+ <select id="getNoTradeAmount" resultType="java.lang.Float">
+ SELECT
+ IFNULL(SUM(trade_amount), 0) AS noTradeAmount
+ FROM se_card_operate
+ WHERE order_no = #{orderNumber}
+ </select>
+
+ <!--鍏呭�兼満鐢ㄦ牴鎹鍗曞彿鑾峰彇鎿嶄綔鏃堕棿-->
+ <select id="getOperateTime" resultType="java.util.Date">
+ SELECT
+ operate_dt AS operateTime
+ FROM se_card_operate
+ WHERE order_no = #{orderNumber}
+ ORDER BY operate_dt DESC
+ LIMIT 1
+ </select>
+
+ <!--鍏呭�兼満浣跨敤鏍规嵁璁㈠崟鍙疯幏鍙栨搷浣滆褰�-->
+ <select id="getCardOperateByOrderNumber" resultType="com.dy.pipIrrGlobal.voSe.VoRepaySupplementSimple">
+ SELECT
+ money,
+ refund_amount AS refundAmount,
+ operate_dt AS operateTime
+ FROM se_card_operate
+ WHERE order_no = #{orderNumber}
+ ORDER BY operate_dt DESC
+ LIMIT 1
+ </select>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0