From 8faeaa64bb4ac2183c1bb67a2bc88ff70be36ab6 Mon Sep 17 00:00:00 2001 From: wanyongkang <937888580@qq.com> Date: Fri, 16 Oct 2020 12:14:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8D=B7=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Host/Controllers/UserController.cs | 28 ++++++++++--------- .../Service/Coupon/CouponService.cs | 2 +- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Host/Controllers/UserController.cs b/Host/Controllers/UserController.cs index 9710399..7306df2 100644 --- a/Host/Controllers/UserController.cs +++ b/Host/Controllers/UserController.cs @@ -583,7 +583,7 @@ namespace Home.Controllers var phone = notifyOrder.ReceiverMobile.NotHas() ? notifyOrder.ReceiverPhone : notifyOrder.ReceiverMobile; if (phone.NotHas()) return false; - var userEntity = await m_UserService.Query(m => m.Phone == phone || m.TaoBao == notifyOrder.BuyerNick).FirstOrDefaultAsync(); + var userEntity = await m_UserService.Query(m => m.Phone == phone).FirstOrDefaultAsync(); if (userEntity == null) @@ -640,34 +640,36 @@ namespace Home.Controllers return true; }; long aopic = long.Parse(this.Request.Query["aopic"]); + string datainfo = this.Request.Form["json"]; + var refundInfos = datainfo.FromJsonTo(); var info = ""; if (aopic == 2){ info = await m_TaoBaoService.ReceivedMsg(this.Request, process); } else if(aopic == 256){ - info = await m_TaoBaoRefundService.ReceivedRefundMsg(this.Request, refunds); + var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault(); + if (his_order == null){ + info = await m_TaoBaoRefundService.ReceivedRefundMsg(this.Request, refunds); + } else { + his_order.status = 0; + await m_TaoBaoRefundService.Update(his_order); + } - }else if(aopic == 131072){//卖家同意退款 - string data = this.Request.Form["json"]; - var refundInfo = data.FromJsonTo(); - var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfo.Tid).FirstOrDefault(); + }else if(aopic == 65536){//卖家同意退款 + + var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault(); his_order.status = 1; - await m_TaoBaoRefundService.Update(his_order); }else if(aopic == 262144){//拒绝退款 - string data = this.Request.Form["json"]; - var refundInfo = data.FromJsonTo(); - var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfo.Tid).FirstOrDefault(); + var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault(); his_order.status = 2; await m_TaoBaoRefundService.Update(his_order); }else if(aopic == 32768){//关闭 - string data = this.Request.Form["json"]; - var refundInfo = data.FromJsonTo(); - var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfo.Tid).FirstOrDefault(); + var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault(); his_order.status = 3; diff --git a/Services/Hncore.Pass.Sells/Service/Coupon/CouponService.cs b/Services/Hncore.Pass.Sells/Service/Coupon/CouponService.cs index 4a1e756..f60f3ac 100644 --- a/Services/Hncore.Pass.Sells/Service/Coupon/CouponService.cs +++ b/Services/Hncore.Pass.Sells/Service/Coupon/CouponService.cs @@ -128,7 +128,7 @@ namespace Hncore.Pass.Sells.Service { if (m_CouponUserOrginService.Exist(m => (m.ToUser == userId||m.ToUserRef== taobao) && m.CreateDate.Value.Month == DateTime.Now.Month)) return false; - return await this.Give(couponId, "", userId, 1, CouponOriginType.TaoBao); + return await this.Give(couponId, "", userId, 1, CouponOriginType.TaoBao,"系统赠送",taobao); } public async Task Freeze(int originId)