trade-client/src/main/java/com/trade/client/trade/salescontract/service/impl/SalesServiceImpl.java

@@ -826,8 +826,10 @@ public class SalesServiceImpl implements SalesService {
                 contractTemplateDto.setBuyerContact(importerEntity.getContactName());
                 contractTemplateDto.setBuyerContactEn(importerEntity.getContactName());
                 // contractTemplateDto.setBuyerContactEn(getEnValues(importerEntity.getI18n(), "contactName"));
-                contractTemplateDto.setBuyerAddress(importerEntity.getBusinessAddress());
-                contractTemplateDto.setBuyerAddressEn(importerEntity.getBusinessAddress());
+                contractTemplateDto.setBuyerAddress(
+                        importerEntity.getBusinessAddress() + "," + importerEntity.getBusinessCity() + ","
+                                + importerEntity.getBusinessProvince() + "," + importerEntity.getBusinessPostCode());
+                contractTemplateDto.setBuyerAddressEn(contractTemplateDto.getBuyerAddress());
                 // contractTemplateDto.setBuyerAddressEn(getEnValues(importerEntity.getI18n(), "businessAddress"));
                 contractTemplateDto.setBuyerEmail(importerEntity.getContactEmail());
             }