工单调整提交

codegit/CallCenterApi/CallCenterAPI.WechatSDK/WxHelper.cs

@@ -28,6 +28,7 @@ namespace CallCenterAPI.WechatSDK
         public static string WechatMchid;
         public static string WechatKey;
         public static string WechatPath;
+        public static string WechatClientIp;
 
         public static string CommonToken;//Common的Token
         public static DateTime GetCommonTokenDate;//获取CommonToken的时间
@@ -40,6 +41,7 @@ namespace CallCenterAPI.WechatSDK
             WechatMchid= Configs.GetValue("WechatMchid");
             WechatKey = Configs.GetValue("WechatKey");
             WechatPath = Configs.GetValue("WechatPath");
+            WechatClientIp = Configs.GetValue("WechatClientIp");
         }
 
         /// <summary>
@@ -49,7 +51,6 @@ namespace CallCenterAPI.WechatSDK
         /// <returns></returns>
         public static WxLoginDto GetOpenId(WxLoginDto wxLoginDto)
         {
-
             if (string.IsNullOrWhiteSpace(wxLoginDto.Code))
             {
                 var url = OAuthApi.GetAuthorizeUrl(AppId, wxLoginDto.RedirectUrl, "qwertyuidfghjkl", OAuthScope.snsapi_base);
@@ -246,10 +247,11 @@ namespace CallCenterAPI.WechatSDK
         #endregion
 
         #region 企业向用户发红包
-        public static bool TenPay(decimal amount,string clientip,string openid)
+        public static bool TenPay(decimal amount,string openid)
         {
             #region 发送红包
             bool fals = false;   //记录发送红包是否成功
+            string msg = "";
             string xmlResult = null;  //现金红包接口返回的xml
             string certPath = null;  //证书在服务器的物理位置
             string data = null;  //调用现金红包接口需要的数据
@@ -260,11 +262,11 @@ namespace CallCenterAPI.WechatSDK
                 //初始化
                 packageReqHandler.Init();
                 string nonceStr = TenPayV3Util.GetNoncestr();  //时间戳
-                string sign = packageReqHandler.CreateMd5Sign("key", WechatKey);
+                
                 //设置package订单参数
                 
                 packageReqHandler.SetParameter("nonce_str", nonceStr);    //随机字符串，不长于32位
-                packageReqHandler.SetParameter("sign", sign); //签名:生成签名方式查看签名算法
+                
 
                 var r = new Random(Guid.NewGuid().GetHashCode());//随机数
                 var dd = DateTime.Now.ToString("yyyymmdd");//日期yyyymmdd
@@ -278,10 +280,12 @@ namespace CallCenterAPI.WechatSDK
                 packageReqHandler.SetParameter("total_num", "1");//红包发放总人数
 
                 packageReqHandler.SetParameter("wishing", "测试红包");  //红包祝福语
-                packageReqHandler.SetParameter("client_ip", clientip);//Ip地址
+                packageReqHandler.SetParameter("client_ip", WechatClientIp);//Ip地址
                 packageReqHandler.SetParameter("act_name", "测试红包");  //活动名称
                 packageReqHandler.SetParameter("remark", "测试红包");  //备注
 
+                string sign = packageReqHandler.CreateMd5Sign("key", WechatKey);
+                packageReqHandler.SetParameter("sign", sign); //签名:生成签名方式查看签名算法
 
                 data = packageReqHandler.ParseXML();
                 certPath = WechatPath;
@@ -295,10 +299,19 @@ namespace CallCenterAPI.WechatSDK
                     {
                         fals = true;
                     }
+                    else
+                    {
+                        msg = res.Element("xml").Element("err_code_des").Value; 
+                    }
+                }
+                else
+                {
+                    msg = res.Element("xml").Element("return_msg").Value;
                 }
             }
             catch (Exception exception)
             {
+                msg = exception.Message;
             }
             #endregion
             return fals;
@@ -314,11 +327,11 @@ namespace CallCenterAPI.WechatSDK
         /// <returns></returns>
         public static string Sendredpack(string data, string certPassword, string certPath, int timeOut = Config.TIME_OUT)
         {
-            var urlFormat = "https://api.mch.weixin.qq.com/mmpaymkttransfers/hbpreorder";
-            string cert = certPath;
+            var urlFormat = "https://api.mch.weixin.qq.com/mmpaymkttransfers/sendredpack";
+            string cert = HttpContext.Current.Request.PhysicalApplicationPath+ certPath;
 
             ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(CheckValidationResult);
-            X509Certificate2 cer = new X509Certificate2(cert, certPassword, X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.MachineKeySet);
+            X509Certificate2 cer = new X509Certificate2(cert, certPassword);
 
             var formDataBytes = data == null ? new byte[0] : Encoding.UTF8.GetBytes(data);
             MemoryStream ms = new MemoryStream();

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_UserAccount.cs

@@ -402,7 +402,7 @@ namespace CallCenterApi.DAL
             strSql.Append("select  top 1 * from T_Sys_UserAccount ");
             strSql.Append(" where F_WxOpenId=@F_WxOpenId");
             SqlParameter[] parameters = {
-                    new SqlParameter("@F_WxOpenId", SqlDbType.Int,4)
+                    new SqlParameter("@F_WxOpenId", SqlDbType.VarChar,300)
             };
             parameters[0].Value = openid;
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

@@ -534,7 +534,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                     if (ua != null)
                     {
                         Model.T_Wo_WorkOrder model = new Model.T_Wo_WorkOrder();
-                        model.WorkOrderID = DateTime.Now.ToString("yyyyMMddHHmmssfff");//工单编号
+                        model.WorkOrderID = DateTime.Now.ToString("yyyyMMddHHmmssmsfff");//工单编号
                         model.CallID = callid;
                         model.Customer = tskh;
                         model.CustomerID = khid;
@@ -638,11 +638,22 @@ namespace CallCenterApi.Interface.Controllers.tel
                             {
                                 item.LimitTime = to.ItemTime;
                             }
-
+                            if (item.ToUser != "")
+                            {
+                                item.SureUser = ua.F_UserCode;
+                                item.State = 1;
+                                item.SureTime = DateTime.Now;
+                                item.IsStart = 1;
+                            }
+                            else
+                            {
+                                item.State = 0;
+                                item.IsStart = 0;
+                            }
                             item.Detail = clcont;
                             item.IsLast = 0;
-                            item.State = 0;
-                            item.IsStart = 0;
+                            //item.State = 0;
+                            //item.IsStart = 0;
                             item.IsTimeOut = 0;
                             item.IsDel = 0;
                             item.CreateUser = ua.F_UserCode;
@@ -655,20 +666,20 @@ namespace CallCenterApi.Interface.Controllers.tel
                                 model.AppointTime = DateTime.Now;
 
                                 #region 消息表
-                                foreach (string ur in item.ToUser.Split(','))
-                                {
-                                    Model.T_Msg_List msg = new Model.T_Msg_List();
-                                    msg.Type = 1;
-                                    msg.ToUser = ur;
-                                    msg.ToID = Int32.Parse(itemid.ToString());
-                                    msg.Detail = ua.F_UserName + "给你指派了工单，单号：" + model.WorkOrderID;
-                                    msg.State = 0;
-                                    msg.IsDel = 0;
-                                    msg.CreateUser = ua.F_UserCode;
-                                    msg.CreateDate = DateTime.Now;
-
-                                    new BLL.T_Msg_List().Add(msg);
-                                }
+                                //foreach (string ur in item.ToUser.Split(','))
+                                //{
+                                //    Model.T_Msg_List msg = new Model.T_Msg_List();
+                                //    msg.Type = 1;
+                                //    msg.ToUser = ur;
+                                //    msg.ToID = Int32.Parse(itemid.ToString());
+                                //    msg.Detail = ua.F_UserName + "给你指派了工单，单号：" + model.WorkOrderID;
+                                //    msg.State = 0;
+                                //    msg.IsDel = 0;
+                                //    msg.CreateUser = ua.F_UserCode;
+                                //    msg.CreateDate = DateTime.Now;
+
+                                //    new BLL.T_Msg_List().Add(msg);
+                                //}
                                 #endregion
                             }
                         }
@@ -677,7 +688,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                         Model.T_Wo_Operation oper = new Model.T_Wo_Operation();
                         oper.F_WorkOrderId = model.WorkOrderID;
                         oper.F_State = model.State;
-                        oper.F_CallRecordId = model.CallID != null ? int.Parse(model.CallID) : 0;
+                        oper.F_CallRecordId = model.CallID != "" ? int.Parse(model.CallID) : 0;
                         oper.F_File = model.Files;
 
                         string userinfo = ua.depname + "-" + ua.F_UserName + "(" + ua.F_UserCode + ")";

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -60,9 +60,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
         public ActionResult GetOpenId(WxLoginDto wld)
         {
             wld.RedirectUrl = RequestString.GetUrlReferrer();
-
+            
             if (string.IsNullOrEmpty(wld.OpenId))
             {
+                
                 var temp = WxHelper.GetOpenId(wld);
                 if (string.IsNullOrWhiteSpace(temp.OpenId))
                 {
@@ -109,10 +110,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
         public ActionResult GetList()
         {
             DataTable dt = new DataTable();
-            //string sql = " and F_IsDelete=0 ";
+            //string sql = " and IsDel=0 ";
 
             string stropenid = HttpUtility.UrlDecode(RequestString.GetQueryString("openid"));
-            string strstate = HttpUtility.UrlDecode(RequestString.GetQueryString("state"));//状态
+            string strstate = HttpUtility.UrlDecode(RequestString.GetQueryString("state"));//状态 0待处理 1已处理
             string strname = HttpUtility.UrlDecode(RequestString.GetQueryString("name"));//联系人
             string strtel = HttpUtility.UrlDecode(RequestString.GetQueryString("tel"));//联系电话
             string strkey = HttpUtility.UrlDecode(RequestString.GetQueryString("key"));//关键字
@@ -132,11 +133,19 @@ namespace CallCenterApi.Interface.Controllers.weixin
             #region sql 语句相关处理
             //根据openid获取所有工单号
             var wxuser = new BLL.T_Sys_Users().GetModelList(" F_OpenId='" + stropenid.Trim() + "' and F_Type=1 ").FirstOrDefault();
-            string sql = " and id in (select distinct F_WorkOrderID from T_WO_UserWorkOrder where F_UserId='" + wxuser.F_Id + "') ";
+            string sql = " and IsDel=0 and id in (select distinct F_WorkOrderID from T_WO_UserWorkOrder where F_UserId='" + wxuser.F_Id + "') ";
 
             if (strstate.Trim() != "" && strstate != "undefined")
             {
-                sql += " and State = '" + strstate.Trim() + "' ";
+                if (strstate.Trim() == "0")
+                {
+                    sql += " and State in(0,1) ";
+                }
+                else
+                {
+                    sql += " and State =2 ";
+                }
+                //sql += " and State = '" + strstate.Trim() + "' ";
             }
             if (strworkid.Trim() != "" && strworkid != "undefined")
             {

codegit/CallCenterCommon/CallCenter.Utility/RequestHandler.cs

@@ -116,6 +116,7 @@ namespace CallCenter.Utility
 
             return sign;
         }
+        
 
         /// <summary>
         /// 输出XML