|
|
@@ -59,7 +59,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
Fields.Add("SeoKeyword", "1"); //订单编号
|
|
|
|
|
|
|
|
|
- string condition = " and Status>-1 and QueryCount=1";
|
|
|
+ string condition = " and Status>-1";
|
|
|
//创客编号
|
|
|
if (!string.IsNullOrEmpty(UserIdMakerCode))
|
|
|
{
|
|
|
@@ -89,18 +89,21 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
//订单信息
|
|
|
JsonData ApplyList = JsonMapper.ToObject(dic["SeoTitle"].ToString());//申请数据
|
|
|
dic["dPosCoupons"] = "";
|
|
|
- dic["dPosCoupons"] = "";
|
|
|
- for (int i = 0; i < ApplyList.Count; i++)
|
|
|
+ dic["bPosCoupons"] = "";
|
|
|
+ if (!string.IsNullOrEmpty(dic["SeoTitle"].ToString()))
|
|
|
{
|
|
|
- int num = Convert.ToInt32(ApplyList[i]["Num"].ToString());
|
|
|
- int type = Convert.ToInt32(ApplyList[i]["Type"].ToString());
|
|
|
- if (type == 1)
|
|
|
- {
|
|
|
- dic["dPosCoupons"] = num + "张";
|
|
|
- }
|
|
|
- else
|
|
|
+ for (int i = 0; i < ApplyList.Count; i++)
|
|
|
{
|
|
|
- dic["bPosCoupons"] = num + "张";
|
|
|
+ int num = Convert.ToInt32(ApplyList[i]["Num"].ToString());
|
|
|
+ int type = Convert.ToInt32(ApplyList[i]["Type"].ToString());
|
|
|
+ if (type == 1)
|
|
|
+ {
|
|
|
+ dic["dPosCoupons"] = num + "张";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ dic["bPosCoupons"] = num + "张";
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|