From d44dc4e799754c887d92fb2b10603ea9b76ac151 Mon Sep 17 00:00:00 2001
From: damonyuan <404054358@qq.com>
Date: Mon, 21 Oct 2024 00:27:57 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E9=80=89=E6=8B=A9=E6=94=AF=E4=BB=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mdd/common/entity/RechargeOrder.java |  3 ++-
 .../mdd/front/service/impl/PayServiceImpl.java    | 15 +++++++++++++--
 .../java/com/mdd/front/vo/pay/PayWayInfoVo.java   |  5 +++++
 .../java/com/mdd/front/vo/pay/PayWayListVo.java   |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/server/like-common/src/main/java/com/mdd/common/entity/RechargeOrder.java b/server/like-common/src/main/java/com/mdd/common/entity/RechargeOrder.java
index 39713435..45058f4c 100644
--- a/server/like-common/src/main/java/com/mdd/common/entity/RechargeOrder.java
+++ b/server/like-common/src/main/java/com/mdd/common/entity/RechargeOrder.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 
 @Data
 @ApiModel("充值订单实体类")
@@ -48,7 +49,7 @@ public class RechargeOrder {
     @ApiModelProperty("退款状态: [0=未退款 , 1=已退款]")
     private Integer refundStatus;
     @ApiModelProperty("退款交易流水号")
-    private Integer refundTransactionId;
+    private BigInteger refundTransactionId;
     @ApiModelProperty("创建时间")
     private Long createTime;
 
diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java
index f610d7c7..8b84c579 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java
@@ -9,6 +9,7 @@ import com.mdd.common.entity.user.UserAuth;
 import com.mdd.common.enums.ClientEnum;
 import com.mdd.common.enums.LogMoneyEnum;
 import com.mdd.common.enums.PaymentEnum;
+import com.mdd.common.enums.YesNoEnum;
 import com.mdd.common.exception.OperateException;
 import com.mdd.common.exception.PaymentException;
 import com.mdd.common.mapper.log.UserAccountLogMapper;
@@ -69,7 +70,7 @@ public class PayServiceImpl implements IPayService {
         List<DevPayWay> devPayWays = devPayWayMapper.selectList(
                 new QueryWrapper<DevPayWay>()
                     .eq("scene", terminal)
-                    .eq("status", 1));
+                    .eq("status", YesNoEnum.YES.getCode()).orderByDesc("is_default").orderByAsc("id"));
 
         PayWayListVo vo = new PayWayListVo();
         if (from.equals("recharge")) {
@@ -90,10 +91,20 @@ public class PayServiceImpl implements IPayService {
             infoVo.setName(devPayConfig.getName());
             infoVo.setIcon(UrlUtils.toAbsoluteUrl(devPayConfig.getIcon()));
             infoVo.setIsDefault(way.getIsDefault());
+            infoVo.setSort(devPayConfig.getSort());
+            infoVo.setRemark(devPayConfig.getRemark());
+            infoVo.setPayWay(devPayConfig.getPayWay());
+            if (devPayConfig.getPayWay().equals(PaymentEnum.WX_PAY.getCode())) {
+                infoVo.setExtra("微信快捷支付");
+            }
+            if (devPayConfig.getPayWay().equals(PaymentEnum.ALI_PAY.getCode())) {
+                infoVo.setExtra("支付宝快捷支付");
+            }
+
             list.add(infoVo);
         }
 
-        vo.setList(list);
+        vo.setLists(list);
         return vo;
     }
 
diff --git a/server/like-front/src/main/java/com/mdd/front/vo/pay/PayWayInfoVo.java b/server/like-front/src/main/java/com/mdd/front/vo/pay/PayWayInfoVo.java
index 03568fc2..e76a050d 100644
--- a/server/like-front/src/main/java/com/mdd/front/vo/pay/PayWayInfoVo.java
+++ b/server/like-front/src/main/java/com/mdd/front/vo/pay/PayWayInfoVo.java
@@ -24,4 +24,9 @@ public class PayWayInfoVo implements Serializable {
     @ApiModelProperty(value = "是否默认: [0=否, 1=是]")
     private Integer isDefault;
 
+    private String extra;
+    private Integer payWay;
+    private String remark;
+    private Integer sort;
+
 }
diff --git a/server/like-front/src/main/java/com/mdd/front/vo/pay/PayWayListVo.java b/server/like-front/src/main/java/com/mdd/front/vo/pay/PayWayListVo.java
index 9465d80f..c1fb71d0 100644
--- a/server/like-front/src/main/java/com/mdd/front/vo/pay/PayWayListVo.java
+++ b/server/like-front/src/main/java/com/mdd/front/vo/pay/PayWayListVo.java
@@ -16,6 +16,6 @@ public class PayWayListVo implements Serializable {
     private BigDecimal orderAmount;
 
     @ApiModelProperty(value = "方式列表")
-    private List<PayWayInfoVo> list;
+    private List<PayWayInfoVo> lists;
 
 }