From d48b0e471f99cfc8b9a151d99a7e47899fc09a0b Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Thu, 16 Sep 2021 15:17:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E9=82=AE=E5=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMailBillController.java     | 37 +++----------------
 1 file changed, 6 insertions(+), 31 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
index 2ab820f3..6627946b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
@@ -164,27 +164,14 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 */
 	@ApiOperation(value="邮寄票据-邮寄", notes="邮寄票据-邮寄")
 	@Transactional
-	@PostMapping(value = "/edit3")
-	public Result<?> edit3(@RequestParam(name="id") String id,
-						  @RequestParam(name="sendMethod") Integer sendMethod,
-						  @RequestParam(name="postNo") String postNo,
-						  @RequestParam(name="sendDate") String sendDate,
-						  @RequestParam(name="remark") String remark
-						  ) throws ParseException {
-		PayMailBill payMailBill = new PayMailBill();
-		payMailBill.setId(id);
-		payMailBill.setSendMethod(sendMethod);
-		payMailBill.setPostNo(postNo);
-		payMailBill.setRemark(remark);
-		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-		Date parse = simpleDateFormat.parse(sendDate);
-		payMailBill.setSendDate(parse);
-		payMailBill.setPostStatus(1);
-		payMailBillService.updateById(payMailBill);
+	@PostMapping(value = "/edit")
+	public Result<?> edit(@RequestBody PayMailBill payMailBill)  {
+		 payMailBill.setPostStatus(1);
+		 payMailBillService.updateById(payMailBill);
 		//变更5种项目的邮寄状态
 
 		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
-		queryPayMailBillProject.eq(PayMailBillProject::getId,id);
+		queryPayMailBillProject.eq(PayMailBillProject::getId,payMailBill.getId());
 		PayMailBillProject one = payMailBillProjectService.getOne(queryPayMailBillProject);
 
 		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject2 = new LambdaQueryWrapper<>();
@@ -304,19 +291,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 		 payMailBillService.updateById(payMailBill);
 		 return Result.OK("编辑成功!");
 	 }
-	 /**
-	  *  编辑
-	  *
-	  */
-	 @ApiOperation(value="邮寄票据-邮寄", notes="邮寄票据-邮寄")
-	 @Transactional
-	 @PostMapping(value = "/edit")
-	 public Result<?> edit(@RequestBody PayMailBill payMailBill
-	 )  {
-		 payMailBill.setPostStatus(1);
-		 payMailBillService.updateById(payMailBill);
-		 return Result.OK("编辑成功!");
-	 }
+
 //
 //	/**
 //	 *   通过id删除