From 7c9e1e552d171b96e8ec890ba0df5f7abbde1c7d Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 24 九月 2024 15:49:00 +0800
Subject: [PATCH] 优化代码 条件获取流浪控制器接口结果排序优化
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 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 e217ed6..a57b2ad 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -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,
@@ -431,23 +435,24 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰�-->
<select id="getActiveCards" resultType="com.dy.pipIrrGlobal.voSe.VoActiveCard">
SELECT
- CAST(ope.id AS char) AS id ,
- cli.name AS clientName,
- cli.clientNum AS clientNum,
- card.cardNum AS cardNum,
- card.state AS state,
- (CASE
- WHEN card.state = 1 THEN '姝ｅ父'
- WHEN card.state = 2 THEN '宸叉敞閿�'
- WHEN card.state = 3 THEN '宸叉寕澶�'
- END) AS stateName,
- ope.card_cost AS cardCost,
- ope.payment_id AS paymentId,
- (SELECT `name` FROM ba_user WHERE id = ope.operator) AS operator,
- ope.operate_dt AS operateDt
+ ope.id,
+ cli.name AS clientName,
+ cli.clientNum AS clientNum,
+ card.cardNum AS cardNum,
+ card.state AS state,
+ (CASE
+ WHEN card.state = 1 THEN '姝ｅ父'
+ WHEN card.state = 2 THEN '宸叉敞閿�'
+ WHEN card.state = 3 THEN '宸叉寕澶�'
+ END) AS stateName,
+ ope.card_cost AS cardCost,
+ pay.name AS paymentName,
+ (SELECT `name` FROM ba_user WHERE id = ope.operator) AS operator,
+ ope.operate_dt AS operateDt
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
+ INNER JOIN se_client_card card ON ope.card_id = card.id
+ INNER JOIN se_client cli ON ope.client_id = cli.id
+ INNER JOIN se_payment_method pay ON pay.id = ope.payment_id
<where>
AND ope.operate_type = 1
<if test = "clientName != null and clientName !=''">
--
Gitblit v1.8.0