Merge branch 'dev' into dev-g

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

@@ -1,6 +1,7 @@
 package com.jsowell.pile.vo.uniapp.customer;
 
 import com.jsowell.common.annotation.Excel;
+import com.jsowell.common.enums.MemberWalletEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -30,9 +31,14 @@ public class MemberWalletLogVO {
 	/**
 	 * 子类型  10-充值, 11-赠送, 12-订单结算退款，20-后管扣款, 21-订单付款, 22-用户退款
 	 */
-	@Excel(name = "操作类型(10-充值, 11-赠送, 12-订单结算退款，20-后管扣款, 21-订单付款, 22-用户退款)")
 	private String subType;
 
+	/**
+	 * 子类型名称
+	 */
+	@Excel(name = "操作类型")
+	private String subTypeName;
+
 	/**
 	 * 出账/入账金额
 	 */
@@ -52,6 +58,7 @@ public class MemberWalletLogVO {
 	/**
 	 * 关联订单
 	 */
+	@Excel(name = "关联订单号")
 	private String relatedOrderCode;
 
 	/**
@@ -75,15 +82,21 @@ public class MemberWalletLogVO {
 	/**
 	 * 变动前金额
 	 */
+	@Excel(name = "变动前金额")
 	private BigDecimal beforeAmount;
 
 	/**
 	 * 变动后金额
 	 */
+	@Excel(name = "变动后金额")
 	private BigDecimal afterAmount;
 
 	/**
 	 * 操作人员
 	 */
 	private String createBy;
+
+	public String getSubTypeName() {
+		return MemberWalletEnum.getLabelByValue(this.subType);
+	}
 }

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java

@@ -248,6 +248,11 @@ public class OrderListVO {
     @Excel(name = "结算金额")
     private String settleAmount;
 
+    /**
+     * 实收金额
+     */
+    private BigDecimal actualReceivedAmount;
+
     /**
      * 交易服务费/通道手续费
      */