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

1585 Commits (e555b705bed168dbc1c7b6fca5ad7ec6296cb65e)

Author SHA1 Message Date
Qiuyi LI f458268f4d Update PlatformOrder model 2024-01-26 16:53:36 +01:00
Qiuyi LI c4c9390acc Remove status setting in MabangOrderSyncJob since allstatus are now automatically added 2024-01-26 16:48:26 +01:00
Qiuyi LI 8e881edd54 Add allstatus parameter when platformIds field is present in Mabang requests 2024-01-26 16:38:21 +01:00
Qiuyi LI b821e7f51b Use the latest Shopify API (upgrade from 2022-10 to 2024-01) 2024-01-26 16:35:40 +01:00
Qiuyi LI 316e4b1c67 Update Order model 2024-01-26 16:33:06 +01:00
Qiuyi LI f863a876aa Update Shop model 2024-01-26 16:27:58 +01:00
Qiuyi LI 5431617a87 Merge branch 'dev' into shouman_api 2024-01-12 16:39:52 +01:00
Qiuyi LI 2d9b6635b1
Merge pull request #55 from LQYBill/release 
Release
 2024-01-12 16:30:10 +01:00
Qiuyi LI 2c0dc9d805 Update version: release 1.9.3 2024-01-12 16:29:28 +01:00
Qiuyi LI 382eb3e65d
Merge pull request #54 from LQYBill/dev 
Release 1.9.3
 2024-01-12 16:23:35 +01:00
Qiuyi LI fdd5159032
Merge pull request #53 from LQYBill/fix/breakdownInvoice 
fix : reintroduce PDF in breakdownInvoice + conditional balance update
 2024-01-12 16:17:45 +01:00
Gauthier LO c64bed04ee fix : reintroduce PDF in breakdownInvoice + conditional balance update 
feature : SkuAssociationToClientJob
 2024-01-12 16:10:00 +01:00
Qiuyi LI a560ad7c9e Merge branch 'dev' into shouman_api 2024-01-11 17:03:50 +01:00
Qiuyi LI 4ca8ea4e84 Merge branch 'dev' into shouman_api 
# Conflicts:
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Country.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/PlatformOrder.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderContentMapper.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml
 2024-01-11 17:02:54 +01:00
Qiuyi LI d8ab00463b
Merge pull request #52 from LQYBill/release 
Release
 2024-01-11 16:55:34 +01:00
Qiuyi LI 2b5635e8ec Update version: release 1.9.2 2024-01-11 16:54:49 +01:00
Qiuyi LI ad0994b84e
Merge pull request #51 from LQYBill/dev 
Release 1.9.2
 2024-01-11 15:42:18 +01:00
Qiuyi LI d2cad68020
Merge pull request #50 from LQYBill/fix/InitBalanceError 
fix : handle not initialized balance error and uninvoiced purchase fe…
 2024-01-11 15:08:43 +01:00
Gauthier LO 7c02621910 fix : typo 2024-01-11 15:02:09 +01:00
Gauthier LO 3fdf1d27eb fix : handle not initialized balance error and uninvoiced purchase fees orders 2024-01-11 11:41:01 +01:00
Qiuyi LI 323d22935c
Merge pull request #49 from LQYBill/fix/clientInvoice 
fix : display shipping invoiced orders with invoiceable purchase fees…
 2024-01-10 14:34:28 +01:00
Gauthier LO f6518e327e
Update InvoiceController.java 
notification dest
 2024-01-10 12:10:47 +01:00
Gauthier LO 0795f245c2 fix : added enum to describe invoice status and product availability 2024-01-10 11:57:59 +01:00
Gauthier LO be558d5c9a fix : display shipping invoiced orders with invoiceable purchase fees + replace purchaseOrder status with paidAmount 2024-01-10 11:38:16 +01:00
zhangdaiscott e333b126b6 微服务下字典拦截器报错 2024-01-10 14:58:01 +08:00
zhangdaiscott 3618842f44 [issue/5787]增加非空判断防止代码生成时空指针异常 2024-01-09 19:12:16 +08:00
Qiuyi LI 4ef217249e
Merge pull request #48 from LQYBill/dev 
Merge new feature into release
 2024-01-08 16:20:21 +01:00
Qiuyi LI 52969ecd7c
Merge pull request #47 from LQYBill/fix/PurchaseOrder 
fix : better purchase status + better job name display
 2024-01-08 14:43:13 +01:00
Gauthier LO 6f05d8c1bb fix : better purchase status + better job name display 
feature :client invoicing internal use
 2024-01-08 12:23:09 +01:00
zhangdaiscott fd8c848c9e 修改小bug 2024-01-07 20:30:49 +08:00
zhangdaiscott 09614a0239 修复几个bug 2024-01-07 20:28:41 +08:00
Qiuyi LI 79d610ce5f Update version: release 1.9.0 2024-01-05 12:32:50 +01:00
Qiuyi LI 1c73c09305
Merge pull request #46 from LQYBill/dev 
Merge new feature into release
 2024-01-05 12:20:48 +01:00
Qiuyi LI 5b0e4afe42
Merge pull request #45 from LQYBill/release 
Merge hotfix 1.8.2 to dev
 2024-01-05 12:10:31 +01:00
Qiuyi LI 5930515a90
Merge pull request #44 from LQYBill/feature/creditPage 
Feature/credit page
 2024-01-05 11:22:43 +01:00
Gauthier LO bbbf298825
Update ShippingInvoiceController.java 
cleanup convertToPdf function not deleted during merge
 2024-01-05 09:41:57 +01:00
Qiuyi LI daecbead81
Update ShippingInvoiceController.java 2024-01-04 17:12:32 +01:00
Gauthier LO fdec4d77f1 Merge remote-tracking branch 'origin/feature/creditPage' into feature/creditPage 2024-01-04 17:02:55 +01:00
Gauthier LO b59b2ba00c feature : transaction.sql updated 2024-01-04 17:02:32 +01:00
Gauthier LO b426e836ed
Merge branch 'dev' into feature/creditPage 2024-01-04 16:29:23 +01:00
Gauthier LO 67cb86e25b feature : feature : Self-service invoicing rework + Purchase Order Registration Page + ShippingFeeBillableNotificationJob 2024-01-04 15:57:15 +01:00
zhangdaiscott 6fe8f1d81a 从3.6.2+版本增加flyway自动升级数据库机制 2024-01-04 14:56:06 +08:00
zhangdaiscott 0bd7f715c4 默认删除人大金仓依赖，需要请自己放开 2024-01-04 13:57:23 +08:00
zhangdaiscott 041d88161e 2024年首版本发布（antd4和仪表盘大升级） 2024-01-03 22:12:07 +08:00
zhangdaiscott 79a62aa056 从3.6.2+版本增加flyway自动升级数据库机制 2024-01-03 22:07:27 +08:00
zhangdaiscott b86b4d9676 从3.6.2+版本增加flyway自动升级数据库机制 2024-01-03 22:01:07 +08:00
zhangdaiscott aeaac80012 2024年首版本发布（antd4和仪表盘大升级） 2024-01-03 19:46:35 +08:00
zhangdaiscott e0ef20cf08 3.6.2版本对应的数据库脚本 2024-01-03 18:58:30 +08:00
zhangdaiscott 169a66f5dd 升级新版本号3.6.2 2024-01-03 13:47:33 +08:00
zhangdaiscott 7e39b31123 日志暂时不做权限控制 2024-01-03 13:44:36 +08:00