昆山国际产业园项目接口的修改

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

@@ -44,7 +44,7 @@ public class fdc_pm_ownerManager : DbContext<fdc_pm_owner>
             var model = Db.Queryable<fdc_pm_owner>().First(m => m.firsttel == input.Phone && (m.typename == "个人租户" || m.typename == "企业租户"));
             if (model == null)
             {
-                output.msg = "租户不存在";
+                output.msg = "绑定失败";
                 output.State = 3;
                 return output;
             }
@@ -59,18 +59,18 @@ public class fdc_pm_ownerManager : DbContext<fdc_pm_owner>
             }
             else
             {
-                output.msg = "微信ID已存在";
-                output.State = 1;
+                output.msg = "绑定失败";
+                output.State = 3;
                 return output;
             }
         }
-        else if (input.Type == "2")
+        else if (input.Type == "2")   //判断是否绑定
         {
             var model = Db.Queryable<fdc_pm_owner>().First(m => m.firsttel == input.Phone && (m.typename == "个人租户" || m.typename == "企业租户"));
             if (model == null)
             {
-                output.msg = "租户不存在";
-                output.State = 3;
+                output.msg = "未绑定";
+                output.State = 6;
                 return output;
             }
             if (model.weixinid.IsNullOrEmpty())
@@ -92,14 +92,14 @@ public class fdc_pm_ownerManager : DbContext<fdc_pm_owner>
             var model = Db.Queryable<fdc_pm_owner>().First(m => m.firsttel == input.Phone && (m.typename == "个人租户" || m.typename == "企业租户"));
             if (model == null)
             {
-                output.msg = "租户不存在";
+                output.msg = "解绑失败";
                 output.State = 5;
                 return output;
                
             }
             if (model.weixinid.IsNullOrEmpty())
             {
-                output.msg = "此用户尚未绑定";
+                output.msg = "解绑失败";
                 output.State = 5;
                 return output;
                

PMS.NetCore/PMS.NetCore/Controllers/PaypalController.cs

@@ -47,15 +47,101 @@ namespace PMS.NetCore.Controllers
                 {
                     res.respCode = "LX11C901";
                     res.respDesc = "参数异常";
+                    logger.Info($"【PaymentNotice】res:{JsonConvert.SerializeObject(res)}");
                     return Json(res);
                 }
                 var service = new maxbillcodeManager();
 
+               
+                var service1 = new fdc_pm_revfareManager();
+                var service2 = new fdc_pm_revfare_bManager();
+                var fareb = new fdc_pm_fare_bManager().Db.Queryable<fdc_pm_fare_b>().First(m => m.farerowid == req.orderId);
+                if(fareb==null)
+                {
+                    res.respCode = "LX11C001";
+                    res.respDesc = "失败--无此应收费用记录";
+                    logger.Info($"【PaymentNotice】res:{JsonConvert.SerializeObject(res)}");
+                    return Json(res);
+                }
+                #region 构建fdc_pm_revfare实例
                 var rev = new fdc_pm_revfare();
                 rev.pk_revfarecode = service.GetMaxBillCode("", "S", true);
-
-                res.respCode = "LX11C001";
-                res.respDesc = "失败";               
+                rev.hcode = fareb.hcode;
+                rev.ownerid = fareb.ownerid;
+                
+                rev.revnmny = req.trnAmt.ToDecimal() / 100;
+                //收款日期
+                var receiveDate = (req.trnDate.Substring(0, 4) + "-" + req.trnDate.Substring(4, 2) + "-" + req.trnDate.Substring(6)).ToDateTime();
+                rev.dbilldate = receiveDate;
+                rev.doperatordate = receiveDate;
+                rev.dapprovedate = receiveDate;
+                rev.voperatorid = "1099";   //系统管理员
+                rev.vapproveid = "1099";   //系统管理员
+                rev.prerevflag = "N";
+                rev.billstatus = "1";    //支付状态
+                rev.billtype = "S";     //普通收款单
+                rev.paytype = "2003";    //暂定为银0159
+                rev.issettle = "1";
+                #endregion
+                logger.Info($"【PaymentNotice】收款单主表rev:{JsonConvert.SerializeObject(rev)}");
+                var success = false;
+                if(!service1.Db.Queryable<fdc_pm_revfare>().Any(it=>it.pk_revfarecode==rev.pk_revfarecode))
+                {
+                    success=service1.Insert(rev);
+                }
+                else
+                {
+                    success=service1.Update(rev);
+                }
+                if(!success)
+                { 
+                    res.respCode = "LX11C001";
+                    res.respDesc = "失败-插入收款单主表失败";
+                    logger.Info($"【PaymentNotice】res:{JsonConvert.SerializeObject(res)}");
+                    return Json(res);
+                }
+                
+                #region 构建fdc_pm_revfare_b实例
+                var detail = new fdc_pm_revfare_b();
+                detail.revfarerowid = service.GetMaxBillCode("", "", true);
+                detail.pk_revfarecode = rev.pk_revfarecode;
+                detail.farerowid = req.orderId;
+                detail.hcode = fareb.hcode;
+                detail.narea = fareb.narea;
+                detail.billitemcode = fareb.billitemcode;
+                detail.nneedmny = fareb.nneedpaymny;
+                detail.nrevmny = req.trnAmt.ToDecimal() / 100;  //缴费金额
+                detail.nprice = fareb.nprice.SConvertString();
+                detail.dbdate = fareb.dbegindate;
+                detail.dedate = fareb.denddate;
+                detail.prerevflag = rev.prerevflag;
+                detail.issettle = rev.issettle;
+                detail.pk_paytype = rev.paytype;
+                detail.billtype = rev.billtype;
+                detail.pk_meterid = fareb.pk_meterid;
+                #endregion
+                logger.Info($"【PaymentNotice】收款单子表detail:{JsonConvert.SerializeObject(detail)}");
+                var success1 = false;
+                if (!service2.Db.Queryable<fdc_pm_revfare_b>().Any(it => it.revfarerowid == detail.farerowid))
+                {
+                    success1 = service2.Insert(detail);
+                }
+                else
+                {
+                    success1 = service2.Update(detail);
+                }
+                if (!success1)
+                { 
+                    res.respCode = "LX11C001";
+                    res.respDesc = "失败--插入收款单子表失败";
+                    logger.Info($"【PaymentNotice】res:{JsonConvert.SerializeObject(res)}");
+                    return Json(res);
+                }
+               
+                
+                res.respCode = "LX11C000";
+                res.respDesc = "交易成功";
+                logger.Info($"【PaymentNotice】res:{JsonConvert.SerializeObject(res)}");
                 return Json(res);
             }
             catch(Exception ex)
@@ -63,6 +149,7 @@ namespace PMS.NetCore.Controllers
                 logger.Error(ex);
                 res.respCode = "LX11C999";
                 res.respDesc = "系统异常,请稍后重试"+ex.Message;
+                logger.Info($"【PaymentNotice】res:{JsonConvert.SerializeObject(res)}");
                 return Json(res);
             }