1

src/main/java/com/fdkankan/sale/service/impl/RepairInvoiceServiceImpl.java

@@ -8,14 +8,13 @@ import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.sale.common.CacheUtil;
 import com.fdkankan.sale.common.FilePath;
 import com.fdkankan.sale.common.ResultCode;
+import com.fdkankan.sale.entity.Customer;
 import com.fdkankan.sale.entity.MailTemplate;
 import com.fdkankan.sale.entity.RepairInvoice;
 import com.fdkankan.sale.exception.BusinessException;
 import com.fdkankan.sale.mapper.IRepairInvoiceMapper;
-import com.fdkankan.sale.service.IMailTemplateService;
-import com.fdkankan.sale.service.IRepairInvoiceService;
+import com.fdkankan.sale.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.sale.service.IRepairService;
 import com.fdkankan.sale.vo.request.RepairInvoiceParam;
 import com.fdkankan.sale.vo.response.RepairInvoiceVo;
 import org.apache.commons.lang3.StringUtils;
@@ -41,6 +40,8 @@ public class RepairInvoiceServiceImpl extends ServiceImpl<IRepairInvoiceMapper,
     IRepairService repairService;
     @Autowired
     FYunFileServiceInterface fYunFileServiceInterface;
+    @Autowired
+    ICustomerService customerService;
 
 
     @Override
@@ -72,8 +73,13 @@ public class RepairInvoiceServiceImpl extends ServiceImpl<IRepairInvoiceMapper,
             if(StringUtils.isBlank(param.getInvoiceNo()) || StringUtils.isBlank(param.getInvoiceImg())){
                 throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
             }
+            String userName = repairInvoice.getInvoiceEmail();
+            Customer customer = customerService.getByRepairId(repairInvoice.getRepairId());
+            if(customer != null){
+                userName = customer.getCompanyName();
+            }
 
-            MailTemplate mailTemplate = this.setMailMsg(repairInvoice.getRepairId(),repairInvoice.getGetAddrName());
+            MailTemplate mailTemplate = this.setMailMsg(repairInvoice.getRepairId(),userName);
 
             String imagePath = param.getInvoiceImg().replaceAll(CacheUtil.host,"");
             String localPath = FilePath.file_path + imagePath;