创客-首页-进件查询-详情状态显示调整

Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -93,14 +93,40 @@ namespace MySystem.Areas.Api.Controllers.v1
             int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
             MerchantInfo query = MerchantInfoService.Query(Id);
             MerchantAddInfo addInfo = MerchantAddInfoService.Query(Id);
+            // Obj.Add("Name", query.Name); //名称
+            // Obj.Add("CreateDate", query.CreateDate == null ? "" : query.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //提交时间
+
+            // Obj.Add("Status", addInfo.Status);
+            // Obj.Add("DoTime", addInfo.UpdateDate == null ? "" : addInfo.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss"));
+            // Obj.Add("Season", addInfo.WeChatRemark);
+            // Obj.Add("SignUrl", addInfo.WeChatSignUrl);
+
+            // Obj.Add("SubjectType", addInfo.SubjectType);
             Obj.Add("Name", query.Name); //名称
             Obj.Add("CreateDate", query.CreateDate == null ? "" : query.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //提交时间
+            List<Dictionary<string, object>> AuditResult = new List<Dictionary<string, object>>();
 
-            Obj.Add("Status", addInfo.Status);
-            Obj.Add("DoTime", addInfo.UpdateDate == null ? "" : addInfo.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss"));
-            Obj.Add("Season", addInfo.WeChatRemark);
-            Obj.Add("SignUrl", addInfo.WeChatSignUrl);
+            Dictionary<string, object> WeChat = new Dictionary<string, object>();
+            WeChat.Add("Name", "微信");
+            WeChat.Add("Status", addInfo.Status);
+            WeChat.Add("DoTime", addInfo.UpdateDate == null ? "" : addInfo.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss"));
+            WeChat.Add("Season", addInfo.WeChatRemark);
+            WeChat.Add("SignUrl", addInfo.WeChatSignUrl);
+            AuditResult.Add(WeChat);
 
+            if(addInfo.QueryCount == -1 || addInfo.QueryCount == 1)
+            {
+                Dictionary<string, object> Alipay = new Dictionary<string, object>();
+                Alipay.Add("Name", "支付宝");
+                Alipay.Add("Status", addInfo.QueryCount);
+                Alipay.Add("DoTime", addInfo.UpdateDate == null ? "" : addInfo.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss"));
+                Alipay.Add("Season", addInfo.AlipayRemark);
+                Alipay.Add("SignUrl", function.CheckNull(addInfo.AlipaySignUrl).Replace("\\", ""));
+                AuditResult.Add(Alipay);
+            }
+
+            Obj.Add("Status", addInfo.Status);
+            Obj.Add("AuditResult", AuditResult); //审核结果
             Obj.Add("SubjectType", addInfo.SubjectType);
             return Obj;
         }