|
|
@@ -139,7 +139,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
|
|
|
curData.Add("PayMode", subdata["PayMode"].ToString()); //交易平台(1 支付宝 2 微信)
|
|
|
curData.Add("OrderNo", subdata["OrderNo"].ToString()); //交易号
|
|
|
curData.Add("CreateDate", subdata["CreateDate"].ToString() == "" ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //交易时间
|
|
|
- curData.Add("MaxDivi", ConsumerProfitService.Sum(" 1=1 and OrderId=" + subdata["Id"].ToString() + "","GetMoney").ToString("f2")); //分账金额
|
|
|
+ curData.Add("MaxDivi", ConsumerProfitService.Sum(" 1=1 and OrderId=" + subdata["Id"].ToString() + "", "GetMoney").ToString("f2")); //分账金额
|
|
|
if (query.SubjectType == "SUBJECT_TYPE_ENTERPRISE") subjectType = 1; //企业公司
|
|
|
if (query.SubjectType == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户
|
|
|
if (query.SubjectType == "SUBJECT_TYPE_SMALL") subjectType = 3; //小微
|
|
|
@@ -148,6 +148,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
|
|
|
var divideFlag = 0;
|
|
|
var isAct = int.Parse(subdata["IsAct"].ToString());
|
|
|
var dFlag = int.Parse(subdata["DivideFlag"].ToString());
|
|
|
+ curData.Add("IsAct", isAct); //是否参与活动(0 否 1 是)
|
|
|
if (isAct == 0 && dFlag == 0)
|
|
|
{
|
|
|
divideFlag = -1;
|