From 0e4977862a50b313a383d6bcdc55e3e7a9b6065d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 13 Sep 2021 19:11:29 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayMeetingSituationController.java        | 24 +++++------
 .../service/IPayMeetingSituationService.java  |  3 ++
 .../impl/PayMeetingSituationServiceImpl.java  |  7 +++-
 .../com/jero/meeting/vo/MergePayBillVO.java   | 40 +++++++++++++++++++
 4 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MergePayBillVO.java

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
index 44bef947..3180fa39 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
@@ -4,29 +4,18 @@ import java.util.Arrays;
 import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.http.HttpUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.vo.Result;
-import com.jero.common.exception.JeroBootException;
-import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.query.QueryGenerator;
-import com.jero.common.system.vo.LoginUser;
 import com.jero.meeting.common.MeetingSubitemCommon;
 import com.jero.meeting.entity.PayMeetingSituation;
 import com.jero.meeting.service.IPayMeetingSituationService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.meeting.vo.AddDockVO;
-import com.jero.meeting.vo.CheckVO;
-import com.jero.meeting.vo.ImportSituationsVO;
-import com.jero.meeting.vo.PayMeetingSituationVO;
+import com.jero.meeting.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
@@ -193,4 +182,15 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
 		 return Result.OK("审核成功!");
 	 }
 
+	 /**
+	  *  合并开票
+	  */
+	 @AutoLog(value = "合并开票")
+	 @ApiOperation(value="合并开票", notes="合并开票")
+	 @PostMapping(value = "/batchPayBill")
+	 public Result<?> mergePayBill(@RequestBody MergePayBillVO mergePayBillVO) {
+		 payMeetingSituationService.mergePayBill(mergePayBillVO);
+		 return Result.OK("审核成功!");
+	 }
+
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java
index f3b0b0fa..515d612d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java
@@ -3,6 +3,7 @@ package com.jero.meeting.service;
 import com.jero.meeting.entity.PayMeetingSituation;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.meeting.vo.AddDockVO;
+import com.jero.meeting.vo.MergePayBillVO;
 import com.jero.meeting.vo.CheckVO;
 import com.jero.meeting.vo.PayMeetingSituationVO;
 
@@ -51,4 +52,6 @@ public interface IPayMeetingSituationService extends IService<PayMeetingSituatio
     void signUp(PayMeetingSituation payMeetingSituation);
 
 	void check(CheckVO checkVO);
+
+    void mergePayBill(MergePayBillVO mergePayBillVO);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 21cc4d40..784999f5 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -2,7 +2,6 @@ package com.jero.meeting.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.LoginUser;
@@ -21,7 +20,6 @@ import com.jero.meeting.service.IPayMeetingSituationService;
 import com.jero.meeting.valid.group.*;
 import com.jero.meeting.vo.*;
 import com.jero.project.common.PayProjectCommon;
-import com.jero.standards.memberinfo.entity.MemberInfo;
 import com.jero.standards.memberinfo.service.IMemberInfoService;
 import com.jero.temporary.entity.PayCompanyManagementTemporary;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
@@ -140,6 +138,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 		saveOrUpdate(meetingSituation);
 	}
 
+	@Override
+	public void mergePayBill(MergePayBillVO mergePayBillVO) {
+		mergePayBillVO.getInvoiceAmount();
+	}
+
 	/**
 	 * 更新
 	 */
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MergePayBillVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MergePayBillVO.java
new file mode 100644
index 00000000..0abbaba4
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MergePayBillVO.java
@@ -0,0 +1,40 @@
+package com.jero.meeting.vo;
+
+import com.jero.common.util.jsonschema.validate.StringProperty;
+import com.jero.meeting.entity.PayMeetingSituation;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.DecimalMax;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author liJiaRao
+ * @date 2021-09-13 17:46
+ */
+@Data
+public class MergePayBillVO {
+    @NotBlank(message = "会议项目不能为空")
+    private String meetingId;
+
+    @ApiModelProperty(value = "邮寄联系人")
+    private String postContactId;
+
+    @ApiModelProperty(value = "邮寄联系人地址")
+    private String postContactAddress;
+
+    @ApiModelProperty(value = "票号")
+    @NotNull(message = "票号不能为空")
+    private String billNo;
+
+    @ApiModelProperty(value = "开票金额")
+    @NotNull(message = "开票金额不能为空")
+    @DecimalMax(value = "9999999999.99", message = "开票金额格式错误")
+    private BigDecimal invoiceAmount;
+
+    private List<String> meetingSituationIds;
+
+}