From 031f9cd98ff62cf5defe8f588e9479e03bd99102 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Wed, 22 Jan 2025 11:18:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E9=92=B1=E5=8C=85=E6=B6=88?=
 =?UTF-8?q?=E8=B4=B9=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/service/MemberService.java    |  3 +-
 .../parkplatform/ParkingPlatformEnum.java     |  1 +
 .../pile/mapper/MemberWalletLogMapper.java    |  8 +++++
 .../pile/service/MemberBasicInfoService.java  |  3 ++
 .../impl/MemberBasicInfoServiceImpl.java      |  5 +++
 .../mapper/pile/MemberWalletLogMapper.xml     | 34 ++++++++++++++++---
 .../thirdparty/common/CommonService.java      |  2 ++
 7 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
index 0ec4e29b1..c23a9e925 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
@@ -482,7 +482,8 @@ public class MemberService {
 		dto.setTradeDate(tradeDate);
 		dto.setEndDate(lastDay);
 		// PageHelper.startPage(pageNum, pageSize);
-		List<MemberWalletLogVO> list = memberBasicInfoService.getMemberWalletDetail(dto);
+		// List<MemberWalletLogVO> list = memberBasicInfoService.getMemberWalletDetail(dto);
+		List<MemberWalletLogVO> list = memberBasicInfoService.getMemberWalletDetailV2(dto);
 
 		// 总支出
 		BigDecimal totalConsumption = list.stream()
diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/parkplatform/ParkingPlatformEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/parkplatform/ParkingPlatformEnum.java
index 03c58d437..c00f950f1 100644
--- a/jsowell-common/src/main/java/com/jsowell/common/enums/parkplatform/ParkingPlatformEnum.java
+++ b/jsowell-common/src/main/java/com/jsowell/common/enums/parkplatform/ParkingPlatformEnum.java
@@ -9,6 +9,7 @@ package com.jsowell.common.enums.parkplatform;
 public enum ParkingPlatformEnum {
     LU_TONG_YUN_TING_PLATFORM("1", "路通云停停车平台"),
     RUAN_JIE_PLATFORM("2", "软杰停车平台"),
+    SHEN_ZHEN_PLATFORM("3", "深圳停车道闸平台"),
     ;
 
     private String code;
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java
index b326a25b4..1bae23a41 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java
@@ -85,6 +85,14 @@ public interface MemberWalletLogMapper {
      */
     List<MemberWalletLogVO> getMemberWalletDetail(@Param("dto") UniAppQueryMemberBalanceDTO dto);
 
+    /**
+     * 小程序查询会员余额明细
+     * 根据订单合并
+     * @param dto
+     * @return
+     */
+    List<MemberWalletLogVO> getMemberWalletDetailV2(@Param("dto") UniAppQueryMemberBalanceDTO dto);
+
     /**
      * 批量查询用户可退款金额
      *
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberBasicInfoService.java
index 0e6fd7f17..febbe5c6e 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberBasicInfoService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberBasicInfoService.java
@@ -141,6 +141,7 @@ public interface MemberBasicInfoService {
 	 */
 	List<MemberWalletLogVO> getMemberWalletDetail(UniAppQueryMemberBalanceDTO dto);
 
+	List<MemberWalletLogVO> getMemberWalletDetailV2(UniAppQueryMemberBalanceDTO dto);
 
 	/**
 	 * 批量查询用户可退款金额
@@ -159,4 +160,6 @@ public interface MemberBasicInfoService {
 	 * @return
 	 */
 	List<MemberVO> getMemberInfoByPlateNumber(String plateNumber);
+
+
 }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
index 981f5f335..7a85a59ea 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
@@ -595,6 +595,11 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
 		return memberWalletLogMapper.getMemberWalletDetail(dto);
 	}
 
+	@Override
+	public List<MemberWalletLogVO> getMemberWalletDetailV2(UniAppQueryMemberBalanceDTO dto) {
+		return memberWalletLogMapper.getMemberWalletDetailV2(dto);
+	}
+
 	/**
 	 * 批量查询用户可退款金额
 	 * @param memberIds
diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml
index d822ac76b..ed074ba8a 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml
@@ -503,13 +503,39 @@
             <if test="dto.endDate != null and dto.endDate != ''">
               and t1.create_time <![CDATA[ < ]]> #{dto.endDate,jdbcType=VARCHAR}
             </if>
-<!--        where t1.member_id = #{dto.memberId,jdbcType=VARCHAR}-->
-<!--          and t1.wallet_code = #{dto.walletCode,jdbcType=VARCHAR}-->
-<!--          and t1.create_time <![CDATA[ >= ]]> #{dto.tradeDate,jdbcType=VARCHAR}-->
-<!--          and t1.create_time <![CDATA[ < ]]> #{dto.endDate,jdbcType=VARCHAR}-->
         order by t1.create_time desc
     </select>
 
+  <select id="getMemberWalletDetailV2" resultType="com.jsowell.pile.vo.uniapp.customer.MemberWalletLogVO">
+    SELECT t1.member_id          as memberId,
+    t1.type,
+    t1.sub_type           as subType,
+    t1.amount,
+    t1.category,
+    t1.related_order_code as relatedOrderCode,
+    t2.pay_amount         as payAmount,
+    t2.order_amount       as orderAmount,
+    t2.refund_amount      as refundAmount,
+    t1.create_time        as transactionTime
+    from member_wallet_log t1
+    left join order_basic_info t2 on t1.related_order_code = t2.order_code
+    where t1.sub_type != '12'
+    <if test="dto.memberId != null and dto.memberId != ''">
+      and t1.member_id = #{dto.memberId,jdbcType=VARCHAR}
+    </if>
+    <if test="dto.walletCode != null and dto.walletCode != ''">
+      and t1.wallet_code = #{dto.walletCode,jdbcType=VARCHAR}
+    </if>
+    <if test="dto.tradeDate != null and dto.tradeDate != ''">
+      and t1.create_time <![CDATA[ >= ]]> #{dto.tradeDate,jdbcType=VARCHAR}
+    </if>
+    <if test="dto.endDate != null and dto.endDate != ''">
+      and t1.create_time <![CDATA[ < ]]> #{dto.endDate,jdbcType=VARCHAR}
+    </if>
+    GROUP BY t1.related_order_code, t1.sub_type, t1.create_time
+    order by t1.create_time desc
+  </select>
+
     <select id="getMemberRefundAmount" resultType="com.jsowell.pile.vo.uniapp.customer.MemberBalanceVO">
         select member_id         as memberId,
                principal_balance as principalAmount
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java
index e594e1ff6..f7a6e8ad4 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java
@@ -742,6 +742,8 @@ public class CommonService {
                     .fPlateCode(orderBasicInfo.getPlateNumber()) // 车牌号
                     .build();
             return rjService.useCoupon(dto);
+        } else if (StringUtils.equals(ParkingPlatformEnum.SHEN_ZHEN_PLATFORM.getCode(), stationInfo.getParkingId())) {
+            // 深圳道闸
         }
         return null;
     }