From 664cc4e3bfc16c0783b68cc376c23fe59a58a3c4 Mon Sep 17 00:00:00 2001
From: ALEI_ALEI <ALEI_ALEI@noreply.gitcode.com>
Date: Sat, 21 Dec 2024 14:55:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E6=8E=A5=E5=8F=A3=E3=80=81=E4=BF=AE=E6=94=B9=E5=88=B7?=
 =?UTF-8?q?=E5=8D=A1=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/UserRechargeCardsServiceImpl.java    |  1 +
 .../UserConsumptionDetailsMapper.xml          | 33 ++++++++++++++++---
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserRechargeCardsServiceImpl.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserRechargeCardsServiceImpl.java
index 21f8798..1d66fa6 100644
--- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserRechargeCardsServiceImpl.java
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserRechargeCardsServiceImpl.java
@@ -176,6 +176,7 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
         ngUserRechargeRecords.setRechargeTime(DateUtils.getNowDate());
         ngUserRechargeRecords.setStatus(0);
         ngUserRechargeRecords.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
+        ngUserRechargeRecords.setSerialNumber(rechargecardUser.getDeviceNumber());
         // 计算新的余额
 //        BigDecimal newBalance = rechargecardUser.getAmount().add(info.getBalance());
 
diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/UserConsumptionDetailsMapper.xml b/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/UserConsumptionDetailsMapper.xml
index 5e9b9c1..87606c3 100644
--- a/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/UserConsumptionDetailsMapper.xml
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/UserConsumptionDetailsMapper.xml
@@ -44,7 +44,8 @@
         <where>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="deviceNumber != null  and deviceNumber != ''"> and device_number = #{deviceNumber}</if>
-            <if test="cardNumber != null  and cardNumber != ''"> and card_number = #{cardNumber}</if>
+            <!--<if test="cardNumber != null  and cardNumber != ''"> and card_number = #{cardNumber}</if>-->
+            <if test="cardNumber != null  and cardNumber != ''"> and card_number LIKE CONCAT('%',#{cardNumber},'%')</if>
             <if test="projectId != null "> and project_id = #{projectId}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="billingType != null "> and billing_type = #{billingType}</if>
@@ -78,11 +79,33 @@
             card_number = #{cardNumber}
     </select>
 
-    <select id="selectUserConsumptionDetailsSwipListByCardNumber" parameterType="String" resultMap="UserConsumptionDetailsResult">
+    <select id="selectUserConsumptionDetailsSwipListByCardNumber" parameterType="UserConsumptionDetails" resultMap="UserConsumptionDetailsResult">
         <include refid="selectUserConsumptionDetailsVo"/>
-        where
-        card_number = #{cardNumber}
-        and billing_type=1
+        <where>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="deviceNumber != null  and deviceNumber != ''"> and device_number = #{deviceNumber}</if>
+            <if test="cardNumber != null  and cardNumber != ''"> and card_number = #{cardNumber}</if>
+            <!--<if test="cardNumber != null  and cardNumber != ''"> and card_number LIKE CONCAT('%',#{cardNumber},'%')</if>-->
+            <if test="projectId != null "> and project_id = #{projectId}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="billingType != null "> and billing_type = #{billingType}</if>
+            <if test="pumpTime != null "> and pump_time = #{pumpTime}</if>
+            <if test="unitPrice != null "> and unit_price = #{unitPrice}</if>
+            <if test="totalPrice != null "> and total_price = #{totalPrice}</if>
+            <if test="discount != null "> and discount = #{discount}</if>
+            <if test="taxAmount != null "> and tax_amount = #{taxAmount}</if>
+            <if test="amountDue != null "> and amount_due = #{amountDue}</if>
+            <if test="billingPeriodUnit != null "> and billing_period_unit = #{billingPeriodUnit}</if>
+            <if test="billingPeriodDuration != null "> and billing_period_duration = #{billingPeriodDuration}</if>
+            <if test="billingDate != null "> and billing_date = #{billingDate}</if>
+            <if test="startTime != null "> and start_time = #{startTime}</if>
+            <if test="endTime != null "> and end_time = #{endTime}</if>
+            <if test="paymentStatus != null "> and payment_status = #{paymentStatus}</if>
+            <if test="paymentMethod != null "> and payment_method = #{paymentMethod}</if>
+            <if test="paymentTime != null "> and payment_time = #{paymentTime}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
+        </where>
     </select>
 
     <insert id="insertUserConsumptionDetails" parameterType="UserConsumptionDetails" useGeneratedKeys="true" keyProperty="id">