wyk/juipnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优惠卷调整

Browse Source
This commit is contained in:
wanyongkang
2020-10-16 12:14:19 +08:00
parent a9ce8c8d01
commit 8faeaa64bb
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Host/Controllers/UserController.cs
View File

@@ -583,7 +583,7 @@ namespace Home.Controllers
var phone = notifyOrder.ReceiverMobile.NotHas() ? notifyOrder.ReceiverPhone : notifyOrder.ReceiverMobile; var phone = notifyOrder.ReceiverMobile.NotHas() ? notifyOrder.ReceiverPhone : notifyOrder.ReceiverMobile;
if (phone.NotHas()) return false; 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) if (userEntity == null)
@@ -640,34 +640,36 @@ namespace Home.Controllers
return true; return true;
}; };
long aopic = long.Parse(this.Request.Query["aopic"]); long aopic = long.Parse(this.Request.Query["aopic"]);
string datainfo = this.Request.Form["json"];
var refundInfos = datainfo.FromJsonTo<TaoBaoRefundModel>();
var info = ""; var info = "";
if (aopic == 2){ if (aopic == 2){
info = await m_TaoBaoService.ReceivedMsg(this.Request, process); info = await m_TaoBaoService.ReceivedMsg(this.Request, process);
} else if(aopic == 256){ } 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){//卖家同意退款 }else if(aopic == 65536){//卖家同意退款
string data = this.Request.Form["json"];
var refundInfo = data.FromJsonTo<TaoBaoRefundModel>(); var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault();
var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfo.Tid).FirstOrDefault();
his_order.status = 1; his_order.status = 1;
await m_TaoBaoRefundService.Update(his_order); await m_TaoBaoRefundService.Update(his_order);
}else if(aopic == 262144){//拒绝退款 }else if(aopic == 262144){//拒绝退款
string data = this.Request.Form["json"]; var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault();
var refundInfo = data.FromJsonTo<TaoBaoRefundModel>();
var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfo.Tid).FirstOrDefault();
his_order.status = 2; his_order.status = 2;
await m_TaoBaoRefundService.Update(his_order); await m_TaoBaoRefundService.Update(his_order);
}else if(aopic == 32768){//关闭 }else if(aopic == 32768){//关闭
string data = this.Request.Form["json"]; var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault();
var refundInfo = data.FromJsonTo<TaoBaoRefundModel>();
var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfo.Tid).FirstOrDefault();
his_order.status = 3; his_order.status = 3;

2
Services/Hncore.Pass.Sells/Service/Coupon/CouponService.cs
View File

@@ -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)) if (m_CouponUserOrginService.Exist(m => (m.ToUser == userId||m.ToUserRef== taobao) && m.CreateDate.Value.Month == DateTime.Now.Month))
return false; return false;
return await this.Give(couponId, "", userId, 1, CouponOriginType.TaoBao); return await this.Give(couponId, "", userId, 1, CouponOriginType.TaoBao,"系统赠送",taobao);
} }
public async Task<bool> Freeze(int originId) public async Task<bool> Freeze(int originId)