From 6491ed9c7f6504ffa2154f15865d997b757ba215 Mon Sep 17 00:00:00 2001
From: liuyingfang <1357764963@qq.com>
Date: Thu, 13 Apr 2023 09:29:49 +0800
Subject: [PATCH] =?UTF-8?q?pos=E7=BC=BA=E5=A4=B1VO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pluss/platform/vo/MerchantOrderPosVO.java | 26 +++++++++++++++++++
 .../impl/account/AccountServiceImpl.java      |  9 +++++++
 2 files changed, 35 insertions(+)
 create mode 100644 pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderPosVO.java

diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderPosVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderPosVO.java
new file mode 100644
index 0000000..effcfa0
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderPosVO.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.vo;
+
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author lyf
+ */
+@Getter
+@Setter
+public class MerchantOrderPosVO {
+    /**
+     * sxfPay0 支付宝支付, sxfPay1 微信支付
+     */
+    private String payTypeCode;
+    /**
+     * 消费金额
+     */
+    private Double consumeFee;
+    /**
+     * 交易状态 0:交易失败 1:交易成功 2：退款成功 3：退款失败 4：退款中 5:待付款  6部分退款 7:待确认
+     */
+    private String status;
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java
index 9ad09a9..1102143 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java
@@ -402,6 +402,15 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
             account.setChannelType(Account.CHANNEL_TYPE_D0);
             save(account);
         }
+        //TODO
+        // 如果不存在D1的结算信息，则直接将D0的结算信息带过来
+//        LambdaQueryWrapper<Account> qWrapperAccountD0 = Wrappers.lambdaQuery();
+//        qWrapperAccountD0.eq(Account::getUserId, accountDTO.getUserId()).eq(Account::getChannelType, Account.CHANNEL_TYPE_D1);
+//        int countD0 = baseMapper.selectCount(qWrapperAccountD0);
+//        if (countD0 == 0) {
+//            account.setChannelType(Account.CHANNEL_TYPE_D1);
+//            save(account);
+//        }
     }
 
     @Override