开票

jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java

@@ -80,14 +80,18 @@ public class PayMailBill implements Serializable {
 	@Excel(name = "快递单号", width = 15)
     @ApiModelProperty(value = "快递单号")
     private java.lang.String postNo;
-	/**联系人*/
-	@Excel(name = "联系人", width = 15)
-    @ApiModelProperty(value = "联系人")
-    private java.lang.String liaisonMan;
+	/**联系人id*/
+	@Excel(name = "联系人id", width = 15)
+    @ApiModelProperty(value = "联系人id")
+    private java.lang.String contactId;
+	/**联系人名字*/
+	@Excel(name = "联系人名字", width = 15)
+    @ApiModelProperty(value = "联系人名字")
+    private java.lang.String contactName;
 	/**联系人手机号*/
 	@Excel(name = "联系人手机号", width = 15)
     @ApiModelProperty(value = "联系人手机号")
-    private java.lang.String mobile;
+    private java.lang.String contactMobile;
 	/**开票时间*/
 	@Excel(name = "开票时间", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -129,5 +133,14 @@ public class PayMailBill implements Serializable {
     @NotNull(message = "项目负责人id不能为空")
     @ApiModelProperty(value = "项目负责人id")
     private java.lang.String principalId;
-
+    /**邮政编码*/
+    @Excel(name = "邮政编码", width = 15)
+    @ApiModelProperty(value = "邮政编码")
+    @NotNull(message = "邮政编码")
+    private java.lang.String postalCode;
+    /**通讯地址*/
+    @Excel(name = "通讯地址", width = 15)
+    @ApiModelProperty(value = "通讯地址")
+    @NotNull(message = "通讯地址")
+    private java.lang.String contactAddress;
 }

jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java

@@ -8,6 +8,8 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.util.AuthenticationUtils;
 import com.jero.common.util.PasswordUtil;
+import com.jero.company.entity.PayContactsManagement;
+import com.jero.company.mapper.PayContactsManagementMapper;
 import com.jero.contract.common.PayIncomeContractCommon;
 import com.jero.mail.PayMailBillVO;
 import com.jero.mail.entity.BillingInfo;
@@ -66,9 +68,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     @Resource
     private TbMemberProjectMapper tbMemberProjectMapper;
     @Resource
-    private PayMailBillMapper payMailBillMapper;
-    @Resource
-    private PayMailBillProjectMapper payMailBillProjectMapper;
+    private PayContactsManagementMapper payContactsManagementMapper;
 
     @Override
     public List<PayMailBill> selectMailBillVO(String projectId) {
@@ -122,22 +122,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
             }
 
         }
-
         //新增票据邮寄表
-        payMailBillService.save(payMailBill);
-
-//        for (int i = 0; i < bmpList.size(); i++) {
-//            //新增票据关联项目表
-//            PayMailBillProject payMailBillProject = new PayMailBillProject();
-//            payMailBillProject.setBillId(payMailBill.getId());
-//            payMailBillProject.setProjectId(bmpList.get(i).getId());
-//            payMailBillProject.setProjectType(bmpList.get(i).getProjectType());
-//            payMailBillProject.setInvoiceAmount(bmpList.get(i).getInvoiceAmount());
-//            payMailBillProjectService.save(payMailBillProject);
-//
-////            更新项目表开票状态
-//            getMakeInvoice(payMailBillProject);
-//        }
+        payMailBillInsert(payMailBill);
 
         for(PayMailBillProject bmp : bmpList){
             bmp.setBillId(payMailBill.getId());
@@ -207,7 +193,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
         payMailBill.setChargeCompanyName(tbMember.getCompanyName());
         payMailBill.setInvoiceAmount(amountReceivable);
         payMailBill.setPostStatus(1);
-        payMailBill.setMobile(PasswordUtil.decrypt(payMailBill.getMobile()));
+        payMailBill.setContactMobile(PasswordUtil.decrypt(payMailBill.getContactMobile()));
         payMailBill.setBillDate(payMailBill.getSendDate());
         payMailBillService.save(payMailBill);
         //添加关联关系
@@ -345,6 +331,23 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
         return "success";
     }
 
+    /**
+     * 新增票据邮寄表
+     */
+    private void payMailBillInsert(PayMailBillVO payMailBill){
+
+        PayContactsManagement contact= payContactsManagementMapper.selectById(payMailBill.getContactId());
+        payMailBill.setContactName(contact.getName());
+        payMailBill.setContactMobile(contact.getPhone());
+
+        //邮政编码是空代表单个开票，联系人信息需要自己查
+        if(StringUtils.isBlank(payMailBill.getPostalCode())){
+            payMailBill.setPostalCode(contact.getPostalCode());
+            payMailBill.setContactAddress(contact.getContactAddress());
+        }
+        payMailBillService.save(payMailBill);
+    }
+
     /**
      * 更新项目表开票状态
      * @return