From 7d612f4032de9830c5a2ee549d134c2581c6e674 Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Fri, 27 May 2022 18:26:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=AE=A1=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/Models/Enums.cs | 7 +++ .../FinancialTerminal/PayBills/AliPayBill.cs | 15 +++++ .../FinancialTerminal/PayBills/PayBill.cs | 61 +++++++++++++++++++ .../FinancialTerminal/PayBills/WXPayBill.cs | 10 +++ .../ProcurementAuditViewModel.cs | 11 ++++ BBWY.Client/ViewModels/MainViewModel.cs | 9 +++ .../FinancialTerminal/ProcurementAudit.xaml | 14 +++++ .../ProcurementAudit.xaml.cs | 26 ++++++++ 8 files changed, 153 insertions(+) create mode 100644 BBWY.Client/Models/FinancialTerminal/PayBills/AliPayBill.cs create mode 100644 BBWY.Client/Models/FinancialTerminal/PayBills/PayBill.cs create mode 100644 BBWY.Client/Models/FinancialTerminal/PayBills/WXPayBill.cs create mode 100644 BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs create mode 100644 BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml create mode 100644 BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml.cs diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs index 3790cc9d..ca3fa77a 100644 --- a/BBWY.Client/Models/Enums.cs +++ b/BBWY.Client/Models/Enums.cs @@ -99,4 +99,11 @@ 在线采购 = 0, 关联订单 = 1 } + + public enum PayBillType + { + AliPay = 0, + WeiXin = 1, + BankCard = 2 + } } diff --git a/BBWY.Client/Models/FinancialTerminal/PayBills/AliPayBill.cs b/BBWY.Client/Models/FinancialTerminal/PayBills/AliPayBill.cs new file mode 100644 index 00000000..a3212a8c --- /dev/null +++ b/BBWY.Client/Models/FinancialTerminal/PayBills/AliPayBill.cs @@ -0,0 +1,15 @@ +namespace BBWY.Client.Models +{ + public class AliPayBill : PayBill + { + public AliPayBill() + { + PayBillType = PayBillType.AliPay; + } + + public override string GetMerchantOrderNo() + { + return base.GetMerchantOrderNo(); + } + } +} diff --git a/BBWY.Client/Models/FinancialTerminal/PayBills/PayBill.cs b/BBWY.Client/Models/FinancialTerminal/PayBills/PayBill.cs new file mode 100644 index 00000000..7d75de9a --- /dev/null +++ b/BBWY.Client/Models/FinancialTerminal/PayBills/PayBill.cs @@ -0,0 +1,61 @@ +using System; + +namespace BBWY.Client.Models +{ + public class PayBill + { + /// + /// 账单流水号 + /// + public string PayBillNo { get; set; } + + /// + /// 支付时间 + /// + public DateTime? PayTime { get; set; } + + /// + /// 账单类型 + /// + public PayBillType PayBillType { get; set; } + + /// + /// 商家订单号 + /// + public string MerchantOrderNo { get; set; } + + /// + /// 商品名称 + /// + public string ProductName { get; set; } + + /// + /// 对方账户 + /// + public string OppositeAccount { get; set; } + + /// + /// 支出金额 + /// + public decimal ExpenditureAmount { get; set; } + + /// + /// 归属店铺 + /// + public string BelongShop { get; set; } + + /// + /// 错误信息 + /// + public string ErrorMessage { get; set; } + + /// + /// 提取商家订单号 + /// + /// + public virtual string GetMerchantOrderNo() + { + return MerchantOrderNo; + } + } +} diff --git a/BBWY.Client/Models/FinancialTerminal/PayBills/WXPayBill.cs b/BBWY.Client/Models/FinancialTerminal/PayBills/WXPayBill.cs new file mode 100644 index 00000000..3050541d --- /dev/null +++ b/BBWY.Client/Models/FinancialTerminal/PayBills/WXPayBill.cs @@ -0,0 +1,10 @@ +namespace BBWY.Client.Models +{ + public class WXPayBill : PayBill + { + public WXPayBill() + { + PayBillType = PayBillType.WeiXin; + } + } +} diff --git a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs new file mode 100644 index 00000000..3bab6155 --- /dev/null +++ b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace BBWY.Client.ViewModels +{ + public class ProcurementAuditViewModel : BaseVM + { + + } +} diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs index 6042e405..d69f0a91 100644 --- a/BBWY.Client/ViewModels/MainViewModel.cs +++ b/BBWY.Client/ViewModels/MainViewModel.cs @@ -110,6 +110,15 @@ namespace BBWY.Client.ViewModels new MenuModel(){ Name="店铺设置",Url="/Views/Setting/ShopSetting.xaml" }, new MenuModel(){ Name="团队配置",Url="/Views/Setting/TeamSetting.xaml" } } + }, + new MenuModel() + { + Name="财务端",ChildList=new List() + { + new MenuModel(){ Name="采购审计",Url="/Views/FinancialTerminal/ProcurementAudit.xaml" } + //new MenuModel(){ Name="补单审计",Url="/Views/FinancialTerminal/ShopSetting.xaml" }, + //new MenuModel(){ Name="利润表",Url="/Views/FinancialTerminal/ShopSetting.xaml" } + } } }; Task.Factory.StartNew(Login); diff --git a/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml b/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml new file mode 100644 index 00000000..98db0710 --- /dev/null +++ b/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml @@ -0,0 +1,14 @@ + + + + + + diff --git a/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml.cs b/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml.cs new file mode 100644 index 00000000..67eaed14 --- /dev/null +++ b/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace BBWY.Client.Views.FinancialTerminal +{ + /// + /// ProcurementAudit.xaml 的交互逻辑 + /// + public partial class ProcurementAudit : Page + { + public ProcurementAudit() + { + InitializeComponent(); + } + } +}