Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java

@@ -2,6 +2,7 @@ package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.MemberWalletLog;
 import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO;
+import com.jsowell.pile.vo.MemberWalletLogVO2;
 import com.jsowell.pile.vo.uniapp.customer.MemberBalanceVO;
 import com.jsowell.pile.vo.uniapp.customer.MemberWalletLogVO;
 import org.apache.ibatis.annotations.Param;
@@ -102,4 +103,6 @@ public interface MemberWalletLogMapper {
     List<MemberBalanceVO> getMemberRefundAmount(List<String> memberIds);
 
     List<MemberWalletLog> getOrderRecord(@Param("orderCode") String orderCode, @Param("type") String type);
-}
+
+    List<MemberWalletLogVO2> getByMemberId(String memberId);
+}

jsowell-pile/src/main/java/com/jsowell/pile/service/MemberWalletLogService.java

@@ -1,6 +1,7 @@
 package com.jsowell.pile.service;
 
 import com.jsowell.pile.domain.MemberWalletLog;
+import com.jsowell.pile.vo.MemberWalletLogVO2;
 
 import java.util.List;
 
@@ -30,5 +31,7 @@ public interface MemberWalletLogService {
     int batchInsert(List<MemberWalletLog> list);
 
     List<MemberWalletLog> getOrderRecord(String orderCode, String type);
+
+    List<MemberWalletLogVO2> getByMemberId(String memberId);
 }
 

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java

@@ -36,10 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -612,9 +609,16 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
 	 */
 	@Override
 	public List<MemberWalletLogVO> getMemberWalletDetail(UniAppQueryMemberBalanceDTO dto) {
-		return memberWalletLogMapper.getMemberWalletDetail(dto);
+		List<MemberWalletLogVO> memberWalletDetail = memberWalletLogMapper.getMemberWalletDetail(dto);
+		for (MemberWalletLogVO log : memberWalletDetail) {
+			if ("2".equals(log.getType()) && "21".equals(log.getSubType())) {
+				log.setAmount(null);
+			}
+		}
+		return memberWalletDetail;
 	}
 
+
 	@Override
 	public List<MemberWalletLogVO> getMemberWalletDetailV2(UniAppQueryMemberBalanceDTO dto) {
 		return memberWalletLogMapper.getMemberWalletDetailV2(dto);

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletLogServiceImpl.java

@@ -1,12 +1,21 @@
 package com.jsowell.pile.service.impl;
 
+import com.jsowell.common.exception.BusinessException;
 import com.jsowell.pile.domain.MemberWalletLog;
+import com.jsowell.pile.dto.QueryMemberInfoDTO;
 import com.jsowell.pile.mapper.MemberWalletLogMapper;
 import com.jsowell.pile.service.MemberWalletLogService;
+import com.jsowell.pile.vo.MemberWalletLogVO2;
+import com.jsowell.pile.vo.uniapp.customer.MemberVO;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class MemberWalletLogServiceImpl implements MemberWalletLogService {
@@ -73,5 +82,11 @@ public class MemberWalletLogServiceImpl implements MemberWalletLogService {
     public int batchInsert(List<MemberWalletLog> list) {
         return memberWalletLogMapper.batchInsert(list);
     }
+
+
+    @Override
+    public List<MemberWalletLogVO2> getByMemberId(String memberId) {
+        return memberWalletLogMapper.getByMemberId(memberId);
+    }
 }
 

jsowell-pile/src/main/java/com/jsowell/pile/vo/MemberWalletLogVO2.java

@@ -0,0 +1,93 @@
+package com.jsowell.pile.vo;
+import com.jsowell.common.annotation.Excel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.math.BigDecimal;
+/**
+ * 会员钱包余额明细相关
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class MemberWalletLogVO2 {
+	/**
+	 * 会员id
+	 */
+	@Excel(name = "会员id")
+	private String memberId;
+
+	/**
+	 *  交易类型  1-进账；2-出账
+	 */
+	@Excel(name = "交易类型", readConverterExp = "1=进账,2=出账")
+	private String type;
+
+	/**
+	 * 钱包编号
+	 */
+	@Excel(name = "钱包编号")
+	private String walletCode;
+
+	/**
+	 * 子类型  10-充值, 11-赠送, 12-订单结算退款，20-后管扣款, 21-订单付款, 22-用户退款
+	 */
+	@Excel(name = "操作类型(10-充值, 11-赠送, 12-订单结算退款，20-后管扣款, 21-订单付款, 22-用户退款)",
+			readConverterExp = "10=充值,11=赠送,12=订单结算退款,20=后管扣款,21=订单付款,22=用户退款")
+	private String subType;
+
+	/**
+	 * 充值/消费人员
+	 */
+	@Excel(name = "充值/消费人员")
+	private String createBy;
+
+	/**
+	 * 出账/入账金额
+	 */
+	@Excel(name = "出账/入账金额")
+	private BigDecimal amount;
+
+	/**
+	 * 交易时间
+	 */
+	@Excel(name = "交易时间")
+	private String transactionTime;
+
+	/**
+	 * 余额类型（1-本金，2-赠送）
+	 */
+	private String category;
+
+	/**
+	 * 关联订单
+	 */
+	private String relatedOrderCode;
+
+	/**
+	 * 支付金额
+	 */
+	private BigDecimal payAmount;
+
+	/**
+	 * 订单金额
+	 */
+	private BigDecimal orderAmount;
+
+	/**
+	 * 退款金额
+	 */
+	private BigDecimal refundAmount;
+
+	/**
+	 * 变动前金额
+	 */
+	private BigDecimal beforeAmount;
+
+	/**
+	 * 变动后金额
+	 */
+	private BigDecimal afterAmount;
+}

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletLogVO.java

@@ -31,6 +31,8 @@ public class MemberWalletLogVO {
 	/**
 	 * 子类型  10-充值, 11-赠送, 12-订单结算退款，20-后管扣款, 21-订单付款, 22-用户退款
 	 */
+	@Excel(name = "操作类型(10-充值, 11-赠送, 12-订单结算退款，20-后管扣款, 21-订单付款, 22-用户退款)",
+			readConverterExp = "10=充值,11=赠送,12=订单结算退款,20=后管扣款,21=订单付款,22=用户退款")
 	private String subType;
 
 	/**
@@ -42,6 +44,7 @@ public class MemberWalletLogVO {
 	/**
 	 * 出账/入账金额
 	 */
+	@Excel(name = "金额")
 	private BigDecimal amount;
 
 	/**
@@ -53,6 +56,7 @@ public class MemberWalletLogVO {
 	/**
 	 * 余额类型（1-本金，2-赠送）
 	 */
+	@Excel(name = "余额类型(1-本金，2-赠送)", readConverterExp = "1=本金,2=赠送")
 	private String category;
 
 	/**
@@ -94,6 +98,7 @@ public class MemberWalletLogVO {
 	/**
 	 * 操作人员
 	 */
+	@Excel(name = "操作人员")
 	private String createBy;
 
 	public String getSubTypeName() {