|
|
@@ -177,6 +177,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
|
|
|
Dictionary<string, string> Fields = new Dictionary<string, string>();
|
|
|
|
|
|
+ decimal ReturnAmounts = 0.00M;
|
|
|
string condition = " and Status>-1 and StandardStatus=-2";
|
|
|
//身份证号
|
|
|
if (!string.IsNullOrEmpty(MerIdcardNo))
|
|
|
@@ -257,7 +258,36 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
int MerUserType = int.Parse(dic["MerUserType"].ToString());
|
|
|
if (MerUserType == 0) dic["MerUserType"] = "非商户型创客";
|
|
|
if (MerUserType == 1) dic["MerUserType"] = "商户型创客";
|
|
|
+
|
|
|
+ var KqSnNo = dic["KqSnNo"].ToString();
|
|
|
+ var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == KqSnNo) ?? new PosMachinesTwo();
|
|
|
+ //实际押金
|
|
|
+ string SeoKeyword = pos.SeoKeyword.ToString();
|
|
|
+ ReturnAmounts += decimal.Parse(function.CheckNum(SeoKeyword));
|
|
|
+ if (SeoKeyword.Length > 3)
|
|
|
+ {
|
|
|
+ SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
|
|
|
+ }
|
|
|
+ dic["SeoKeyword"] = SeoKeyword;
|
|
|
+
|
|
|
+ //设置押金
|
|
|
+ string PrizeParams = "0";
|
|
|
+ if (!string.IsNullOrEmpty(pos.PrizeParams))
|
|
|
+ {
|
|
|
+ PrizeParams = pos.PrizeParams.ToString();
|
|
|
+ }
|
|
|
+ dic["PrizeParams"] = PrizeParams;
|
|
|
}
|
|
|
+ Dictionary<string, object> other = new Dictionary<string, object>();
|
|
|
+ decimal ReturnAmount = 0.00M;
|
|
|
+ DataTable dt = OtherMySqlConn.dtable("SELECT SUM(Remark) FROM PosMerchantInfo WHERE 1=1" + condition);
|
|
|
+ if (dt.Rows.Count > 0)
|
|
|
+ {
|
|
|
+ ReturnAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString()));
|
|
|
+ }
|
|
|
+ other.Add("ReturnAmount", ReturnAmount.ToString("f2"));
|
|
|
+ other.Add("ReturnAmounts", ReturnAmounts.ToString("f2"));
|
|
|
+ obj.Add("other", other);
|
|
|
return Json(obj);
|
|
|
}
|
|
|
|