pos缺失VO

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

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