From 20474cd13f5ad8c4b7f1d94d2f2242d13e660a47 Mon Sep 17 00:00:00 2001
From: wanyongkang <937888580@qq.com>
Date: Mon, 12 Oct 2020 18:08:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=94=AF=E4=BB=98=E5=AE=9D?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Controllers/ProductController.cs   |  2 +-
 Host/Controllers/UserController.cs      | 12 ++++-
 Host/Views.Mobile/Product/buy.cshtml    |  6 +--
 Host/Views.Mobile/User/CashOut.cshtml   | 60 ++++++++++++++++++++++
 Host/Views.Mobile/User/Index.cshtml     |  1 +
 Host/Views.Mobile/User/IndexInfo.cshtml |  2 +-
 Host/Views/Product/buy.cshtml           | 10 ++--
 Host/Views/Product/rebuy.cshtml         |  6 +--
 Host/Views/Shared/_UserLayout.cshtml    |  3 ++
 Host/Views/User/CashOut.cshtml          | 66 +++++++++++++++++++++++++
 Host/Views/User/Index.cshtml            |  2 +-
 11 files changed, 154 insertions(+), 16 deletions(-)
 create mode 100644 Host/Views.Mobile/User/CashOut.cshtml
 create mode 100644 Host/Views/User/CashOut.cshtml

diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs
index bffaaf0..f90fdb1 100644
--- a/Host/Controllers/ProductController.cs
+++ b/Host/Controllers/ProductController.cs
@@ -295,7 +295,7 @@ namespace Home.Controllers
                 {
                     Body = request.PackageName,
                     Subject = oName,
-                    TotalAmount = request.OtherPayAmount.ToString(),
+                    TotalAmount = decimal.Round(decimal.Parse(request.OtherPayAmount.ToString()),2).ToString(),
                     OutTradeNo = request.OrderNo,
                     ProductCode = "FAST_INSTANT_TRADE_PAY",//QUICK_WAP_PAY
                     TimeoutExpress="15m"
diff --git a/Host/Controllers/UserController.cs b/Host/Controllers/UserController.cs
index f6c3006..136b4a3 100644
--- a/Host/Controllers/UserController.cs
+++ b/Host/Controllers/UserController.cs
@@ -534,10 +534,18 @@ namespace Home.Controllers
         public async Task<IActionResult> MyCoupons()
         {
             var userId =this.Request.GetUserInfo().UserId;   
-            var model = await m_CouponService.GetUserCoupon(userId);          
+            var model = await m_CouponService.GetUserCoupon(userId);     
             return View(model);
         }
 
+        [HttpGet]
+        [UserAuth]
+        public IActionResult CashOut()
+        {
+            var userId =this.Request.GetUserInfo().UserId;           
+            return View();
+        }
+
         /// <summary>
         /// 发送手机验证码
         /// </summary>
@@ -598,7 +606,7 @@ namespace Home.Controllers
                 };
                 var retAmount = await m_UserService.UpdateAmount(amountInfo);
 
-                await m_CouponService.TaoBaoGive(userEntity.Id, 1, userEntity.TaoBao);
+                await m_CouponService.TaoBaoGive(userEntity.Id, 9, userEntity.TaoBao);
 
 
                 var taobaoEntity = notifyOrder.MapTo<TaoBaoOrderEntity>();
diff --git a/Host/Views.Mobile/Product/buy.cshtml b/Host/Views.Mobile/Product/buy.cshtml
index 49567c6..046aaf2 100644
--- a/Host/Views.Mobile/Product/buy.cshtml
+++ b/Host/Views.Mobile/Product/buy.cshtml
@@ -180,20 +180,20 @@
         </div>
         <div class="row">
             <div class="col-sm-5 col-xs-5">
-                应付款：
+                总金额：
             </div>
             <div class="col-sm-7 col-xs-7">
                 <span>{{OneTotalAmount}}</span>元
             </div>
         </div>
-        @* <div class="row">
+        <div class="row">
             <div class="col-sm-5 col-xs-5">
                 应付款：
             </div>
             <div class="col-sm-7 col-xs-7">
                 <span class="yingfu" style="font-size: 35px;font-weight: bold;">{{OnePayAmount}}</span>元
             </div>
-        </div> *@
+        </div>
         <p class="grayText songquan">每隔30天淘宝下单可获得一张优惠券</p>
         <p class="redText songquan">{{Tip}}</p>
         <div class="ok">
diff --git a/Host/Views.Mobile/User/CashOut.cshtml b/Host/Views.Mobile/User/CashOut.cshtml
new file mode 100644
index 0000000..1e21aa8
--- /dev/null
+++ b/Host/Views.Mobile/User/CashOut.cshtml
@@ -0,0 +1,60 @@
+
+@{
+    Layout = "_Layout";
+}
+<div id="app" style="margin-top: 10%;">
+    <table class="table">
+    <caption>提现管理</caption>
+    <thead>
+        <tr>
+            <th>提现金额</th>
+            <th>支付宝账号</th>
+            <th>状态</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr v-for="info in tableData">
+            <td>{{info.money}}</td>
+            <td>{{info.alipay_account}}</td>
+            <td>{{info.status}}</td>
+        </tr>
+    </tbody>
+    </table>
+</div>
+<script>
+   var vm = new Vue({
+	    el:'#app',
+	    data:{
+	        tableData: [],
+	    },
+        created:function(){
+            this.post();
+        },
+	    methods:{
+            post:function(){
+                var param = [];
+                let cashOutData = {
+                    cookie:document.cookie
+                }
+                $.ajax({
+                    type: 'POST',
+                    async:false,
+                    url: 'http://autophp.wyk/order/index/getData',
+                    dataType: "json",
+                    contentType: "application/json",
+                    data: JSON.stringify(cashOutData),
+                    beforeSend: function(xhr) {
+                        xhr.withCredentials = true;
+                    },
+                    crossDomain: true,
+                    success: function (res) {
+                        if (res.Code == 10000) {
+                            param = res.data;
+                        }
+                    }
+                });
+                this.tableData = param;
+	        }
+	    }
+	});
+</script>
\ No newline at end of file
diff --git a/Host/Views.Mobile/User/Index.cshtml b/Host/Views.Mobile/User/Index.cshtml
index 93ccc37..e427f93 100644
--- a/Host/Views.Mobile/User/Index.cshtml
+++ b/Host/Views.Mobile/User/Index.cshtml
@@ -15,5 +15,6 @@
     <li><img src="~/m/img/p2.png"><a asp-action="myrefundorders" asp-controller="user">退货订单<img src="~/m/img/arrow.png"></a></li>
     <li><img src="~/m/img/p3.png"><a asp-action="myaccounts" asp-controller="user">PPTP账号管理<img src="~/m/img/arrow.png"></a></li>
     <li><img src="~/m/img/p4.png"><a asp-action="mycoupons" asp-controller="user">我的优惠券<img src="~/m/img/arrow.png"></a></li>
+    @* <li><img src="~/m/img/p4.png"></span><a asp-action="cashout" asp-controller="user">提现管理<img src="~/m/img/arrow.png"></a></li> *@
 </ul>
 
diff --git a/Host/Views.Mobile/User/IndexInfo.cshtml b/Host/Views.Mobile/User/IndexInfo.cshtml
index a30e15e..e40d63d 100644
--- a/Host/Views.Mobile/User/IndexInfo.cshtml
+++ b/Host/Views.Mobile/User/IndexInfo.cshtml
@@ -112,7 +112,7 @@
     <div class="accout_tit">
         <span class="lineBar"></span>余额  
         <button class="btnXq" onclick="$('#chargeBox').show()">充值</button>
-        <button class="btnXq" onclick="$('#cash-out').show()">提现</button>
+        @* <button class="btnXq" onclick="$('#cash-out').show()">提现</button> *@
     </div>
     <div class="model">
         <div class="item">
diff --git a/Host/Views/Product/buy.cshtml b/Host/Views/Product/buy.cshtml
index 0b9ea89..ab2588a 100644
--- a/Host/Views/Product/buy.cshtml
+++ b/Host/Views/Product/buy.cshtml
@@ -199,7 +199,7 @@
             </div>
             <div class="row">
                 <div class="col-lg-4 text-right">
-                    应付款：
+                    总金额：
                 </div>
                 <div class="col-lg-4">
                     <span class="blueText">{{OneTotalAmount}}</span>元
@@ -208,7 +208,7 @@
                     <span></span>
                 </div>
             </div>
-            @* <div class="row">
+            <div class="row">
                 <div class="col-lg-4 text-right">
                     应付款：
                 </div>
@@ -218,7 +218,7 @@
                 <div class="col-lg-4 text-left">
                     <span></span>
                 </div>
-            </div> *@
+            </div>
             <p class="tiijiao-tipjiao" style="color:red">{{Tip}}</p>
             <p class="tijiao"><button class="btn btn-primary" type="button" v-on:click="onePay">确认支付</button></p>
 
@@ -351,7 +351,7 @@
                     <span></span>
                 </div>
             </div>
-            @* <div class="row">
+            <div class="row">
                 <div class="col-lg-4 text-right">
                     应付款：
                 </div>
@@ -361,7 +361,7 @@
                 <div class="col-lg-4 text-left">
                     <span></span>
                 </div>
-            </div> *@
+            </div>
             <p class="ijiao-tip" style="color:red">{{Tip}}</p>
             <p class="tijiao"><button class="btn btn-primary" type="button" v-on:click="morePay">确认支付</button></p>
         </form>
diff --git a/Host/Views/Product/rebuy.cshtml b/Host/Views/Product/rebuy.cshtml
index 33ae7bc..e021365 100644
--- a/Host/Views/Product/rebuy.cshtml
+++ b/Host/Views/Product/rebuy.cshtml
@@ -167,7 +167,7 @@
             </div>
             <div class="row">
                 <div class="col-lg-4 text-right">
-                    应付款：
+                    总金额：
                 </div>
                 <div class="col-lg-4">
                     <span class="blueText">{{TotalAmount}}</span>元
@@ -176,7 +176,7 @@
                     <span></span>
                 </div>
             </div>
-            @* <div class="row">
+            <div class="row">
                 <div class="col-lg-4 text-right">
                     应付款：
                 </div>
@@ -186,7 +186,7 @@
                 <div class="col-lg-4 text-left">
                     <span></span>
                 </div>
-            </div> *@
+            </div>
             <p class="ijiao-tip" style="color:red">{{Tip}}</p>
             <p class="tijiao"><button class="btn btn-primary" type="button" v-on:click="onePay">确认支付</button></p>
 
diff --git a/Host/Views/Shared/_UserLayout.cshtml b/Host/Views/Shared/_UserLayout.cshtml
index 85db074..30adb2c 100644
--- a/Host/Views/Shared/_UserLayout.cshtml
+++ b/Host/Views/Shared/_UserLayout.cshtml
@@ -76,6 +76,9 @@
                 <div class="item @(currentPath=="/user/mycoupons"?"active_b":"")">
                     <img src="~/img/p5.png"><a href="/user/mycoupons">我的优惠券</a>
                 </div>
+                @* <div class="item @(currentPath=="/user/cashout"?"active_b":"")">
+                    <span class="glyphicon glyphicon-jpy" style="padding: 10px;"></span><a href="/user/cashout">提现管理</a>
+                </div> *@
             </div>
         </div>
         <div class="col-lg-10 rightCon">
diff --git a/Host/Views/User/CashOut.cshtml b/Host/Views/User/CashOut.cshtml
new file mode 100644
index 0000000..e4e9440
--- /dev/null
+++ b/Host/Views/User/CashOut.cshtml
@@ -0,0 +1,66 @@
+
+@{
+    Layout = "_UserLayout";
+}
+<div id="app">
+    <table class="table">
+    <caption>提现管理</caption>
+    <thead>
+        <tr>
+            <th>用户</th>
+            <th>提现金额</th>
+            <th>提现理由</th>
+            <th>支付宝账号</th>
+            <th>状态</th>
+            <th>提现时间</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr v-for="info in tableData">
+            <td>{{info.username}}</td>
+            <td>{{info.money}}</td>
+            <td>{{info.reason}}</td>
+            <td>{{info.alipay_account}}</td>
+            <td>{{info.status}}</td>
+            <td>{{info.create_time}}</td>
+        </tr>
+    </tbody>
+    </table>
+</div>
+<script>
+   var vm = new Vue({
+	    el:'#app',
+	    data:{
+	        tableData: [],
+	    },
+        created:function(){
+            this.post();
+        },
+	    methods:{
+            post:function(){
+                var param = [];
+                let cashOutData = {
+                    cookie:document.cookie
+                }
+                $.ajax({
+                    type: 'POST',
+                    async:false,
+                    url: 'http://autophp.wyk/order/index/getData',
+                    dataType: "json",
+                    contentType: "application/json",
+                    data: JSON.stringify(cashOutData),
+                    beforeSend: function(xhr) {
+                        xhr.withCredentials = true;
+                    },
+                    crossDomain: true,
+                    success: function (res) {
+                        if (res.Code == 10000) {
+                            param = res.data;
+                        }
+                    }
+                });
+                this.tableData = param;
+	        }
+	    }
+	});
+</script>
\ No newline at end of file
diff --git a/Host/Views/User/Index.cshtml b/Host/Views/User/Index.cshtml
index bfd95aa..5fc9746 100644
--- a/Host/Views/User/Index.cshtml
+++ b/Host/Views/User/Index.cshtml
@@ -268,7 +268,7 @@
     <div class="col-lg-3">
         <div class="zhanghu">
             <div class="accout_tit"><span class="lineBar"></span>余额</div>
-            <p class="charge"  onclick="$('.cash-out').show()"  style="float:left;font-size:25px;"><a>提现</a></p>
+            @* <p class="charge"  onclick="$('.cash-out').show()"  style="float:left;font-size:25px;"><a>提现</a></p> *@
             <p class="charge"  onclick="$('.chargeList').show()"  style="font-size:25px;"><a>充值</a></p>
             <div class="money" style="padding: 20px 30px;">¥<span>@Model.UserModel.RestAmount</span></div>
             <p class="grayText text-center">可通过淘宝充值，或联系管理员充值</p>