From 98db4b22e68f1fe0117328e5532750db4758d166 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Fri, 8 Oct 2021 17:30:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayMailContractController.java | 71 ++++++++++++------- .../mail/mapper/PayMailContractMapper.java | 1 + .../mail/mapper/xml/PayMailContractMapper.xml | 22 +++++- .../mail/service/IPayMailContractService.java | 2 + .../impl/PayMailContractServiceImpl.java | 5 ++ 5 files changed, 74 insertions(+), 27 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java index d5241e70..d1400e9f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java @@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.util.AmountUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.shiro.SecurityUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -80,6 +81,24 @@ public class PayMailContractController extends JeroController check(@RequestParam(name = "id") String id) { + PayMailBillList payMailBillList =payMailContractService.checkOne(id); + if(ObjectUtils.isNotEmpty(payMailBillList)) { + return Result.OK("有权限可以操作!"); + }else { + return Result.OK("企业审核未成功无法操作!"); + } + + } + + + /** * 邮寄合同-编辑（邮寄和修改按钮统一接口） @@ -89,33 +108,33 @@ public class PayMailContractController extends JeroController edit(@RequestBody PayMailContract payMailContract ) { - PayMailContract payMailContractData = payMailContractService.getById(payMailContract.getId()); - payMailContract.setPostStatus(1); - payMailContractService.updateById(payMailContract); + PayMailContract payMailContractData = payMailContractService.getById(payMailContract.getId()); + payMailContract.setPostStatus(1); + payMailContractService.updateById(payMailContract); - if (!Objects.isNull(payMailContractData) && Objects.equals(payMailContractData.getPostStatus(), ProjectCommon.POST_STATUS0)) { - PayIncomeContract payIncomeContract = payIncomeContractService.getById(payMailContractData.getContractId()); - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - // 发送消息 - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - if (!StringUtils.isBlank(payMailContractData.getEmail())) { - sendMessageDTO.setEmail(PasswordUtil.decrypt(payMailContractData.getEmail())); - } - if (!StringUtils.isBlank(payMailContractData.getMobile())) { - sendMessageDTO.setToUser(PasswordUtil.decrypt(payMailContractData.getMobile())); - sendMessageDTO.setPhone(PasswordUtil.decrypt(payMailContractData.getMobile())); - } - HashMap map = new HashMap<>(); - if (Objects.isNull(payIncomeContract)) { - map.put("contractName", payIncomeContract.getContractName()); - } - sendMessageDTO.setFromUser(sysUser.getUsername()); - sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG10.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType("C_OPEN_TYPE10"); - sendMessageService.SendMessageService(sendMessageDTO); - } - return Result.OK("操作成功!"); + if (!Objects.isNull(payMailContractData) && Objects.equals(payMailContractData.getPostStatus(), ProjectCommon.POST_STATUS0)) { + PayIncomeContract payIncomeContract = payIncomeContractService.getById(payMailContractData.getContractId()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if (!StringUtils.isBlank(payMailContractData.getEmail())) { + sendMessageDTO.setEmail(PasswordUtil.decrypt(payMailContractData.getEmail())); + } + if (!StringUtils.isBlank(payMailContractData.getMobile())) { + sendMessageDTO.setToUser(PasswordUtil.decrypt(payMailContractData.getMobile())); + sendMessageDTO.setPhone(PasswordUtil.decrypt(payMailContractData.getMobile())); + } + HashMap map = new HashMap<>(); + if (Objects.isNull(payIncomeContract)) { + map.put("contractName", payIncomeContract.getContractName()); + } + sendMessageDTO.setFromUser(sysUser.getUsername()); + sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG10.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("C_OPEN_TYPE10"); + sendMessageService.SendMessageService(sendMessageDTO); + } + return Result.OK("操作成功!"); } // /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java index 65c8e029..6c6f23e6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java @@ -29,4 +29,5 @@ public interface PayMailContractMapper extends BaseMapper { List getOneExcel(@Param("strings") ArrayList strings); + PayMailBillList checkOne(@Param("id") String id); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml index 21d6cb78..d15efcfb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml @@ -18,10 +18,30 @@ pic.principal_name as principalName, pic.principal_id as principalId, pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id) left join pay_company_management pcm on(pic.signed_company_id=pcm.id) - + where pcm.status=1 ${ew.customSqlSegment} + +