24282 2 anni fa
parent
commit
c216b6d776

+ 3 - 1
hx-mail/src/main/java/com/fjhx/mail/controller/message/MailController.java

@@ -50,7 +50,9 @@ public class MailController {
         return JSON.parseObject(post);
     }
 
-
+    /**
+     * 发送邮件
+     */
     @NonInterception
     @PostMapping("/sendMail")
     public Object sendMail(@RequestBody SendDto dto) {

+ 18 - 0
hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractPdfInfoVo.java

@@ -121,6 +121,24 @@ public class ContractPdfInfoVo {
      */
     private BigDecimal totalAmount;
 
+    /**
+     * 交期
+     */
+    private String deliveryTime;
+
+    /**
+     * 运输方式(字典  shipping_method)
+     */
+    private String transportMethod;
+
+    /**
+     * 收款账号ID
+     *
+     * <p>
+     * {@link com.fjhx.account.entity.account.po.AccountManagement}
+     */
+    private Long shroffAccountId;
+
     @Getter
     @Setter
     public static class ProductInfo {

+ 3 - 2
hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -355,8 +355,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         contractPdfInfoVo.setTradeMethods(contract.getTradeMethods());
         contractPdfInfoVo.setRemark(contract.getRemark());
         contractPdfInfoVo.setCurrency(contract.getCurrency());
-
-        // todo 收款账号详情
+        contractPdfInfoVo.setDeliveryTime(contract.getDeliveryTime());
+        contractPdfInfoVo.setTransportMethod(contract.getTransportMethod());
+        contractPdfInfoVo.setShroffAccountId(contract.getShroffAccountId());
     }
 
     /**