1，修改业主多个手机号登录微信公众号逻辑

2. 修改抄表功能

PMS.NetCore/PMS.NetCore.BusinessCore/BaseCore/fdc_pm_housemeterManager.cs

@@ -103,7 +103,7 @@ public class fdc_pm_housemeterManager : DbContext<fdc_pm_housemeter>
 
         foreach (House h in hList)
         {
-            var strsql = $@"SELECT r.ownername, z.edate,a.pk_meterid, a.metername,b.metertypename, a.hcode, c.hname,a.amount
+            var strsql = $@"SELECT r.ownername,edate= CONVERT(varchar, z.edate, 120 ),a.pk_meterid, a.metername,b.metertypename, a.hcode, c.hname,a.amount
                     FROM fdc_pm_housemeter a
                     INNER JOIN fdc_pm_metertype b on a.metertype = b.pk_metertypeid AND a.CostRule = 0
                     INNER JOIN fdc_pm_house c on a.hcode = c.hcode

PMS.NetCore/PMS.NetCore.BusinessCore/BaseCore/fdc_pm_ownerManager.cs

@@ -151,7 +151,7 @@ public class fdc_pm_ownerManager : DbContext<fdc_pm_owner>
     public bool CheckWxOpenId(string openid)
     {
         var sql = $"SELECT ownerid  FROM dbo.fdc_pm_owner   WHERE weixinid='{openid}'";
-        var model = Db.SqlQueryable<dynamic>(sql).Single();
+        var model = Db.SqlQueryable<dynamic>(sql).First();
         if (model != null)
         {
             return true;
@@ -184,7 +184,7 @@ public class fdc_pm_ownerManager : DbContext<fdc_pm_owner>
         Db.BeginTran();
         try
         {
-            var fdc_pm_ownerinfo = fdc_pm_ownerDb.GetSingle(m => m.tel == phone);
+            var fdc_pm_ownerinfo = fdc_pm_ownerDb.GetSingle(m => m.tel.Contains(phone));
             fdc_pm_ownerinfo.weixinid = openId;
 
 

PMS.NetCore/PMS.NetCore.BusinessCore/BaseCore/fdc_pm_repairapplyManager.cs

@@ -78,9 +78,40 @@ public class fdc_pm_repairapplyManager : DbContext<fdc_pm_repairapply>
         fdc_pm_repairapplyDb.DeleteById(new int[] { 1,2});//根据主键数组删除
         fdc_pm_repairapplyDb.Delete(it=>1==2);//根据条件删除
         fdc_pm_repairapplyDb.AsDeleteable().Where(it=>1==2).ExecuteCommand();//转成Deleteable实现复杂的操作
-    } 
+    }
     #endregion
 
- 
- 
+
+    /// <summary>
+    /// 更新openid状态
+    /// </summary>
+    /// <param name="vcarcode"></param>
+    /// <param name="carstatus"></param>
+    /// <returns></returns>
+    public bool Updatefdc_pm_repairapply(string vrepairapplycode, string vbillstatus)
+    {
+        Db.BeginTran();
+        try
+        {
+            var fdc_pm_repairapplyinfo = fdc_pm_repairapplyDb.GetSingle(m => m.vrepairapplycode == vrepairapplycode);
+            fdc_pm_repairapplyinfo.vbillstatus = vbillstatus;
+
+
+            Db.Updateable(fdc_pm_repairapplyinfo).ExecuteCommand();
+
+
+            Db.CommitTran();
+            return true;
+        }
+        catch (Exception ex)
+        {
+            Db.RollbackTran();
+            //logger.Error(ex);
+            throw;
+        }
+    }
+
+
+
+
 }

PMS.NetCore/PMS.NetCore.Enties/DTO/ChaobiaoDTO.cs

@@ -25,10 +25,10 @@ namespace Sugar.Enties
         /// 本次仪表读数
         /// </summary>
         public string amount { get; set; }
-        ///// <summary>
-        ///// 抄表开始日期
-        ///// </summary>
-        //public string bdate { get; set; }
+        /// <summary>
+        /// 上次抄表日期
+        /// </summary>
+        public string doperatordate { get; set; }
         /// <summary>
         /// 仪表名称
         /// </summary>

PMS.NetCore/PMS.NetCore.Enties/DTO/PayDTO.cs

@@ -26,6 +26,14 @@ namespace Sugar.Enties
         /// </summary>
         public string hname { get; set; }
         /// <summary>
+        /// 房主Id
+        /// </summary>
+        public string ownerid { get; set; }
+        /// <summary>
+        /// 付款方式
+        /// </summary>
+        public string paytype { get; set; }
+        /// <summary>
         /// 用户微信号
         /// </summary>
         public string OpenId { get; set; }

PMS.NetCore/PMS.NetCore.Enties/DTO/RepairApplyDTO.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Sugar.Enties
+{
+    public class RepairApplyDTO
+    {
+        /// <summary>
+        /// 维修单号
+        /// </summary>
+        public string vbillno { get; set; }
+        /// <summary>
+        /// 单据类型
+        /// </summary>
+        public string vtypename { get; set; }
+        /// <summary>
+        /// 维修地址
+        /// </summary>
+        public string hname { get; set; }
+        /// <summary>
+        /// 报事地址
+        /// </summary>
+        public string vplace { get; set; }
+        /// <summary>
+        /// 接报日期
+        /// </summary>
+        public string dbilldate { get; set; }
+        /// <summary>
+        /// 完成日期
+        /// </summary>
+        public string drequiredate { get; set; }
+        /// <summary>
+        /// 维修人员
+        /// </summary>
+        public string voperatorname { get; set; }
+        /// <summary>
+        /// 问题描述
+        /// </summary>
+        public string vcontent { get; set; }
+        /// <summary>
+        /// 报事照片
+        /// </summary>
+        public List<FileImg> fileimgList { get; set; }
+    }
+    public class RepairApply
+    {
+        /// <summary>
+        /// 维修单号
+        /// </summary>
+        public string vbillno { get; set; }
+        /// <summary>
+        /// 单据类型
+        /// </summary>
+        public string vtypename { get; set; }
+        /// <summary>
+        /// 维修地址
+        /// </summary>
+        public string hname { get; set; }
+        /// <summary>
+        /// 报事地址
+        /// </summary>
+        public string vplace { get; set; }
+        /// <summary>
+        /// 接报日期
+        /// </summary>
+        public string dbilldate { get; set; }
+        /// <summary>
+        /// 完成日期
+        /// </summary>
+        public string drequiredate { get; set; }
+        /// <summary>
+        /// 维修人员
+        /// </summary>
+        public string voperatorname { get; set; }
+        /// <summary>
+        /// 问题描述
+        /// </summary>
+        public string vcontent { get; set; }
+    }
+    public class FileImg
+    {
+        public string fileurl { get; set; }
+
+    }
+}

PMS.NetCore/PMS.NetCore/Controllers/MeterController.cs

@@ -59,9 +59,12 @@ namespace PMS.NetCore.Controllers
                     res.ErrMsg = "手机号格式不正确";
                     return Json(res);
                 }
+                logger.Info($"【SendSms】phone:{phone}");
                 var service = new fdc_pm_meterrecordManager();
                 var model = service.LoginOwner(phone);
 
+                logger.Info($"【SendSms】model:{JsonConvert.SerializeObject(model)}");
+
                 if (model == null)
                 {
                     res.ErrMsg = "手机号找不到所对应的业主";
@@ -73,7 +76,7 @@ namespace PMS.NetCore.Controllers
                 var signName = "唯友";
                 var templateid = "SMS_230825153";
                 var templateParam = "{\"code\":\"" + code + "\"}";
-                logger.Info($"【SendSms】templateParam:{templateParam}");
+                logger.Info($"【SendSms】templateParam:{templateParam} 手机号：{phone}");
 
                 //发送验证码到手机
                 AlibabaSMSSdk.SendSms(phone, signName, templateid, templateParam);
@@ -108,7 +111,7 @@ namespace PMS.NetCore.Controllers
             var res = new ApiResponse();
             try
             {
-                logger.Info($"【Getfdc_pm_unfare 输入参数】dto:{JsonConvert.SerializeObject(dto)}");
+                logger.Info($"【LoginOwner 输入参数】dto:{JsonConvert.SerializeObject(dto)}");
                 SessionHelper sessionHelp = new SessionHelper(_accessor.HttpContext);
                 if (dto.Phone != sessionHelp.GetSession("phone"))
                 {
@@ -136,6 +139,7 @@ namespace PMS.NetCore.Controllers
                 res.IsSuccess = true;
                 res.Data = model;
                 res.TnToken = tnToken;
+                res.OpenId = dto.OpenId;
                 return Json(res);
             }
             catch (Exception ex)
@@ -189,13 +193,29 @@ namespace PMS.NetCore.Controllers
         /// <returns></returns>
         [HttpPost]
         [Route("Fdc_pm_meterAdd")]
+        [AllowAnonymous]
         public JsonResult Fdc_pm_meterAdd([FromBody] List<ChaobiaoDTO> chaoBiaos)
         {
-            logger.Info($"【Fdc_pm_meterAdd输入参数】chaoBiaos:{JsonConvert.SerializeObject(chaoBiaos)}");
-            var service = new fdc_pm_meterrecordManager();
-            var res = service.Fdc_pm_meterAdd(chaoBiaos);
-            logger.Info($"Fdc_pm_meterAdd输出参数】res:{res}");
-            return Json(res);
+            var res = new ApiResponse();
+            try
+            {
+                logger.Info($"【Fdc_pm_meterAdd输入参数】chaoBiaos:{JsonConvert.SerializeObject(chaoBiaos)}");
+                var service = new fdc_pm_meterrecordManager();
+                var str = service.Fdc_pm_meterAdd(chaoBiaos);
+                logger.Info($"Fdc_pm_meterAdd输出参数】res:{res}");
+                if (str == "success")
+                {
+                    res.IsSuccess = true;
+                }
+                return Json(res);
+            }
+            catch (Exception ex)
+            {
+                logger.Error(ex);
+                res.ErrMsg = ex.Message;
+                res.Code = 500;
+                return Json(res);
+            }
 
         }
         #endregion
@@ -413,6 +433,7 @@ namespace PMS.NetCore.Controllers
                     //logger.Info("MakePayUrl 输出参数】money.ToDecimal:"+dto.money.ToDecimal() * 100);
                     //logger.Info("MakePayUrl 输出参数】money:"+ money);
                     var wxPayData = pay.GetJSAPIWxPayData(money, dto.OpenId, orderNew.OrderNo);
+                    //logger.Info($"MakePayUrl 输出参数】xm;:{xml}");
                     res.IsSuccess = true;
                     res.Data = wxPayData;
                     logger.Info($"MakePayUrl 输出参数】res:{JsonConvert.SerializeObject(res)}");
@@ -753,7 +774,116 @@ namespace PMS.NetCore.Controllers
                 return Json(res);
             }
         }
+        /// <summary>
+        /// 根据单据处理人获取所有报修单、投诉单
+        /// </summary>
+        /// <param name="voperatorid"></param>
+        /// <param name="vbillstatus"></param>
+        /// <param name="pageNumber"></param>
+        /// <param name="pageSize"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("Getfdc_pm_repairapplyList")]
+        public JsonResult Getfdc_pm_repairapplyList(string voperatorid, string vbillstatus, int pageNumber, int pageSize)
+        {
+            var res = new ApiResponse();
+
+            try
+            {
+                logger.Info($"【Getfdc_pm_repairapplyByID 输入参数】voperatorid:{voperatorid} vbillstatus:{vbillstatus}");
+                if (voperatorid.IsNullOrEmpty())
+                {
+                    res.ErrMsg = "参数错误";
+                    return Json(res);
+                }
+                var service = new fdc_pm_meterrecordManager();
+                var list = service.Getfdc_pm_repairapplyList(voperatorid, vbillstatus, pageNumber, pageSize);
+                logger.Info($"Getfdc_pm_repairapplyByID 输出参数】list:{JsonConvert.SerializeObject(list)}");
+                res.IsSuccess = true;
+                res.Data = list;
+                return Json(res);
+            }
+            catch (Exception ex)
+            {
+                logger.Error(ex);
+                res.ErrMsg = ex.Message;
+                res.Code = 500;
+                return Json(res);
+            }
 
+        }
+        /// <summary>
+        /// 根据单据处理人获取所有报修单、投诉单
+        /// </summary>
+        /// <param name="vrepairapplycode"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("Getfdc_pm_repairapplyByCode")]
+        public JsonResult Getfdc_pm_repairapplyByCode(string vrepairapplycode)
+        {
+            var res = new ApiResponse();
+
+            try
+            {
+                logger.Info($"【Getfdc_pm_repairapplyByID 输入参数】vrepairapplycode:{vrepairapplycode}");
+                if (vrepairapplycode.IsNullOrEmpty())
+                {
+                    res.ErrMsg = "参数错误";
+                    return Json(res);
+                }
+                var service = new fdc_pm_meterrecordManager();
+                var model = service.Getfdc_pm_repairapplyByCode(vrepairapplycode);
+                logger.Info($"Getfdc_pm_repairapplyByCode 输出参数】model:{JsonConvert.SerializeObject(model)}");
+                res.IsSuccess = true;
+                res.Data = model;
+                return Json(res);
+            }
+            catch (Exception ex)
+            {
+                logger.Error(ex);
+                res.ErrMsg = ex.Message;
+                res.Code = 500;
+                return Json(res);
+            }
+
+        }
+        /// <summary>
+        /// 更新报事单状态
+        /// </summary>
+        /// <param name="vrepairapplycode"></param>
+        /// <param name="vbillstatus"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("Updatefdc_pm_repairapply")]
+        [AllowAnonymous]
+        public JsonResult Updatefdc_pm_repairapply(string vrepairapplycode, string vbillstatus)
+        {
+            var res = new ApiResponse();
+
+            try
+            {
+                logger.Info($"【Updatefdc_pm_repairapply 输入参数】vrepairapplycode:{vrepairapplycode}");
+                if (vrepairapplycode.IsNullOrEmpty())
+                {
+                    res.ErrMsg = "参数错误";
+                    return Json(res);
+                }
+                var service = new fdc_pm_repairapplyManager();
+                var model = service.Updatefdc_pm_repairapply(vrepairapplycode, vbillstatus);
+                logger.Info($"Updatefdc_pm_repairapply 输出参数】model:{JsonConvert.SerializeObject(model)}");
+                res.IsSuccess = true;
+                res.Data = model;
+                return Json(res);
+            }
+            catch (Exception ex)
+            {
+                logger.Error(ex);
+                res.ErrMsg = ex.Message;
+                res.Code = 500;
+                return Json(res);
+            }
+
+        }
         /// <summary>
         /// 添加缴费单
         /// </summary>
@@ -761,6 +891,7 @@ namespace PMS.NetCore.Controllers
         /// <returns></returns>
         [HttpPost]
         [Route("InsertPay")]
+        [AllowAnonymous]
         public JsonResult InsertPay([FromBody] PayDTO dto)
         {
             var res = new ApiResponse();
@@ -770,9 +901,14 @@ namespace PMS.NetCore.Controllers
                 logger.Info($"【InsertPay 输入参数】dto:{JsonConvert.SerializeObject(dto)}");
 
                 var service = new fdc_pm_meterrecordManager();
+                var pay = new JSAPIPay();
+                var order = service.Db.Queryable<Order>().First(m => m.Farerowid == dto.farwarid);
+                if (order != null)
+                {
+                    service.Db.Deleteable(order).ExecuteCommand();
+                }
                 var revfarecode = "";
-                var resstr = service.InsertPay(dto.farwarid, dto.hname, dto.ownername, dto.money.Value.ToString(), ref revfarecode);
-
+                var resstr = service.InsertPay(dto.farwarid, dto.hname, dto.ownerid, dto.ownername, dto.paytype, dto.money.Value.ToString(), ref revfarecode);
                 if (resstr != "success")
                 {
                     res.IsSuccess = false;

PMS.NetCore/PMS.NetCore/PMS.NetCore.xml

@@ -224,6 +224,31 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:PMS.NetCore.Controllers.MeterController.Getfdc_pm_repairapplyList(System.String,System.String,System.Int32,System.Int32)">
+            <summary>
+            根据单据处理人获取所有报修单、投诉单
+            </summary>
+            <param name="voperatorid"></param>
+            <param name="vbillstatus"></param>
+            <param name="pageNumber"></param>
+            <param name="pageSize"></param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.MeterController.Getfdc_pm_repairapplyByCode(System.String)">
+            <summary>
+            根据单据处理人获取所有报修单、投诉单
+            </summary>
+            <param name="vrepairapplycode"></param>
+            <returns></returns>
+        </member>
+        <member name="M:PMS.NetCore.Controllers.MeterController.Updatefdc_pm_repairapply(System.String,System.String)">
+            <summary>
+            更新报事单状态
+            </summary>
+            <param name="vrepairapplycode"></param>
+            <param name="vbillstatus"></param>
+            <returns></returns>
+        </member>
         <member name="M:PMS.NetCore.Controllers.MeterController.InsertPay(Sugar.Enties.PayDTO)">
             <summary>
             添加缴费单

PMS.NetCore/WxPayAPI/JSAPIPay.cs

@@ -36,7 +36,7 @@ namespace WxPayAPI
             //string xml = data.ToXml(); //转换成XML
             //var startTime = DateTime.Now; //开始时间
 
-            Log.Info($"【GetJSAPIWxPayData】data组装:{JsonConvert.SerializeObject(data)}");
+            Log.Info($"【GetJSAPIWxPayData】data组装:{WxPayConfig.NOTIFY_URL}");
             WxPayData result = WxPayApi.UnifiedOrder(data);//调用统一下单接口
 
 
@@ -53,7 +53,7 @@ namespace WxPayAPI
             string return_code = result.GetValue("return_code") == null ? "" : result.GetValue("return_code").ToString();
             string err_code = "";
             string err_code_des = "";
-            if (return_code == "SUCCESS" || result_code== "FAIL")
+            if (return_code == "SUCCESS" || result_code == "FAIL")
             {
                 err_code = result.GetValue("err_code") == null ? "" : result.GetValue("err_code").ToString();
                 err_code_des = result.GetValue("err_code_des") == null ? "" : result.GetValue("err_code_des").ToString();

PMS.NetCore/WxPayAPI/NativePay.cs

@@ -38,7 +38,7 @@ namespace WxPayAPI
         }
 
 
-       
+
         /// <summary>
         /// 生成直接支付url，支付url有效期为2小时,模式二
         /// </summary>
@@ -48,7 +48,7 @@ namespace WxPayAPI
         /// <returns>模式二URL</returns>
         public string GetPayUrl(string productId, int total_fee, string out_trade_no)
         {
-            Log.Info(this.GetType().ToString()+ "-GetPayUrl");
+            Log.Info(this.GetType().ToString() + "-GetPayUrl");
 
             WxPayData data = new WxPayData();
 
@@ -69,7 +69,7 @@ namespace WxPayAPI
             Log.Info($"【GetPayUrl】data组装:{JsonConvert.SerializeObject(data)}");
             WxPayData result = WxPayApi.UnifiedOrder(data);//调用统一下单接口
             Log.Info($"【GetPayUrl】调用统一下单接口 result:{JsonConvert.SerializeObject(result)}");
-            string url = result.GetValue("code_url")==null?"": result.GetValue("code_url").ToString();//获得统一下单接口返回的二维码链接
+            string url = result.GetValue("code_url") == null ? "" : result.GetValue("code_url").ToString();//获得统一下单接口返回的二维码链接
 
             //Log.Info(this.GetType().ToString(), "Get native pay mode 2 url : " + url);
             return url;
@@ -230,6 +230,6 @@ namespace WxPayAPI
         }
     }
 
-    
-    
+
+
 }

PMS.NetCore/WxPayAPI/WxPayApi.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Utils;
 
 namespace WxPayAPI