diff --git a/db/jeecgboot-mysql-5.7.sql b/db/jeecgboot-mysql-5.7.sql index c24440bd4..0de0a745f 100644 --- a/db/jeecgboot-mysql-5.7.sql +++ b/db/jeecgboot-mysql-5.7.sql @@ -1,5 +1,5 @@ -CREATE database if NOT EXISTS `wia_app_3` default character set utf8mb4 collate utf8mb4_general_ci; -USE `wia_app_3`; +CREATE database if NOT EXISTS `wia_app` default character set utf8mb4 collate utf8mb4_general_ci; +USE `wia_app`; /* Navicat Premium Data Transfer diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/PlatformOrderController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/PlatformOrderController.java index 188472d19..af1605c41 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/PlatformOrderController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/PlatformOrderController.java @@ -10,7 +10,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import net.sf.saxon.functions.ScalarSystemFunction; import org.jeecg.modules.business.domain.api.mabang.getorderlist.OrderStatus; import org.jeecg.modules.business.mapper.PlatformOrderMapper; import org.jeecg.modules.business.vo.PlatformOrderQuantity; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java index 4c7c9386c..302d4334b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java @@ -29,6 +29,7 @@ import org.jeecg.modules.business.service.impl.ProviderMabangServiceImpl; import org.jeecg.modules.business.vo.*; import org.jeecg.modules.quartz.entity.QuartzJob; import org.jeecg.modules.quartz.service.IQuartzJobService; +import org.jeecg.modules.system.service.ISysDepartService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -118,6 +119,8 @@ public class InvoiceController { @Autowired private ISysBaseAPI ISysBaseApi; @Autowired + private ISysDepartService sysDepartService; + @Autowired Environment env; @Value("${jeecg.path.shippingInvoiceDir}") @@ -957,6 +960,7 @@ public class InvoiceController { @GetMapping(value = "/checkInvoiceValidity") public Result checkInvoiceValidity(@RequestParam("invoiceNumber") String invoiceNumber) { + String companyOrgCode = sysDepartService.queryCodeByDepartName(env.getProperty("company.orgName")); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String orgCode = sysUser.getOrgCode(); String email = sysUser.getEmail(); @@ -979,7 +983,7 @@ public class InvoiceController { client = clientService.getClientFromPurchase(invoiceID); customerFullName = client.fullName(); String destEmail; - if(orgCode.contains("A04")) { + if(!orgCode.equals(companyOrgCode)) { System.out.println(email + " - " + client.getEmail()); if(!client.getEmail().equals(email)) { return Result.error(403,"Not authorized to view this page."); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/ClientMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/ClientMapper.java index ae9702ebe..e366d0505 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/ClientMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/ClientMapper.java @@ -29,4 +29,6 @@ public interface ClientMapper extends BaseMapper { List getClientsFromPurchases(@Param("purchaseIds") List purchaseIds); Client getClientBySku(@Param("skuId") String skuId); + + Client getClientFromInvoice(@Param("invoiceNumber") String invoiceNumber); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ClientMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ClientMapper.xml index 8f26e725b..2450ced08 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ClientMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ClientMapper.xml @@ -64,4 +64,12 @@ JOIN client_sku cs ON c.id = cs.client_id WHERE cs.sku_id = #{skuId}; + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IClientService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IClientService.java index dc13aff0d..d174abb88 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IClientService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IClientService.java @@ -56,4 +56,6 @@ public interface IClientService extends IService { List getClientsFromPurchases(List purchaseIds); Client getClientBySku(String skuId); + + Client getClientFromInvoice(String invoiceNumber); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/PlatformOrderShippingInvoiceService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/PlatformOrderShippingInvoiceService.java index 9318bf8ca..927d65e4f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/PlatformOrderShippingInvoiceService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/PlatformOrderShippingInvoiceService.java @@ -50,6 +50,8 @@ import static org.jeecg.modules.business.entity.Invoice.InvoiceType.*; @Slf4j public class PlatformOrderShippingInvoiceService { + @Autowired + IClientService clientService; @Autowired ICurrencyService currencyService; @Autowired @@ -745,6 +747,13 @@ public class PlatformOrderShippingInvoiceService { log.info("Generating a new invoice file ..."); if(filetype.equals("invoice")) pathList = generateInvoiceExcel(invoiceNumber, filetype); + else if(filetype.equals("detail")){ + Client client = clientService.getClientFromInvoice(invoiceNumber); + List details = getInvoiceDetail(invoiceNumber); + List refunds = savRefundWithDetailService.getRefundsByInvoiceNumber(invoiceNumber); + exportToExcel(details, refunds, invoiceNumber, client.getInvoiceEntity(), client.getInternalCode()); + pathList = getPath(INVOICE_DETAIL_DIR, invoiceNumber); + } else { return "ERROR"; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ClientServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ClientServiceImpl.java index 072f0893d..c7789a776 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ClientServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ClientServiceImpl.java @@ -143,6 +143,11 @@ public class ClientServiceImpl extends ServiceImpl impleme return clientMapper.getClientBySku(skuId); } + @Override + public Client getClientFromInvoice(String invoiceNumber) { + return clientMapper.getClientFromInvoice(invoiceNumber); + } + @Override public String getClientEntity(String id) { return clientMapper.getClientEntity(id); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java index b1623aad7..15f0978ba 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java @@ -170,4 +170,6 @@ public interface SysDepartMapper extends BaseMapper { * @return */ List getSysDepartList(@Param("parentId") String parentId,@Param("tenantId") Integer tenantId); + + String queryCodeByDepartName(@Param("departName") String departName); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml index 597d677a3..5e3c0ebfe 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml @@ -176,4 +176,9 @@ ORDER BY depart_order DESC + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java index 04caf35ea..286fb5333 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java @@ -231,4 +231,6 @@ public interface ISysDepartService extends IService{ * @param errorMessageList */ void importSysDepart(List listSysDeparts, List errorMessageList); + + String queryCodeByDepartName(String departName); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java index edbc814ba..94869243c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java @@ -1339,6 +1339,11 @@ public class SysDepartServiceImpl extends ServiceImpl