消息修改

jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java

@@ -95,9 +95,14 @@ public class PayIncomeContractCommon {
      */
     public final static Integer COME2 = 2;
 
-    public static void main(String[] args) {
-
-    }
+    /**
+     * 邮寄状态(0:未邮寄，1:已邮寄)
+     */
+    public final static Integer POST_STATUS0 = 0;
+    /**
+     * 邮寄状态(0:未邮寄，1:已邮寄)
+     */
+    public final static Integer POST_STATUS1 = 1;
     /**
      * RSA 使用公钥加密token
      * @param RSAPublicKey 公钥

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java

@@ -6,14 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.common.api.dto.message.BusTemplateMessageDTO;
 import com.jero.common.common.RoleCommon;
 import com.jero.common.dto.SendMessageDTO;
-import com.jero.common.enums.CompanyMessageEnums;
 import com.jero.common.enums.ManagementMessageEnums;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.SendMessageService;
-import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.ValidUtil;
@@ -29,6 +26,8 @@ import com.jero.contract.service.IPayIncomeContractInstallmentService;
 import com.jero.contract.service.IPayIncomeContractService;
 import com.jero.contract.vo.PayIncomeContractInput;
 import com.jero.contract.vo.ProjectOutput;
+import com.jero.mail.entity.PayMailContract;
+import com.jero.mail.service.IPayMailContractService;
 import com.jero.meeting.common.MeetingSubitemCommon;
 import com.jero.meeting.entity.PayMeeting;
 import com.jero.meeting.entity.PayMeetingSituation;
@@ -47,7 +46,6 @@ import com.jero.modules.system.service.ISysUserService;
 import com.jero.pack.common.PackCommon;
 import com.jero.pack.entity.PayPackCompanyProject;
 import com.jero.pack.service.IPayPackCompanyProjectService;
-import com.jero.project.common.PayProjectCommon;
 import com.jero.project.entity.PayCommonProject;
 import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.entity.PayWorkingGroupSubItem;
@@ -62,7 +60,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
@@ -81,27 +78,27 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
 
     @Resource
     private PayIncomeContractMapper payIncomeContractMapper;
-    @Autowired
+    @Resource
     private IPayIncomeContractService payIncomeContractService;
-    @Autowired
+    @Resource
     private IPayIncomeContractInstallmentService payIncomeContractInstallmentService;
-    @Autowired
+    @Resource
     private IPayIncomeContractAssociatedService payIncomeContractAssociatedService;
-    @Autowired
+    @Resource
     private IPayIncomeContractAuditService payIncomeContractAuditService;
-    @Autowired
+    @Resource
     private ISysUserService sysUserService;
-    @Autowired
+    @Resource
     private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
-    @Autowired
+    @Resource
     private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
-    @Autowired
+    @Resource
     private IPayCommonProjectService payCommonProjectService;
-    @Autowired
+    @Resource
     private IPayWorkingGroupService payWorkingGroupService;
-    @Autowired
+    @Resource
     private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
-    @Autowired
+    @Resource
     private IPayPackCompanyProjectService payPackCompanyProjectService;
     @Resource
     private IPayMeetingSituationService payMeetingSituationService;
@@ -117,6 +114,8 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
     private ITbMemberProjectService tbMemberProjectService;
     @Resource
     private IPayMeetingService payMeetingService;
+    @Resource
+    private IPayMailContractService payMailContractService;
 
     @Override
     public IPage<PayIncomeContract> queryPageList(Page<PayIncomeContract> page, PayIncomeContract payIncomeContract, String chargeStatus,String projectName, String startTime, String endTime) {
@@ -852,6 +851,18 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         payIncomeContractService.update(update);
         // 添加审核记录
         payIncomeContractAuditService.save(payIncomeContractAudit);
+        // 更新到合同邮寄表
+        PayMailContract payMailContract = new PayMailContract();
+        PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payIncomeContractStatus.getSignedContactsTemporaryId());
+        if(!Objects.isNull(payContactsManagementTemporary)){
+            payMailContract.setMobile(payContactsManagementTemporary.getPhone());
+            payMailContract.setEmail(payContactsManagementTemporary.getEmail());
+        }
+        payMailContract.setContractId(payIncomeContractStatus.getId());
+        payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
+        payMailContract.setLiaisonMan(payIncomeContractStatus.getContractName());
+        payMailContractService.save(payMailContract);
+
         String code = "";
         String role = "";
         String type = "";