工单、红包功能优化

codegit/CallCenterApi/CallCenterAPI.WechatSDK/WxHelper.cs

@@ -246,7 +246,7 @@ namespace CallCenterAPI.WechatSDK
         #endregion
 
         #region 企业向用户发红包
-        public static bool TenPay(decimal amount,string clientip,string certPaths,string openid)
+        public static bool TenPay(decimal amount,string clientip,string openid)
         {
             #region 发送红包
             bool fals = false;   //记录发送红包是否成功
@@ -284,7 +284,7 @@ namespace CallCenterAPI.WechatSDK
 
 
                 data = packageReqHandler.ParseXML();
-                certPath = certPaths;
+                certPath = WechatPath;
                 xmlResult = Sendredpack(data, WechatMchid, certPath);
                 var res = XDocument.Parse(xmlResult);
                 string return_code = res.Element("xml").Element("return_code").Value;

codegit/CallCenterApi/CallCenterApi.BLL/T_Sys_UserAccount.cs

@@ -88,6 +88,15 @@ namespace CallCenterApi.BLL
         {
             return dal.GetModel(F_UserCode);
         }
+        /// <summary>
+        /// 根据Openid 获取用户
+        /// </summary>
+        /// <param name="openid"></param>
+        /// <returns></returns>
+        public Model.T_Sys_UserAccount GetModelByOpenid(string openid)
+        {
+            return dal.GetModelByOpenid(openid);
+        }
 
         /// <summary>
         /// 登录得到一个对象实体

codegit/CallCenterApi/CallCenterApi.BLL/T_Wo_WorkOrder.cs

@@ -151,9 +151,9 @@ namespace CallCenterApi.BLL
         /// 处理工单
         /// </summary>
         public int DealWorkOrder(string strorderid,int isend,string strcont,int jsbm,string jsgh,string clgh
-            ,int isaudit, string infotype, int infotypeid, int isreward, string rewardamount, string rewardtime, int unitid, string unit)
+            ,int isaudit, string infotype, int infotypeid, int unitid, string unit)
         {
-            return dal.DealWorkOrder(strorderid, isend, strcont, jsbm, jsgh, clgh, isaudit, infotype,infotypeid,isreward,rewardamount,rewardtime,unitid,unit);
+            return dal.DealWorkOrder(strorderid, isend, strcont, jsbm, jsgh, clgh, isaudit, infotype,infotypeid,unitid,unit);
         }
         public bool UpdateReward(long woid, int isreward, string amount, string time)
         {

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_UserAccount.cs

@@ -390,8 +390,36 @@ namespace CallCenterApi.DAL
             }
         }
 
-       
-      
+        /// <summary>
+        /// 根据Openid 获取用户
+        /// </summary>
+        /// <param name="openid"></param>
+        /// <returns></returns>
+        public Model.T_Sys_UserAccount GetModelByOpenid(string openid)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            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)
+            };
+            parameters[0].Value = openid;
+
+            Model.T_Sys_UserAccount model = new Model.T_Sys_UserAccount();
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+
+
 
         /// <summary>
         /// 得到一个对象实体

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_WorkOrder.cs

@@ -718,7 +718,7 @@ namespace CallCenterApi.DAL
         /// 处理工单
         /// </summary>
         public int DealWorkOrder(string strorderid, int isend, string strcont, int jsbm, string jsgh, string clgh
-            ,int isaudit, string infotype,int infotypeid,int isreward,string rewardamount,string rewardtime,int unitid,string unit
+            ,int isaudit, string infotype,int infotypeid,int unitid,string unit
             )
         {
             SqlParameter[] parameters = {
@@ -731,9 +731,6 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@IsAudit", SqlDbType.Int),
                     new SqlParameter("@InfoTypeID", SqlDbType.Int),
                     new SqlParameter("@InfoType", SqlDbType.VarChar,50),
-                    new SqlParameter("@ISReward", SqlDbType.Int),
-                    new SqlParameter("@RewardAmount", SqlDbType.VarChar,50),
-                    new SqlParameter("@RewardTime", SqlDbType.VarChar,50),
                     new SqlParameter("@UnitID", SqlDbType.Int),
                     new SqlParameter("@Unit", SqlDbType.VarChar,50)
                     };
@@ -746,11 +743,8 @@ namespace CallCenterApi.DAL
             parameters[6].Value = isaudit;
             parameters[7].Value = infotypeid;
             parameters[8].Value = infotype;
-            parameters[9].Value = isreward;
-            parameters[10].Value = rewardamount;
-            parameters[11].Value = rewardtime;
-            parameters[12].Value = unitid;
-            parameters[13].Value = unit;
+            parameters[9].Value = unitid;
+            parameters[10].Value = unit;
             int n = 0;
             return DbHelperSQL.RunProcedure("DealWorkOrder", parameters, out n);
         }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Configs/system.config

@@ -25,9 +25,12 @@
   <add key="WechatAppsecret" value="3e42313935a4d6dc8b450172b8be2765" />
   <!-- 微信支付分配的商户号 -->
   <add key="WechatMchid" value="1493808312"/>
-  <add key="WechatKey" value=""/>
+  <!-- 商户的API密钥 -->
+  <add key="WechatKey" value="u92kcvielwoc045kigdslwod937ckw9c"/>
   <!-- 商户证书物理位置 -->
-  <add key="WechatPath" value=""/>
+  <add key="WechatPath" value="D:\certificate\cert"/>
+  <!-- 证书安装的IP -->
+  <add key="WechatClientIp" value="127.0.0.1"/>
   <!-- ================== 4：性能监控 - 配置语音文件盘符 ================== -->
   <add key="VideoHardDisc" value="D" />
 </appSettings>

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

@@ -69,6 +69,17 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     return Redirect("请求", temp.RedirectUrl);
                 }
                 wld.OpenId = temp.OpenId;
+
+                //获取是否绑定用户表
+                var usertemp = new BLL.T_Sys_UserAccount().GetModelByOpenid(wld.OpenId);
+                if (usertemp != null)
+                {
+                    wld.UserCode = usertemp.F_UserCode;
+                }
+                else
+                {
+                    wld.UserCode = "";
+                }
             }
             var model = new BLL.T_Sys_Users().GetModel(wld.OpenId);
             if (model == null)
@@ -80,7 +91,13 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 new BLL.T_Sys_Users().Add(model);
             }
 
-            return Success("成功", wld.OpenId);
+            var newobj = new
+            {
+                openid = wld.OpenId,
+                usercode = wld.UserCode,
+            };
+
+            return Success("成功", newobj);
         }
 
         #region 工单相关
@@ -238,7 +255,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         public ActionResult DealWorkOrder()
         {
             DataTable dt = new DataTable();
-            string orderid = RequestString.GetFormString("orderid");
+            string orderid = RequestString.GetFormString("orderid");//GetFormString
             string clcont = HttpUtility.UrlDecode(RequestString.GetFormString("clcont"));
 
             int isaudit = RequestString.GetFormInt("isaudit", 0);
@@ -252,11 +269,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
             if (res)
             {
-                return Error("操作失败");
+                return Error("操作成功");
             }
             else
             {
-                return Success("操作成功");
+                return Success("操作失败");
             }
 
         }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -929,7 +929,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                             int n = new BLL.T_Wo_WorkOrder().DealWorkOrder(orderid, isend, cont, clbm, struser, ua.F_UserCode
                                 , model.IsAudit.Value, model.InfoType, model.InfoTypeID.Value
-                                , model.ISReward.Value, model.RewardAmount, model.RewardTime
                                 , model.UnitID.Value, model.Unit);
                             if (n > 0)
                             {
@@ -946,27 +945,27 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     strmsg = ua.F_UserName + "完结了工单，单号：" + model.WorkOrderID;
                                 }
                                 #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(item.ID.ToString());
-                                    msg.Detail = strmsg;
-                                    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(item.ID.ToString());
+                                //    msg.Detail = strmsg;
+                                //    msg.State = 0;
+                                //    msg.IsDel = 0;
+                                //    msg.CreateUser = ua.F_UserCode;
+                                //    msg.CreateDate = DateTime.Now;
+
+                                //    new BLL.T_Msg_List().Add(msg);
+                                //}
                                 #endregion
                                 #endregion
                                 #region 插入操作记录
                                 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 + ")";
@@ -1002,7 +1001,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public bool DealWorkOrders(string orderid,string cont,string openid,int isaudit,int infotypeid,int unitid)
         {
             bool res = false;
-            Model.T_Wo_WorkOrder model = new BLL.T_Wo_WorkOrder().GetModelList(" WorkOrderID='" + orderid + "'").FirstOrDefault();
+            Model.T_Wo_WorkOrder model = new BLL.T_Wo_WorkOrder().GetModelList(" id=" + orderid + "").FirstOrDefault();
             if (model != null)
             {
                 if (openid != "")
@@ -1034,9 +1033,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                         #endregion
 
-                        int n = new BLL.T_Wo_WorkOrder().DealWorkOrder(orderid, 1, cont, ua.F_DeptId, ua.F_UserCode, ua.F_UserCode
+                        int n = new BLL.T_Wo_WorkOrder().DealWorkOrder(model.WorkOrderID, 1, cont, ua.F_DeptId, ua.F_UserCode, ua.F_UserCode
                             , model.IsAudit.Value, model.InfoType, model.InfoTypeID.Value
-                            , model.ISReward.Value, model.RewardAmount, model.RewardTime
                             , model.UnitID.Value, model.Unit);
                         if (n > 0)
                         {
@@ -1046,20 +1044,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             string strmsg = string.Empty;
                             strmsg = ua.F_UserName + "通过微信完结了工单，单号：" + model.WorkOrderID;
                             #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(item.ID.ToString());
-                                msg.Detail = strmsg;
-                                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(item.ID.ToString());
+                            //    msg.Detail = strmsg;
+                            //    msg.State = 0;
+                            //    msg.IsDel = 0;
+                            //    msg.CreateUser = ua.F_UserCode;
+                            //    msg.CreateDate = DateTime.Now;
+
+                            //    new BLL.T_Msg_List().Add(msg);
+                            //}
                             #endregion
                             #endregion
 
@@ -1067,7 +1065,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             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 + ")";
@@ -1223,20 +1221,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             long itemid = new BLL.T_Wo_WorkOrderItem().Add(item);
                             if (itemid > 0)
                             {
-                                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);
+                                //}
 
                                 res = Success("催办成功！");
                             }
@@ -1462,20 +1460,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     long itemid = new BLL.T_Wo_WorkOrderItem().Add(itemnew);
                                     if (itemid > 0)
                                     {
-                                        foreach (string ur in itemnew.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 itemnew.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);
+                                        //}
                                     }
                                 }
 
@@ -2187,7 +2185,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         }
 
         //获取奖励记录
-        public ActionResult GetAMList(string woid)
+        public ActionResult GetAMSList(string woid)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
@@ -2272,13 +2270,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
             womodel.ISReward = 1;
             womodel.RewardAmount = amount;
             new BLL.T_Wo_WorkOrder().UpdateReward(womodel.ID, womodel.ISReward.Value, womodel.RewardAmount, womodel.RewardTime);
-
-
-
+            
             if (b > 0)
             {
-                string centpath= Server.MapPath("~/") + Configs.GetValue("WechatPath");
-                bool tr=WxHelper.TenPay(decimal.Parse(amount),"", centpath, dModel.F_openid);
+                bool tr=WxHelper.TenPay(decimal.Parse(amount),"",  dModel.F_openid);
                 int state = tr ? 1 : 0;
                 new BLL.T_Wo_AwardRecord().UpdateState(b, state);