11

Reportapi/MyCode.Project.WebApi/Areas/Wechat/Controllers/BaseWechatController.cs

@@ -16,13 +16,13 @@ namespace MyCode.Project.WebApi.Areas.Wechat.Controllers
         /// <summary>
         /// 取得登陆信息
         /// </summary>
-        protected MemberLoginInfo CurrentLogin
+        protected LoginInfo CurrentLogin
         {
             get
             {
                 var obj = this.RequestContext.RouteData.Values[Const.LoginInfoKey];
 
-                return ((JObject)obj).ToObject<MemberLoginInfo>();
+                return ((JObject)obj).ToObject<LoginInfo>();
             }
         }
     }

Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs

@@ -50,6 +50,18 @@ namespace MyCode.Project.WebApi.Controllers
         }
         #endregion
 
+        #region 合并吉客云订单到新表
+        /// <summary>
+        /// 合并吉客云订单到新表
+        /// </summary>
+        [HttpGet]
+        [AllowAnonymous]
+        public string GetAndMergeJackYunOrder(string now)
+        {
+           return  _jackYunTaskService.GetAndMergeJackYunOrder(now);
+        }
+        #endregion
+
 
         //#region 订单查询