github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,056 Commits
3 Branches
69 Tags
146 MiB
Commit Graph

1056 Commits (8b32a17a00ca9f49113a8390b8b2cf80f80ee788)

Author SHA1 Message Date
Qiuyi LI 8b32a17a00
Merge pull request #31 from LQYBill/fix/invoiceExcelBug 
fix: Excel display bug in invoices
 2023-09-15 11:21:50 +02:00
Qiuyi LI 8228862f39
Update AbstractInvoice.java 
Cleanup comments
 2023-09-15 11:21:37 +02:00
Qiuyi LI abada459bb
Update AbstractInvoice.java 
Delete system.out.println
 2023-09-15 11:20:28 +02:00
Gauthier LO 0561f8a870 fix: Excel display bug in invoices 2023-09-15 11:02:50 +02:00
Qiuyi LI f64086699d
Merge pull request #30 from LQYBill/archive_order_job_rate_limiter 
Archive order job rate limiter
 2023-09-14 16:16:26 +02:00
Qiuyi LI a0db239994 Use ThrottlingExecutorService in ArchiveOrderJob as MabangAPI has a 300 requests per minute limit 2023-09-14 16:13:48 +02:00
Qiuyi LI bcf57915cc Add thread executor service with throttling 2023-09-14 16:12:40 +02:00
Qiuyi LI c21a8b50fe Update project version 2023-09-13 16:40:40 +02:00
Qiuyi LI 18a8448684
Merge pull request #28 from LQYBill/update_tube_adding_job 
Add tube rule for 30X40 portraits
 2023-09-13 16:23:03 +02:00
Qiuyi LI cf2b51c0f7 Add tube rule for 30X40 portraits 2023-09-13 16:21:26 +02:00
Qiuyi LI 708cc5cd73
Merge pull request #26 from LQYBill/fix/mavenGpgPlugin 
Fix/maven gpg plugin
 2023-08-25 11:35:13 +02:00
Gauthier LO 07ba6510fd added maven gpg plugin 2023-08-25 11:32:46 +02:00
Qiuyi LI e7857333e3 Update project version 2023-08-24 15:41:46 +02:00
Qiuyi LI 84db512e7c
Merge pull request #25 from LQYBill/dev 
Release note 1.6.0
 2023-08-24 15:40:37 +02:00
Qiuyi LI 8da45dce22 Code optimization 2023-08-24 14:03:32 +02:00
Qiuyi LI 0eb6aadbff
Merge pull request #24 from LQYBill/fix/shippingCalculation 
fix: shipping fee calculation precision
 2023-08-23 11:30:52 +02:00
Gauthier LO dc4d67fcf8 fix: shipping fee calculation precision 2023-08-22 17:34:03 +02:00
Qiuyi LI ba9ba76a7e
Merge pull request #23 from LQYBill/fix/pendingTask 
Fix/pending task
 2023-08-22 16:02:04 +02:00
Gauthier LO f2ff97b1d3 fix: cancelInvoice 2023-08-22 15:57:29 +02:00
Gauthier LO 06d405b7e0 feature : task history 2023-08-22 15:15:24 +02:00
Qiuyi LI ef0ff44d23
Merge pull request #21 from LQYBill/feature/breakdownInvoice 
Feature/breakdown invoice
 2023-08-22 15:12:10 +02:00
Qiuyi LI b3f10e42ea
Merge pull request #22 from LQYBill/fix/cancelInvoice 
Fix/cancel invoice
 2023-08-22 15:11:57 +02:00
Qiuyi LI cebff71e80 Revert "Delete application-dev.yml" 
This reverts commit 828aeacf1a.
 2023-08-22 14:52:37 +02:00
Gauthier LO e57aea61f0 fix : cancel invoice now revert erp status from 4 to 3 2023-08-21 17:54:36 +02:00
Qiuyi LI 828aeacf1a
Delete application-dev.yml 2023-08-21 15:42:22 +02:00
Gauthier LO 1fb0f154ca email is now sent to user and service 2023-08-21 15:16:54 +02:00
Gauthier LO cd4ad1e5fe feature : Making Shipping invoice in breakdown page + zip files and email 2023-08-21 12:45:04 +02:00
Gauthier LO 555e697633 Merge branch 'feature/breakdownInvoice' of github.com:LQYBill/wia_app into feature/breakdownInvoice 2023-08-17 16:26:53 +02:00
Gauthier LO 8eccba5df2 maven jeecg 3.5.1 2023-08-17 16:21:12 +02:00
Gauthier LO a92cd741b1 feature: (WIP) Invoicing in breakdown page 2023-08-17 16:21:12 +02:00
Gauthier LO 314a4b7ac4 feature: (WIP) Invoicing in breakdown page 2023-08-17 09:52:00 +02:00
Qiuyi LI 00914ac93e
Merge pull request #20 from LQYBill/dev 
Release 1.5.0
 2023-08-09 14:08:55 +02:00
Qiuyi LI 8d5a26bb62 Release note: Add SKU prices in RMB, add SAV refunds to invoice detail and minors improvements 2023-08-09 11:43:33 +02:00
Qiuyi LI 2223f19eab
Merge pull request #19 from LQYBill/sav_refunds_in_invoice_detail 
Sav refunds in invoice detail and RMB SKU prices
 2023-08-09 11:40:36 +02:00
Qiuyi LI f6dfaffa12 Feature: Add Luxembourg Post tracking number pattern 2023-08-09 11:30:51 +02:00
Qiuyi LI bc05f0db5a Feature: Add SKU prices in RMB, to be used in priority if present 2023-08-09 11:30:27 +02:00
Qiuyi LI 6c8d0c06b7 Fix: Do not retrieve SAV refunds for orders who haven't been invoiced yet in the first place 2023-08-08 11:17:22 +02:00
Qiuyi LI 2fa8cf0a2e Feature : Add SAV refunds to all invoices 2023-08-07 17:23:22 +02:00
Qiuyi LI 3aa3601303 Feature: Add SAV refunds (separate sheet) to invoice detail export 2023-08-07 17:22:48 +02:00
Qiuyi LI 476bbe47e2 Feature: Add method to get SAV refunds by shipping invoice number 2023-08-07 17:22:20 +02:00
Qiuyi LI e0191b62f9 Feature: Add shop name and Mabang ID to SavRefundWithDetail model 2023-08-07 16:55:56 +02:00
Qiuyi LI 3570da7c0f Add SQL backup scripts for existing views 2023-08-07 16:27:36 +02:00
Qiuyi LI b192d43a4c Release note 1.4.0: Product weights can now be mass edited 2023-08-07 15:50:20 +02:00
Qiuyi LI 846f75b10d
Merge pull request #18 from LQYBill/feature/weightEdit 
feature: product list page with editing feature
 2023-08-04 15:06:09 +02:00
Gauthier LO 7ac881f83c update by is now updated 2023-08-04 15:02:30 +02:00
Gauthier LO 255e304fd3 feature: product list page with editing feature 2023-08-04 12:43:45 +02:00
Qiuyi LI 984707043a
Merge pull request #17 from LQYBill/dev 
Release of 1.3.0
 2023-08-02 18:00:12 +02:00
Qiuyi LI 710540a1c6 Release note 1.3.0: Add a "delete" button on shipping invoice list page to cancel an invoice 2023-08-02 17:55:23 +02:00
Qiuyi LI 8829c02c79
Merge pull request #16 from LQYBill/feature/deleteInvoice 
feature: cancel invoice
 2023-08-02 16:25:44 +02:00
Gauthier LO a7235bba36
Update PlatformOrderContentMapper.xml 2023-08-02 16:19:25 +02:00