From fd865638a82d6691a7904ce1aaccff1e050c7c14 Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期五, 09 七月 2021 13:18:02 +0800 Subject: [PATCH] 订单管理: 订单数量默认1 列表 订单类别 显示三级 收货人默认客户资料的收货人 订单批量打印 打印需要批量打印 回访:需要增加 接待人,回访情况,用户评价.客户意见, 送货。 送货公司,单号,时间 --- zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs | 76 +++++++++++++++++++++++++++++++++++++- 1 files changed, 74 insertions(+), 2 deletions(-) diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs index 12a155f..f14ae68 100644 --- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs +++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs @@ -80,6 +80,8 @@ ViewBag.users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList(); + ViewBag.creater = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList(); + ViewBag.Viscustomer = Viscustomer; ViewBag.IsYwjl = IsYwjl; @@ -112,6 +114,17 @@ { dto.Viscustomer = Viscustomer; } + + dto.VisType = "01"; + dto.Jtype = "02"; + //dto.Jdr = "02"; + dto.Talk = "浠嬬粛鍏徃涓氬姟鍐呭鍜屼骇鍝併��"; + dto.Yx = "03"; + dto.Jy = "02"; + dto.Zw = "02"; + + + } @@ -125,11 +138,30 @@ ViewData["yx"] = _liaotianService.GetSYScode("CooperVisit", "yx"); ViewData["jy"] = _liaotianService.GetSYScode("CooperVisit", "jy"); + ViewData["Duanxin"] = _intentionVisitService.GetListDuanxin(); ViewBag.IsYwjl = IsYwjl; ViewData.Model = dto; return View(); + } + + + public IActionResult getDuanxin(string id) + { + ResultEntity resultEntity = new ResultEntity(); + resultEntity.Result = true; + var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User")); + ViewData["curentuser"] = curentuser; + + var intentionVisitDuanxinDTO = _intentionVisitService.GetDuanxin(id); + if(intentionVisitDuanxinDTO!=null && !string.IsNullOrEmpty(intentionVisitDuanxinDTO.DuanxinNeirong)) + { + resultEntity.Message = string.Format(intentionVisitDuanxinDTO.DuanxinNeirong, curentuser.UserName, curentuser.Phone); + } + + + return new JsonResult(resultEntity); } @@ -156,7 +188,10 @@ using (TransactionScope scope = new TransactionScope()) { resultEntity = _intentionVisitService.save(data); - + if (!resultEntity.Result) + { + return new JsonResult(resultEntity); + } if (!string.IsNullOrEmpty(data.IsYwjl)) @@ -168,6 +203,10 @@ intentionCustomerDTO.Ywjl = curentuser.Id; } resultEntity = _intentionCustomerService.save(intentionCustomerDTO); + if (!resultEntity.Result) + { + return new JsonResult(resultEntity); + } } else if (data.Jy == "05") { @@ -176,8 +215,41 @@ intentionCustomerDTO.Yixiangtime = data.Vistime; intentionCustomerDTO.Dianxiaozhuanyuan = curentuser.Id; resultEntity = _intentionCustomerService.save(intentionCustomerDTO); + if (!resultEntity.Result) + { + return new JsonResult(resultEntity); + } } + + + if (!string.IsNullOrEmpty(data.DuanxinNeirong)) + { + IntentionCustomerDTO intentionCustomerDTO = _intentionCustomerService.Get(data.Viscustomer); + if(intentionCustomerDTO!=null && ( !string.IsNullOrEmpty(intentionCustomerDTO.Phone) || !string.IsNullOrEmpty(intentionCustomerDTO.Tel))) + { + string sss = SMSHelper.PushWToUserMES(string.IsNullOrEmpty(intentionCustomerDTO.Phone)? intentionCustomerDTO.Tel: intentionCustomerDTO.Phone, data.DuanxinNeirong); + if (int.Parse(sss) <= 0) + { + resultEntity.Result = false; + resultEntity.Message = "鐭俊鍙戦�佸け璐�"; + + } + if (!resultEntity.Result) + { + return new JsonResult(resultEntity); + } + } + else + { + resultEntity.Result = false; + resultEntity.Message = "瀹㈡埛鏃犳墜鏈哄彿鐮�"; + return new JsonResult(resultEntity); + } + + + } + scope.Complete(); @@ -237,7 +309,7 @@ { for(int i=0;i< result.Count; i++) { - number.Append(result[i].Phone); + number.Append(string.IsNullOrEmpty(result[i].Phone)? result[i].Tel: result[i].Phone); customename += result[i].Name + ","; if (i!= result.Count - 1) { -- Gitblit v1.9.1