Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/glms/feature/1.4.2' into glms/feature/1.4.2-margin

Browse Source
This commit is contained in:
锦麟 王
2026-08-13 14:02:16 +08:00
parent e8bb04d6bf 9df39491da
commit 07d7eee418
61 changed files with 1702 additions and 1981 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpWeb/Controllers/SwapTrade2Controller.cs
-50
View File
@@ -352,36 +352,6 @@ namespace YLErp.Web.Controllers
return View(model);
}
/// <summary>
/// 收益互换 多空组合平仓
/// </summary>
/// <param name="enid"></param>
/// <returns></returns>
public ActionResult SwapLongShortUnwind(string enid, bool isUseApproval = false)
{
var intid = DecryptInt(enid);
var model = new SwapDealService(CurUser).InitLongShortUnwind(intid, SwapEventTypeEnum.平仓);
ViewBag.isUseApproval = isUseApproval;
var hasProcess = new SwapDealService(CurUser).HasTradeProcess();
//需要审批或者复核的交易都会显示行权审核提交按钮
ViewBag.IsShowReCheckClose = (valuedateBLL.SystemDate.CloseReCheck == 1) || (valuedateBLL.SystemDate.CloseReApprove == 1 && hasProcess);
return View(model);
}
/// <summary>
/// 收益互换 多空组合互换
/// </summary>
/// <param name="enid"></param>
/// <returns></returns>
public ActionResult SwapLongShortSwap(string enid, bool isUseApproval = false)
{
var intid = DecryptInt(enid);
var model = new SwapDealService(CurUser).InitLongShortUnwind(intid, SwapEventTypeEnum.互换);
ViewBag.isUseApproval = isUseApproval;
var hasProcess = new SwapDealService(CurUser).HasTradeProcess();
//需要审批或者复核的交易都会显示行权审核提交按钮
ViewBag.IsShowReCheckClose = (valuedateBLL.SystemDate.CloseReCheck == 1) || (valuedateBLL.SystemDate.CloseReApprove == 1 && hasProcess);
return View(model);
}
/// <summary>
/// 操作历史
/// </summary>
/// <param name="enid"></param>
@@ -457,26 +427,6 @@ namespace YLErp.Web.Controllers
return JsonSuccess("平仓成功");
}
/// <summary>
///多空组合 平仓
/// </summary>
/// <param name="swap_Deal"></param>
/// <returns></returns>
public JsonResult SwapLongShortUnwindJson(UnwindData unwindData)
{
new SwapDealService(CurUser).SwapLongShortUnwind(unwindData);
return JsonSuccess("平仓成功");
}
/// <summary>
///多空组合 互换
/// </summary>
/// <param name="swap_Deal"></param>
/// <returns></returns>
public JsonResult SwapLongShortJson(UnwindData unwindData)
{
new SwapDealService(CurUser).SwapLongShort(unwindData);
return JsonSuccess("互换成功");
}
/// <summary>
/// 互换
/// </summary>
/// <param name="swap_Deal"></param>