个人钱包消费列表优化

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);
+
     /**
      * 批量查询用户可退款金额
      *

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);
+
+
 }

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