From 3d322acc37c0a74198e84585fd146815b098a737 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Sat, 9 Oct 2021 16:33:36 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E7=BC=B4=E8=B4=B9=E5=87=AD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMeetingSituationController.java | 15 ++++++++++++---
 .../service/IPayMeetingSituationService.java      |  2 ++
 .../impl/PayMeetingSituationServiceImpl.java      | 13 +++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

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 d1ce87c9..dc283aa8 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
@@ -8,7 +8,6 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.jero.aspect.annotation.CompanyNameTranslate;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.DictPoint;
@@ -23,7 +22,6 @@ import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.service.IPayCompanyManagementService;
 import com.jero.company.service.IPayContactsManagementService;
 import com.jero.meeting.common.MeetingCommon;
-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;
@@ -34,7 +32,6 @@ import com.jero.meeting.vo.excel.*;
 import com.jero.project.common.PayProjectCommon;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
@@ -159,6 +156,18 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
         return Result.OK("编辑成功!");
     }
 
+    /**
+     * 企业端上传缴费凭证 编辑
+     */
+    @AutoLog(value = "企业端上传缴费凭证 参会人员信息-编辑")
+    @ApiOperation(value = "企业端上传缴费凭证 参会人员信息-编辑", notes = "参会人员信息-编辑")
+    @PostMapping(value = "/editTerminal")
+    public Result<?> editTerminal(@RequestBody PayMeetingSituationVO payMeetingSituationVO) {
+
+        payMeetingSituationService.editTerminal(payMeetingSituationVO);
+        return Result.OK("编辑成功!");
+    }
+
     /**
      * 通过id删除
      */
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 aecac704..c9775f39 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
@@ -68,4 +68,6 @@ public interface IPayMeetingSituationService extends IService<PayMeetingSituatio
 	 * 通过会议id查询自己的参会人信息
 	 */
     PayMeetingSituation queryByMeetingIdAndContactId(String meetingId);
+
+	void editTerminal(PayMeetingSituationVO payMeetingSituationVO);
 }
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 ee2aeaa8..97bbac66 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
@@ -595,6 +595,19 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         return getOne(wrapper);
     }
 
+    @Override
+    public void editTerminal(PayMeetingSituationVO payMeetingSituationVO) {
+        String id = payMeetingSituationVO.getId();
+        String paymentRecord = payMeetingSituationVO.getPaymentRecord();
+        String orderCode = payMeetingSituationVO.getOrderCode();
+        PayMeetingSituation payMeetingSituation = new PayMeetingSituation();
+        payMeetingSituation.setId(id);
+        payMeetingSituation.setPaymentRecord(paymentRecord);
+        payMeetingSituation.setOrderCode(orderCode);
+
+        updateById(payMeetingSituation);
+    }
+
     /**
      * 更新
      */