github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix : typo

pull/6221/head
Gauthier LO 2024-01-11 15:02:09 +01:00
parent 3fdf1d27eb
commit 7c02621910
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/client/TransactionController.java
View File

@ -113,7 +113,7 @@ public class TransactionController {
}
// purchase estimation
List<PlatformOrder> purchaseOrders = platformOrderService.fetchUninvoicedPurchaseOrdersByShopFroClient(shopIds, Arrays.asList(1,2,3));
List<PlatformOrder> purchaseOrders = platformOrderService.fetchUninvoicedPurchaseOrdersByShopForClient(shopIds, Arrays.asList(1,2,3));
BigDecimal purchaseEstimation = BigDecimal.ZERO;
if(shippingOrders.isEmpty() && purchaseOrders.isEmpty()) {

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderMapper.java
View File

@ -186,7 +186,7 @@ public interface PlatformOrderMapper extends BaseMapper<PlatformOrder> {
void cancelBatchInvoice(@Param("invoiceNumbers") List<String> invoiceNumbers);
List<PlatformOrder> findUninvoicedShippingOrdersByShopForClient(@Param("shopIds") List<String> shopIds, @Param("erpStatuses") List<Integer> erpStatuses);
List<PlatformOrder> fetchUninvoicedPurchaseOrdersByShopFroClient(@Param("shopIds") List<String> shopIds, @Param("erpStatuses") List<Integer> erpStatuses);
List<PlatformOrder> fetchUninvoicedPurchaseOrdersByShopForClient(@Param("shopIds") List<String> shopIds, @Param("erpStatuses") List<Integer> erpStatuses);
List<PlatformOrder> findUninvoicedOrdersByShopForClient(@Param("shopIds") List<String> shopIds, @Param("erpStatuses") List<Integer> erpStatuses);
List<String> findUninvoicedOrderIdsByShopForClient(@Param("shopIds") List<String> shopIds, @Param("erpStatuses") List<Integer> erpStatuses);

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml
View File

@ -575,7 +575,7 @@
#{shopId}
</foreach>;
</select>
<select id="fetchUninvoicedPurchaseOrdersByShopFroClient" resultType="org.jeecg.modules.business.entity.PlatformOrder">
<select id="fetchUninvoicedPurchaseOrdersByShopForClient" resultType="org.jeecg.modules.business.entity.PlatformOrder">
SELECT *
FROM platform_order
WHERE IF(shipping_invoice_number IS NOT NULL, shipping_invoice_number LIKE '%%%%-%%-2%%%',

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPlatformOrderService.java
View File

@ -193,7 +193,7 @@ public interface IPlatformOrderService extends IService<PlatformOrder> {
* @param erpStatuses
* @return
*/
List<PlatformOrder> fetchUninvoicedPurchaseOrdersByShopFroClient(List<String> shopIds, List<Integer> erpStatuses);
List<PlatformOrder> fetchUninvoicedPurchaseOrdersByShopForClient(List<String> shopIds, List<Integer> erpStatuses);
/**
* Find all order that can be invoiced (shipping and purchase).

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderServiceImpl.java
View File

@ -405,8 +405,8 @@ public class PlatformOrderServiceImpl extends ServiceImpl<PlatformOrderMapper, P
}
@Override
public List<PlatformOrder> fetchUninvoicedPurchaseOrdersByShopFroClient(List<String> shopIds, List<Integer> erpStatuses) {
return platformOrderMap.fetchUninvoicedPurchaseOrdersByShopFroClient(shopIds, erpStatuses);
public List<PlatformOrder> fetchUninvoicedPurchaseOrdersByShopForClient(List<String> shopIds, List<Integer> erpStatuses) {
return platformOrderMap.fetchUninvoicedPurchaseOrdersByShopForClient(shopIds, erpStatuses);
}
@Override