Compare commits

...

208 Commits

Author SHA1 Message Date
tuannt20 c1fe44959f fix conflict 2022-11-22 10:31:31 +07:00
phuanbui 913c762897 Merge pull request 'add get segment info' (#70) from feaure/staff-getinfo into develop
Reviewed-on: #70
2022-11-21 22:44:59 +00:00
anbuiselly 2719017b61 add cmt 2022-11-22 05:44:36 +07:00
anbuiselly 0a1c76bb88 add get segment info 2022-11-22 05:43:02 +07:00
thaingocquang 4d19b6d7cf Merge branch 'refactor-location' into develop 2022-11-21 16:20:33 +07:00
thaingocquang e3599d1903 [location] update location subject 2022-11-21 16:20:06 +07:00
thaingocquang 75c8aefb9e Merge branch 'refactor-location' into develop 2022-11-21 16:00:31 +07:00
thaingocquang 8b907cec0d new location subject 2022-11-21 15:59:56 +07:00
phuanbui 48460713cb Merge pull request 'change request get staff' (#69) from feaure/staff-getinfo into develop
Reviewed-on: #69
2022-11-21 03:39:07 +00:00
anbuiselly f8658523a2 change request get staff 2022-11-21 10:37:53 +07:00
phuanbui 691e9d76fa Merge pull request 'fix' (#68) from feaure/staff-getinfo into develop
Reviewed-on: #68
2022-11-21 01:55:47 +00:00
anbuiselly 74b88b9a2f fix 2022-11-21 08:55:30 +07:00
phuanbui ab51f5fd09 Merge pull request 'change mgs get staff-info' (#67) from feaure/staff-getinfo into develop
Reviewed-on: #67
2022-11-21 01:34:47 +00:00
anbuiselly f9c269ce2d change mgs get staff-info 2022-11-21 08:33:39 +07:00
thaingocquang 56cdb74646 Merge branch 'refactor-location' into develop 2022-11-21 00:29:44 +07:00
thaingocquang 1a77ac3d8e [location] update location resp model 2022-11-21 00:29:18 +07:00
thaingocquang 5eb76d813c Merge branch 'refactor-location' into develop 2022-11-21 00:09:03 +07:00
thaingocquang be18b81589 [location] update location resp model 2022-11-21 00:08:21 +07:00
phuanbui 45b49fb83c Merge pull request 'fix get list staff' (#66) from feaure/staff-getinfo into develop
Reviewed-on: #66
2022-11-18 14:50:21 +00:00
anbuiselly 2199bb4eef fix get list staff 2022-11-18 21:49:42 +07:00
phuanbui 6cd6c3e231 Merge pull request 'edit get staff-info' (#65) from feaure/staff-getinfo into develop
Reviewed-on: #65
2022-11-18 10:48:46 +00:00
anbuiselly 0a9381065f edit get staff-info 2022-11-18 17:47:26 +07:00
phuanbui d891c3a051 Merge pull request 'get staff by notification action' (#64) from feaure/staff-getinfo into develop
Reviewed-on: #64
2022-11-18 09:23:35 +00:00
anbuiselly 8cceae74ef get staff by notification action 2022-11-18 16:22:17 +07:00
Minh Nguyen 15ba847ef8 Merge pull request 'update notification opts' (#63) from feature/campaign into develop
Reviewed-on: #63
2022-11-18 07:52:29 +00:00
Sinh 17dace7edf remove err method email 2022-11-18 10:24:06 +07:00
Sinh 23df6da6bf Merge branch 'admin-push-notification-supplier' into develop 2022-11-18 10:14:21 +07:00
Sinh d45da3e74c nats - get supplier from old server 2022-11-18 10:13:41 +07:00
thaingocquang 89d10dbb7f Merge branch 'refactor-location' into develop 2022-11-17 17:19:24 +07:00
thaingocquang b9885a2a02 [location] RequestCondition oldSlugs 2022-11-17 17:19:04 +07:00
thaingocquang 35e98d866f Merge branch 'refactor-location' into develop 2022-11-17 16:50:03 +07:00
thaingocquang f602e17ef2 [location] add oldSlug to RequestCondition 2022-11-17 16:49:02 +07:00
Tue d293fb7412 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-17 13:56:08 +07:00
Tue 035fb59f64 build email 2022-11-17 13:55:44 +07:00
Minh Nguyen d10f445bf2 Merge pull request 'feature/campaign' (#62) from feature/campaign into develop
Reviewed-on: #62
2022-11-17 02:33:10 +00:00
Minh Nguyen b3722384f8 Merge pull request 'feature/campaign' (#60) from feature/campaign into develop
Reviewed-on: #60
2022-11-16 10:35:35 +00:00
Minh Nguyen d04712a560 Merge pull request 'feature/campaign' (#58) from feature/campaign into develop
Reviewed-on: #58
2022-11-16 10:23:51 +00:00
Nguyen Minh 44e7cca0d7 Merge branch 'feature/campaign' into develop 2022-11-14 15:11:18 +07:00
Nguyen Minh 3e1dcb2fe1 fix conflict 2022-11-14 14:47:20 +07:00
Tue 87d6bba079 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-09 14:28:29 +07:00
Tue a3206ebdd4 build auth sms 2022-11-09 14:28:10 +07:00
Tue 77547914e0 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-08 18:05:00 +07:00
Tue 3507d17029 build auth sms 2022-11-08 18:02:42 +07:00
QuanTT0110 b799bf834e Merge branch 'get-bank-info' of git.selly.red:Selly-Modules/natsio into develop 2022-11-08 18:01:27 +07:00
QuanTT0110 0580606373 get-bank-info 2022-11-08 18:00:24 +07:00
QuanTT0110 61498e1594 update 2022-11-08 15:22:53 +07:00
QuanTT0110 c95d28870f Merge branch 'refactor-supplier' of git.selly.red:Selly-Modules/natsio into develop 2022-11-08 14:54:57 +07:00
QuanTT0110 b45fb1d19a sync data warehouse into service supplier 2022-11-08 14:20:05 +07:00
Tue a5a42a3f4d Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-08 14:16:04 +07:00
Tue 2872e4f75b build auth sms 2022-11-08 14:15:47 +07:00
Tue ca99cdad86 build auth sms 2022-11-08 14:05:35 +07:00
Tue c004406728 build auth sms 2022-11-08 14:05:17 +07:00
Tue d244ae1dc1 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-08 14:02:17 +07:00
Tue 7e433426cb build auth sms 2022-11-08 14:02:07 +07:00
Tue bf3a9ed022 build auth sms 2022-11-08 14:00:58 +07:00
Tue 1cacdae547 build authsms 2022-11-08 13:58:30 +07:00
Tue 4d501a437c build authsms 2022-11-08 13:57:22 +07:00
Tue ffff325e78 build authsms 2022-11-08 13:53:52 +07:00
QuanTT0110 040c867c15 sync data warehouse into service supplier 2022-11-08 11:12:37 +07:00
QuanTT0110 dc33b5ac71 sync data warehouse into service supplier 2022-11-08 11:12:02 +07:00
QuanTT0110 5c3c5b6dcb sync data warehouse into service supplier 2022-11-08 11:09:35 +07:00
QuanTT0110 ae16428783 sync data warehouse into service supplier 2022-11-08 11:05:34 +07:00
thaingocquang d80b305b1a [location] update request model page & limit 2022-11-07 16:04:12 +07:00
thaingocquang 34b1de6d42 [location] update request model add page & limit 2022-11-07 15:48:28 +07:00
Tue e7c9490554 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-07 11:21:48 +07:00
Tue d946b993ee build auth sms 2022-11-07 11:21:37 +07:00
Tue 70b38d05cf build auth sms 2022-11-07 11:21:27 +07:00
Tue eb114a390f Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-04 17:29:07 +07:00
Tue 0b82072bea Merge branch 'master' of git.selly.red:Selly-Modules/natsio into build-auth-sms 2022-11-04 17:28:55 +07:00
Tue 382a2b7dfa build auth sms 2022-11-04 17:28:51 +07:00
Tue 283974d869 build auth sms 2022-11-04 17:28:33 +07:00
Tue b6f390064b build auth sms 2022-11-04 15:21:03 +07:00
Tue 88931f9c53 build auth sms 2022-11-04 15:20:31 +07:00
Sinh 174b4b0594 Merge branch 'refactor-supplier' into develop 2022-11-04 10:28:19 +07:00
Sinh 0d3c931c87 define nats func - supplier balance 2022-11-04 10:28:09 +07:00
Sinh 70a8d4e847 Merge branch 'refactor-supplier' into develop 2022-11-03 16:03:48 +07:00
Sinh aeec881299 define nats func - supplier balance 2022-11-03 16:02:43 +07:00
Tue 5797eb1a23 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-03 14:14:54 +07:00
Tue 32e93323b7 build auth sms 2022-11-03 14:14:25 +07:00
Tue b4811f091e build auth sms 2022-11-03 11:35:38 +07:00
Tue 634239a9f1 build auth sms 2022-11-03 11:35:23 +07:00
Tue 3c44e6511c Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into develop 2022-11-03 11:14:50 +07:00
Tue 587d21ce1b Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-03 11:14:38 +07:00
Sinh 69195e7442 Merge branch 'refactor-supplier' into develop 2022-11-03 11:11:41 +07:00
Sinh b345cd5395 Pull origin build-auth-sms into refactor-supplier 2022-11-03 11:09:36 +07:00
Tue 9407b2df6b build auth sms 2022-11-03 10:47:19 +07:00
Tue 6cade7d133 build auth sms 2022-11-03 10:46:56 +07:00
Tue 77f22993d4 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-03 00:17:59 +07:00
Tue 49426e322c build auth sms 2022-11-03 00:17:49 +07:00
Sinh 21435db9b3 Merge branch 'refactor-supplier' into develop 2022-11-02 17:27:22 +07:00
Sinh ac1ec030db define nats func - get supplier order cash and supplier withdraw cash 2022-11-02 17:27:10 +07:00
Sinh 01900b64e4 Merge branch 'refactor-supplier' into develop 2022-11-02 17:19:05 +07:00
Sinh 816316b558 define nats func - get supplier order cash and supplier withdraw cash 2022-11-02 17:18:11 +07:00
Tue bd5825b7f8 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-02 16:49:20 +07:00
Tue 55e3c07cf6 build auth sms 2022-11-02 16:49:12 +07:00
Sinh 868df4713d Merge branch 'master' of git.selly.red:Selly-Modules/natsio into refactor-supplier 2022-11-02 16:24:07 +07:00
Sinh e26762916c Merge branch 'master' of git.selly.red:Selly-Modules/natsio into refactor-supplier 2022-11-02 16:11:41 +07:00
Tue 19349b9813 build auth sms 2022-11-02 14:57:26 +07:00
Tue cdbbf9fc73 build auth sms 2022-11-02 14:56:58 +07:00
Sinh 7d00af18b4 Merge branch 'integrate-onpoint' into develop 2022-11-02 09:41:23 +07:00
Tue 15fd01d5d3 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-01 11:40:51 +07:00
Tue 285ddb75e7 build auth sms 2022-11-01 11:40:37 +07:00
Tue 8c63494417 build auth sms 2022-11-01 10:45:24 +07:00
Tue 56d210bf2d build auth sms 2022-11-01 10:44:41 +07:00
Tue 645effaa04 build authsms 2022-11-01 10:43:20 +07:00
Tue 9a69327679 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-10-31 17:02:49 +07:00
Tue 0d8e3969db build auth sms 2022-10-31 16:59:38 +07:00
Tue 64ad17016c Merge branch 'master' of git.selly.red:Selly-Modules/natsio into build-auth-sms 2022-10-31 16:59:28 +07:00
Tue ebd26022d9 build auth sms 2022-10-31 10:10:00 +07:00
Tue 79528f72e4 Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into develop 2022-10-31 10:09:31 +07:00
Tue f6a2b34a7f build authsms 2022-10-31 10:07:08 +07:00
Tue 7f03b98f90 build authsms 2022-10-31 10:04:13 +07:00
QuanTT0110 2dbeab594a Merge branch 'feature/get-freeship-info' of git.selly.red:Selly-Modules/natsio into develop 2022-10-28 11:39:47 +07:00
QuanTT0110 2602b22e40 fix get supplier free ship info 2022-10-28 11:39:29 +07:00
QuanTT0110 7377519ead Merge branch 'feature/get-freeship-info' of git.selly.red:Selly-Modules/natsio into develop 2022-10-28 11:19:26 +07:00
QuanTT0110 a86003caf0 fix get supplier free ship info 2022-10-28 11:19:15 +07:00
Tue 1e2d10b3ce build auth sms 2022-10-28 09:39:20 +07:00
QuanTT0110 0dafeb6f1f Merge branch 'feature/get-freeship-info' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 17:17:02 +07:00
QuanTT0110 0f4ba10479 get supplier freeship info 2022-10-27 17:16:45 +07:00
trunglt251292 9b59a6bc6a Merge branch 'refactor-location' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 16:31:17 +07:00
trunglt251292 006accb415 [Update] Response warehouse 2022-10-27 16:29:38 +07:00
QuanTT0110 37c20ac3c7 get supplier freeship info 2022-10-27 16:16:09 +07:00
quang1472001 8c82fe548b Merge branch 'refactor-location' into develop 2022-10-27 16:03:35 +07:00
quang1472001 cb45dbb694 [location] add slug to ResponseLocationAdress 2022-10-27 16:03:11 +07:00
QuanTT0110 73e2a8a7c8 get supplier freeship info 2022-10-27 15:52:39 +07:00
quang1472001 e020db1c74 resolve conflict 2022-10-27 14:32:08 +07:00
quang1472001 0bed9a6dfb [location] refactor code 2022-10-27 14:30:40 +07:00
quang1472001 d395f8944f Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 13:42:17 +07:00
quang1472001 6e5080c430 [location] update location client 2022-10-27 13:41:58 +07:00
QuanTT0110 ebb3cd070a Merge branch 'feature/get-freeship-by-supplierids' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 11:58:29 +07:00
QuanTT0110 72aaea5b87 fix get bank info 2022-10-27 11:58:19 +07:00
QuanTT0110 1c5666d7c1 Merge branch 'feature/get-freeship-by-supplierids' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 11:30:48 +07:00
QuanTT0110 389a26ad6f fix get bank info 2022-10-27 11:30:17 +07:00
Sinh ecb51cc5da Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 11:13:25 +07:00
quang1472001 86cfda6dce [location] create RequestCondition 2022-10-27 11:11:45 +07:00
QuanTT0110 96bc454514 fix conflict 2022-10-27 09:41:38 +07:00
QuanTT0110 33bc508f1f get bank and branches by bank ids 2022-10-27 09:37:07 +07:00
Sinh 708fad7c59 Merge branch 'master' of git.selly.red:Selly-Modules/natsio into refactor-supplier 2022-10-27 09:19:13 +07:00
Tue 574f61fe2f Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 09:18:06 +07:00
Tue 112c1c0f7d build auth sms 2022-10-27 09:17:20 +07:00
Sinh 97686ff405 Merge branch 'master' of git.selly.red:Selly-Modules/natsio into refactor-supplier 2022-10-27 09:16:36 +07:00
Tue bab221fcb5 Merge branch 'master' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 09:16:08 +07:00
Sinh ef6a15e939 Merge branch 'master' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 09:16:07 +07:00
Tue bb2405471b build auth sms 2022-10-27 09:15:14 +07:00
Sinh 8df9dc1138 Merge branch 'master' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 08:52:28 +07:00
Sinh 855cf4ad5f Merge branch 'refactor-supplier' into develop 2022-10-26 17:58:34 +07:00
Sinh 20f460b4ef create supplier cashflow 2022-10-26 17:56:15 +07:00
QuanTT0110 dcbf82a4d0 Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into feature/get-freeship-by-supplierids 2022-10-25 12:00:45 +07:00
QuanTT0110 27b14aa122 get freeships by supplier ids 2022-10-25 12:00:37 +07:00
trunglt251292 5dbde84ea9 Merge branch 'move-config-suppliers' of git.selly.red:Selly-Modules/natsio into develop 2022-10-24 10:56:03 +07:00
Minh Nguyen e35090e490 Merge pull request 'rerun' (#48) from feature/seller-add-field-planPackage into develop
Reviewed-on: #48
2022-10-24 03:07:44 +00:00
QuanTT0110 f0eb62f3f5 get list permission authsms 2022-10-21 11:49:48 +07:00
Sinh b5fe2c5a71 Merge branch 'integrate-onpoint' into develop 2022-10-21 09:27:07 +07:00
Tue 2b890e01ef Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-10-20 15:18:00 +07:00
Tue a6f9f9eac7 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-10-20 15:10:50 +07:00
Tue d2874bc681 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-10-20 14:40:39 +07:00
Tue 87158679a7 update auth sms 2022-10-20 14:32:32 +07:00
Sinh f3ef44279b Merge branch 'integrate-onpoint' into develop 2022-10-18 15:05:12 +07:00
Sinh e0ecb83b9e Merge branch 'add-queue-subscribe' into develop 2022-10-18 11:55:46 +07:00
Sinh 9c9ed32d58 Merge branch 'add-queue-subscribe' into develop 2022-10-18 11:47:24 +07:00
Minh Nguyen f6386332de Merge pull request 'get list warehouse freeship' (#46) from feature/get-list-warehouse-freeship into develop
Reviewed-on: #46
2022-10-17 08:13:42 +00:00
QuanTT0110 b7d963cc90 get list warehouse freeship 2022-10-17 15:09:50 +07:00
Sinh 65fe4d8380 Merge branch 'integrate-onpoint' into develop 2022-10-17 14:44:25 +07:00
Sinh 8d571022fc Merge branch 'integrate-onpoint' into develop 2022-10-17 11:25:33 +07:00
Sinh 722fa1aacf Merge branch 'update-payload' into develop 2022-10-17 11:24:30 +07:00
quang1472001 d71d7f0eb4 [location] add Keyword to WardRequestCondition struct 2022-10-13 10:23:11 +07:00
Tue af44ea63f4 fix warehouse 2022-10-12 11:38:54 +07:00
Tue c7ad6baf4c Merge branch 'feature/get-bank-info' of git.selly.red:Selly-Modules/natsio into develop 2022-10-11 14:02:55 +07:00
Minh Nguyen 539aa79128
Merge pull request #41 from Selly-Modules/feature/seller-add-field-planPackage
seller-add-field-planPackage
2022-10-10 09:06:46 +07:00
quang1472001 ed0f16623a add old slug to location response struct 2022-10-07 15:23:02 +07:00
quang1472001 3e13cb55b3 update location request condition 2022-10-06 11:22:10 +07:00
quang1472001 cebb3214cf update location add slug & DistinctWithField 2022-10-06 10:55:49 +07:00
quang1472001 b9b55d144e update fix GetDistrictByCondition 2022-10-06 10:20:47 +07:00
quang1472001 29b2b861ff update location add find by slug 2022-10-06 09:19:21 +07:00
quang1472001 a86a097886 update location 2022-10-05 18:15:36 +07:00
quang1472001 863e924a5e update location 2022-10-05 18:12:42 +07:00
quang1472001 7a3e50ef97 update location 2022-10-05 17:59:44 +07:00
Sinh 13a465b627 Merge branch 'integrate-onpoint' into develop 2022-10-04 15:47:25 +07:00
Sinh 7f57a9bd97 Merge branch 'export-warehouse-data' into develop 2022-09-30 10:41:46 +07:00
trunglt251292 8fe3b39134 Merge branch 'feature/seller-by-id' of github.com:Selly-Modules/natsio into develop 2022-09-30 10:29:50 +07:00
Sinh 68146c7c2a Merge branch 'integrate-onpoint' into develop 2022-09-28 09:37:32 +07:00
Sinh 439d1a0d5a Merge branch 'global-care-car-insurance' into develop 2022-09-28 09:33:32 +07:00
Minh Nguyen ed564effe6
Merge pull request #36 from Selly-Modules/feature/seller-by-id
js cashflow seller
2022-09-23 23:33:01 +07:00
Minh Nguyen c2acdaf244
Merge pull request #35 from Selly-Modules/feature/seller-by-id
Feature/seller by
2022-09-23 22:12:04 +07:00
Minh Nguyen 40e5219036
Merge pull request #34 from Selly-Modules/feature/seller-by-id
update js stream
2022-09-23 14:47:28 +07:00
Minh Nguyen df9ccf9d69
Merge pull request #33 from Selly-Modules/feature/seller-by-id
stream name
2022-09-23 11:58:12 +07:00
Minh Nguyen e61ae3c10d
Merge pull request #32 from Selly-Modules/feature/seller-by-id
jestream
2022-09-23 11:17:31 +07:00
Nguyen Minh 36ad0b4972 Merge branch 'feature/seller-by-id' into develop 2022-09-23 10:14:24 +07:00
quang1472001 d7c0138d6a Merge branch 'develop' of github.com:Selly-Modules/natsio into develop 2022-09-22 15:18:06 +07:00
quang1472001 021df099cc update location 2022-09-22 14:56:31 +07:00
Minh Nguyen 08a9fdabe0
Merge pull request #30 from Selly-Modules/feature/seller-by-id
support chat get seller info
2022-09-22 13:49:48 +07:00
Tue 6b168cd98a bank info 2022-09-21 14:06:59 +07:00
Minh Nguyen 4a5adc610e
Merge pull request #28 from Selly-Modules/feature/seller-by-id
get seller info support chat
2022-09-21 10:19:57 +07:00
trunglt251292 a9cc99994f Merge branch 'update-inventory-detail' of github.com:Selly-Modules/natsio into develop 2022-09-20 14:47:19 +07:00
trunglt251292 6bd4ebce2e Merge branch 'update-inventory-detail' of github.com:Selly-Modules/natsio into develop 2022-09-20 13:50:25 +07:00
trunglt251292 3c5c95b103 [Update] 2022-09-20 10:56:45 +07:00
trunglt251292 a261c32dc4 Merge branch 'update-inventory-detail' of github.com:Selly-Modules/natsio into develop 2022-09-20 10:29:13 +07:00
Sinh fa5be3e17c Merge branch 'integrate-onpoint' into develop 2022-09-19 15:02:07 +07:00
anbuiselly c449dd44f1
Merge pull request #27 from Selly-Modules/feature/seller-by-id
Feature/seller by
2022-09-19 14:54:08 +07:00
Sinh af85d25516 Merge branch 'integrate-onpoint' into develop 2022-09-19 14:19:07 +07:00
Minh Nguyen 389507050a
Merge pull request #25 from Selly-Modules/feature/seller-by-id
Feature/seller by
2022-09-19 11:51:05 +07:00
Sinh 86269e4292 Merge branch 'integrate-onpoint' into develop 2022-09-19 11:10:46 +07:00
Tue 22cd1eb18f bank info 2022-09-17 10:59:30 +07:00
Tue 44f0e4be44 bank info 2022-09-17 10:55:37 +07:00
trunglt251292 ddc0af6338 Merge branch 'selly-food' of github.com:Selly-Modules/natsio into develop 2022-09-16 15:36:57 +07:00
trunglt251292 5f5bfeb182 fix conflict 2022-09-16 14:52:01 +07:00
Nguyen Minh 139dc6a865 Fix conflict 2022-09-15 17:04:26 +07:00
Tue 4546d0e89b add bank branch info 2022-09-15 11:20:34 +07:00
54 changed files with 1535 additions and 255 deletions

37
client/auth_sms.go Normal file
View File

@ -0,0 +1,37 @@
package client
import (
"encoding/json"
"errors"
"git.selly.red/Selly-Modules/natsio"
"git.selly.red/Selly-Modules/natsio/model"
"git.selly.red/Selly-Modules/natsio/subject"
)
// AuthSMS ...
type AuthSMS struct{}
// GetAuthSMS ...
func GetAuthSMS() AuthSMS {
return AuthSMS{}
}
func (s AuthSMS) CheckPermission(p model.CheckPermissionRequest) error {
msg, err := natsio.GetServer().Request(subject.AuthSMS.CheckPermission, toBytes(p))
if err != nil {
return err
}
var r struct {
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return err
}
if r.Error != "" {
return errors.New(r.Error)
}
return nil
}

View File

@ -17,14 +17,15 @@ func GetBank() Bank {
return Bank{} return Bank{}
} }
func (s Bank) GetBankById(bankID string) (*model.BankBrief, error) { // GetBankInfo ...
msg, err := natsio.GetServer().Request(subject.Bank.GetBankById, toBytes(bankID)) func (s Bank) GetBankInfo(p []model.GetBankInfoRequest) ([]*model.ResponseBankInfo, error) {
msg, err := natsio.GetServer().Request(subject.Bank.GetBankInfo, toBytes(p))
if err != nil { if err != nil {
return nil, err return nil, err
} }
var r struct { var r struct {
Data *model.BankBrief `json:"data"` Data []*model.ResponseBankInfo `json:"data"`
Error string `json:"error"` Error string `json:"error"`
} }
@ -38,18 +39,40 @@ func (s Bank) GetBankById(bankID string) (*model.BankBrief, error) {
return r.Data, nil return r.Data, nil
} }
func (s Bank) CheckBankAndBranchByID(p model.BankBranchRequest) bool { func (s Bank) CheckBankAndBranchByID(p model.CheckBankAndBranchByIDRequest) bool {
msg, err := natsio.GetServer().Request(subject.Bank.CheckBankAndBranchByID, toBytes(p)) msg, err := natsio.GetServer().Request(subject.Bank.CheckBankAndBranchByID, toBytes(p))
if err != nil { if err != nil {
return false return false
} }
var r struct { var r struct {
Error string `json:"error"` Data bool `json:"data"`
} }
if err = json.Unmarshal(msg.Data, &r); err != nil { if err = json.Unmarshal(msg.Data, &r); err != nil {
return false return false
} }
return r.Error == "" return r.Data
}
// GetBankAndBranchDetail ...
func (s Bank) GetBankAndBranchDetail(p model.GetBankInfoRequest) (*model.ResponseBankInfo, error) {
msg, err := natsio.GetServer().Request(subject.Bank.GetBankInfoDetail, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data *model.ResponseBankInfo `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
} }

View File

@ -1,39 +0,0 @@
package client
import (
"encoding/json"
"errors"
"git.selly.red/Selly-Modules/natsio"
"git.selly.red/Selly-Modules/natsio/model"
"git.selly.red/Selly-Modules/natsio/subject"
)
// BankBranch ...
type BankBranch struct{}
// GetBankBranch ...
func GetBankBranch() BankBranch {
return BankBranch{}
}
func (s BankBranch) GetBankBranchById(bankBranchID string) (*model.BankBranchBrief, error) {
msg, err := natsio.GetServer().Request(subject.Bank.GetBankBranchById, toBytes(bankBranchID))
if err != nil {
return nil, err
}
var r struct {
Data *model.BankBranchBrief `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}

30
client/email.go Normal file
View File

@ -0,0 +1,30 @@
package client
// Email ...
type Email struct{}
// GetEmail ...
func GetEmail() Email {
return Email{}
}
// func (s Email) Send(p model.GetEmailRequest) ([]*model.ResponseEmailInfo, error) {
// msg, err := natsio.GetServer().Request(subject.Email.GetListEmailInfo, toBytes(p))
// if err != nil {
// return nil, err
// }
//
// var r struct {
// Data []*model.ResponseEmailInfo `json:"data"`
// Error string `json:"error"`
// }
//
// if err := json.Unmarshal(msg.Data, &r); err != nil {
// return nil, err
// }
// if r.Error != "" {
// return nil, errors.New(r.Error)
// }
//
// return r.Data, nil
// }

View File

@ -19,7 +19,7 @@ func GetLocation() Location {
// GetLocationByCode ... // GetLocationByCode ...
func (l Location) GetLocationByCode(payload model.LocationRequestPayload) (*model.ResponseLocationAddress, error) { func (l Location) GetLocationByCode(payload model.LocationRequestPayload) (*model.ResponseLocationAddress, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetLocationByCode, toBytes(payload)) msg, err := natsio.GetServer().Request(subject.Location.GetLocationByCodeNew, toBytes(payload))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -28,7 +28,7 @@ func (l Location) GetLocationByCode(payload model.LocationRequestPayload) (*mode
Data *model.ResponseLocationAddress `json:"data"` Data *model.ResponseLocationAddress `json:"data"`
Error string `json:"error"` Error string `json:"error"`
} }
if err := json.Unmarshal(msg.Data, &r); err != nil { if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err return nil, err
} }
@ -38,19 +38,19 @@ func (l Location) GetLocationByCode(payload model.LocationRequestPayload) (*mode
return r.Data, nil return r.Data, nil
} }
// GetProvincesByCodes ... ... // GetProvincesByCodes ...
func (l Location) GetProvincesByCodes(p model.ProvinceRequestPayload) (*model.LocationProvinceResponse, error) { func (l Location) GetProvincesByCodes(p model.ProvinceRequestPayload) (*model.LocationProvinceResponse, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetProvincesByCodes, toBytes(p)) msg, err := natsio.GetServer().Request(subject.Location.GetProvincesByCodesNew, toBytes(p))
if err != nil { if err != nil {
return nil, err return nil, err
} }
var r struct { var r struct {
Data *model.LocationProvinceResponse `json:"data"'` Data *model.LocationProvinceResponse `json:"data"`
Error string `json:"error"` Error string `json:"error"`
} }
if err := json.Unmarshal(msg.Data, &r); err != nil { if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err return nil, err
} }
@ -62,7 +62,7 @@ func (l Location) GetProvincesByCodes(p model.ProvinceRequestPayload) (*model.Lo
// GetDistrictsByCodes ... // GetDistrictsByCodes ...
func (l Location) GetDistrictsByCodes(p model.DistrictRequestPayload) (*model.LocationDistrictResponse, error) { func (l Location) GetDistrictsByCodes(p model.DistrictRequestPayload) (*model.LocationDistrictResponse, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetDistrictsByCodes, toBytes(p)) msg, err := natsio.GetServer().Request(subject.Location.GetDistrictsByCodesNew, toBytes(p))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -71,7 +71,7 @@ func (l Location) GetDistrictsByCodes(p model.DistrictRequestPayload) (*model.Lo
Error string `json:"error"` Error string `json:"error"`
} }
if err := json.Unmarshal(msg.Data, &r); err != nil { if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err return nil, err
} }
@ -84,7 +84,7 @@ func (l Location) GetDistrictsByCodes(p model.DistrictRequestPayload) (*model.Lo
// GetWardsByCodes ... // GetWardsByCodes ...
func (l Location) GetWardsByCodes(p model.WardRequestPayload) (*model.LocationWardResponse, error) { func (l Location) GetWardsByCodes(p model.WardRequestPayload) (*model.LocationWardResponse, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetWardsByCodes, toBytes(p)) msg, err := natsio.GetServer().Request(subject.Location.GetWardsByCodesNew, toBytes(p))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -94,7 +94,7 @@ func (l Location) GetWardsByCodes(p model.WardRequestPayload) (*model.LocationWa
Error string `json:"error"` Error string `json:"error"`
} }
if err := json.Unmarshal(msg.Data, &r); err != nil { if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err return nil, err
} }
@ -104,3 +104,211 @@ func (l Location) GetWardsByCodes(p model.WardRequestPayload) (*model.LocationWa
return r.Data, nil return r.Data, nil
} }
// GetProvinceByCondition ...
func (l Location) GetProvinceByCondition(p model.RequestCondition) (*model.LocationProvinceDetailResponse, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetProvinceByCondition, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data *model.LocationProvinceDetailResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
// GetProvincesByCondition ...
func (l Location) GetProvincesByCondition(p model.RequestCondition) ([]*model.LocationProvinceDetailResponse, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetProvincesByCondition, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data []*model.LocationProvinceDetailResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
// GetDistrictByCondition ...
func (l Location) GetDistrictByCondition(p model.RequestCondition) (*model.LocationDistrictDetailResponse, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetDistrictByCondition, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data *model.LocationDistrictDetailResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
// GetDistrictsByCondition ...
func (l Location) GetDistrictsByCondition(p model.RequestCondition) ([]*model.LocationDistrictDetailResponse, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetDistrictsByCondition, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data []*model.LocationDistrictDetailResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
// GetWardByCondition ...
func (l Location) GetWardByCondition(p model.RequestCondition) (*model.LocationWardDetailResponse, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetWardByCondition, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data *model.LocationWardDetailResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
// GetWardsByCondition ...
func (l Location) GetWardsByCondition(p model.RequestCondition) ([]*model.LocationWardDetailResponse, error) {
msg, err := natsio.GetServer().Request(subject.Location.GetWardsByCondition, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data []*model.LocationWardDetailResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
// CountProvinceByCondition ...
func (l Location) CountProvinceByCondition(p model.RequestCondition) (int64, error) {
msg, err := natsio.GetServer().Request(subject.Location.CountProvinceByCondition, toBytes(p))
if err != nil {
return 0, err
}
var r struct {
Data int64 `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return 0, err
}
if r.Error != "" {
return 0, errors.New(r.Error)
}
return r.Data, nil
}
// CountDistrictByCondition ...
func (l Location) CountDistrictByCondition(p model.RequestCondition) (int64, error) {
msg, err := natsio.GetServer().Request(subject.Location.CountDistrictByCondition, toBytes(p))
if err != nil {
return 0, err
}
var r struct {
Data int64 `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return 0, err
}
if r.Error != "" {
return 0, errors.New(r.Error)
}
return r.Data, nil
}
// CountWardByCondition ...
func (l Location) CountWardByCondition(p model.RequestCondition) (int64, error) {
msg, err := natsio.GetServer().Request(subject.Location.CountWardByCondition, toBytes(p))
if err != nil {
return 0, err
}
var r struct {
Data int64 `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return 0, err
}
if r.Error != "" {
return 0, errors.New(r.Error)
}
return r.Data, nil
}
// DistinctWithField ...
func (l Location) DistinctWithField(p model.ProvinceDistinctWithField) ([]interface{}, error) {
msg, err := natsio.GetServer().Request(subject.Location.ProvinceDistinctWithField, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data []interface{} `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}

31
client/notification.go Normal file
View File

@ -0,0 +1,31 @@
package client
import (
"encoding/json"
"errors"
"git.selly.red/Selly-Modules/natsio"
"git.selly.red/Selly-Modules/natsio/model"
"git.selly.red/Selly-Modules/natsio/subject"
)
func GetNotification() Notification {
return Notification{}
}
type Notification struct{}
func (n Notification) SupplierChangeBalanceRequestApproved(p model.NotificationSupplierChangeBalanceRequestApprovedReq) error {
msg, err := natsio.GetServer().Request(subject.Notification.SupplierChangeBalanceRequestApproved, toBytes(p))
if err != nil {
return err
}
var r model.CommonResponseData
if err = json.Unmarshal(msg.Data, &r); err != nil {
return err
}
if r.Error != "" {
return errors.New(r.Error)
}
return nil
}

View File

@ -119,3 +119,24 @@ func (o Order) GetSupplierOrders(p model.OrderSupplierQuery) (*model.SupplierOrd
} }
return &r.Data, nil return &r.Data, nil
} }
// GetSupplierCash ...
func (o Order) GetSupplierCash(p model.OrderSupplierCashReq) (*model.OrderSupplierCashRes, error) {
msg, err := natsio.GetServer().Request(subject.Order.GetSupplierCash, toBytes(p))
if err != nil {
return nil, err
}
var (
r struct {
Data model.OrderSupplierCashRes `json:"data"`
Error string `json:"error"`
}
)
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return &r.Data, nil
}

41
client/segment.go Normal file
View File

@ -0,0 +1,41 @@
package client
import (
"encoding/json"
"errors"
"git.selly.red/Selly-Modules/natsio"
"git.selly.red/Selly-Modules/natsio/model"
"git.selly.red/Selly-Modules/natsio/subject"
)
// Segment ...
type Segment struct{}
// GetSegment ...
func GetSegment() Segment {
return Segment{}
}
// GetListSegmentInfoByIds ...
func (s Segment) GetListSegmentInfoByIds(p model.GetListSegmentRequest) (*model.ResponseListSegmentInfo, error) {
msg, err := natsio.GetServer().Request(subject.Segment.GetListSegmentInfo, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data *model.ResponseListSegmentInfo `json:"data"`
Error string `json:"error"`
}
if err := json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}

View File

@ -3,6 +3,7 @@ package client
import ( import (
"encoding/json" "encoding/json"
"errors" "errors"
"go.mongodb.org/mongo-driver/bson"
"git.selly.red/Selly-Modules/natsio" "git.selly.red/Selly-Modules/natsio"
"git.selly.red/Selly-Modules/natsio/model" "git.selly.red/Selly-Modules/natsio/model"
@ -80,6 +81,27 @@ func (s Supplier) FindAll(supplierID model.SupplierRequestPayload) (*model.Suppl
return r.Data, nil return r.Data, nil
} }
func (s Supplier) FindAllOld(req model.SupplierFindAllReq) (*model.SupplierAll, error) {
msg, err := natsio.GetServer().Request(subject.Supplier.FindAllOld, toBytes(req))
if err != nil {
return nil, err
}
var r struct {
Data *model.SupplierAll `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
func (s Supplier) GetBankInfoByID(supplierID model.SupplierRequestPayload) (*model.SupplierAll, error) { func (s Supplier) GetBankInfoByID(supplierID model.SupplierRequestPayload) (*model.SupplierAll, error) {
msg, err := natsio.GetServer().Request(subject.Supplier.FindAll, toBytes(supplierID)) msg, err := natsio.GetServer().Request(subject.Supplier.FindAll, toBytes(supplierID))
if err != nil { if err != nil {
@ -101,9 +123,9 @@ func (s Supplier) GetBankInfoByID(supplierID model.SupplierRequestPayload) (*mod
return r.Data, nil return r.Data, nil
} }
// CreateWarehouseIntoServiceSupplier ... // SyncWarehouseIntoServiceSupplier ...
func (s Supplier) CreateWarehouseIntoServiceSupplier(p model.CreateSupplierWarehousePayload) error { func (s Supplier) SyncWarehouseIntoServiceSupplier(p model.SyncSupplierWarehousePayload) error {
msg, err := natsio.GetServer().Request(subject.Warehouse.CreateWarehouseIntoServiceSupplier, toBytes(p)) msg, err := natsio.GetServer().Request(subject.Warehouse.SyncWarehouseIntoServiceSupplier, toBytes(p))
if err != nil { if err != nil {
return err return err
} }
@ -119,9 +141,104 @@ func (s Supplier) CreateWarehouseIntoServiceSupplier(p model.CreateSupplierWareh
return nil return nil
} }
// UpdateWarehouseIntoServiceSupplier ... // GetListWarehouseFreeShip ...
func (s Supplier) UpdateWarehouseIntoServiceSupplier(p model.UpdateSupplierWarehousePayload) error { func (s Supplier) GetListWarehouseFreeShip() (*model.SupplierListWarehouseFreeShipResponse, error) {
msg, err := natsio.GetServer().Request(subject.Warehouse.UpdateWarehouseIntoServiceSupplier, toBytes(p)) msg, err := natsio.GetServer().Request(subject.Supplier.GetListWarehouseFreeShip, toBytes(bson.M{}))
if err != nil {
return nil, err
}
var r struct {
Data *model.SupplierListWarehouseFreeShipResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
// GetFreeShipInfo ...
func (s Supplier) GetFreeShipInfo(p model.SupplierFreeShipInfoRequestPayload) ([]*model.SupplierFreeShipInfoResponse, error) {
msg, err := natsio.GetServer().Request(subject.Supplier.GetFreeShipInfo, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data []*model.SupplierFreeShipInfoResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
// CreateCashflow ...
func (s Supplier) CreateCashflow(p model.SupplierCashflowCreatePayload) (*model.SupplierCashflowCreateResponse, error) {
msg, err := natsio.GetServer().Request(subject.Supplier.CreateCashflow, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Error string `json:"error"`
Data *model.SupplierCashflowCreateResponse `json:"data"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
func (s Supplier) UpdateBalance(p model.SupplierUpdateBalanceReq) (*model.SupplierUpdateBalanceRes, error) {
msg, err := natsio.GetServer().Request(subject.Supplier.UpdateBalance, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Error string `json:"error"`
Data *model.SupplierUpdateBalanceRes `json:"data"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
func (s Supplier) GetCurrentBalance(p model.SupplierGetCurrentBalanceReq) (*model.SupplierGetCurrentBalanceRes, error) {
msg, err := natsio.GetServer().Request(subject.Supplier.GetCurrentBalance, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Error string `json:"error"`
Data *model.SupplierGetCurrentBalanceRes `json:"data"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
func (s Supplier) DeleteCashflow(p model.SupplierDeleteCashflowReq) error {
msg, err := natsio.GetServer().Request(subject.Supplier.DeleteCashflow, toBytes(p))
if err != nil { if err != nil {
return err return err
} }

View File

@ -0,0 +1,79 @@
package client
import (
"encoding/json"
"errors"
"git.selly.red/Selly-Modules/natsio"
"git.selly.red/Selly-Modules/natsio/model"
"git.selly.red/Selly-Modules/natsio/subject"
)
// SupplierPermission ...
type SupplierPermission struct{}
// GetSupplierPermission ...
func GetSupplierPermission() SupplierPermission {
return SupplierPermission{}
}
func (s SupplierPermission) GetListPermission(p model.GetListPermissionRequest) (*model.GetListPermissionResponse, error) {
msg, err := natsio.GetServer().Request(subject.SupplierPermission.GetList, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data *model.GetListPermissionResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
func (s SupplierPermission) CreatePermission(p model.CreatePermissionRequest) (*model.CreatePermissionResponse, error) {
msg, err := natsio.GetServer().Request(subject.SupplierPermission.Create, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data *model.CreatePermissionResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
func (s SupplierPermission) UpdatePermission(p model.UpdatePermissionRequest) error {
msg, err := natsio.GetServer().Request(subject.SupplierPermission.Update, toBytes(p))
if err != nil {
return err
}
var r struct {
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return err
}
if r.Error != "" {
return errors.New(r.Error)
}
return nil
}

View File

@ -16,8 +16,28 @@ func GetSupplierRole() SupplierRole {
return SupplierRole{} return SupplierRole{}
} }
func (s SupplierRole) GetListRole(p model.GetListRoleRequest) (*model.GetListRoleResponse, error) {
msg, err := natsio.GetServer().Request(subject.SupplierRole.GetList, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data *model.GetListRoleResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
func (s SupplierRole) CreateRole(p model.CreateRoleRequest) (*model.CreateRoleResponse, error) { func (s SupplierRole) CreateRole(p model.CreateRoleRequest) (*model.CreateRoleResponse, error) {
msg, err := natsio.GetServer().Request(subject.SupplierUser.CreateOwner, toBytes(p)) msg, err := natsio.GetServer().Request(subject.SupplierRole.Create, toBytes(p))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -56,3 +76,24 @@ func (s SupplierRole) UpdateRole(p model.UpdateRoleRequest) error {
return nil return nil
} }
func (s SupplierRole) DetailRole(p model.DetailRoleRequest) (*model.RoleBrief, error) {
msg, err := natsio.GetServer().Request(subject.SupplierRole.Detail, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data *model.RoleBrief `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}

View File

@ -16,6 +16,89 @@ func GetSupplierUser() SupplierUser {
return SupplierUser{} return SupplierUser{}
} }
func (s SupplierUser) LoginUser(p model.LoginUserRequest) (*model.LoginUserResponse, error) {
msg, err := natsio.GetServer().Request(subject.SupplierUser.LoginUser, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data *model.LoginUserResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
func (s SupplierUser) Logout(p model.LogoutRequest) error {
msg, err := natsio.GetServer().Request(subject.SupplierUser.Logout, toBytes(p))
if err != nil {
return err
}
var r struct {
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return err
}
if r.Error != "" {
return errors.New(r.Error)
}
return nil
}
func (s SupplierUser) GetListUser(p model.GetListUserRequest) (*model.GetListUserResponse, error) {
msg, err := natsio.GetServer().Request(subject.SupplierUser.GetListUser, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data *model.GetListUserResponse `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
func (s SupplierUser) DetailUser(p model.DetailUserRequest) (*model.SupplierUserBrief, error) {
msg, err := natsio.GetServer().Request(subject.SupplierUser.DetailUser, toBytes(p))
if err != nil {
return nil, err
}
var r struct {
Data *model.SupplierUserBrief `json:"data"`
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return r.Data, nil
}
func (s SupplierUser) CreateSupplierOwnerUsers(p model.CreateOwnerRequest) (*model.CreateOwnerResponse, error) { func (s SupplierUser) CreateSupplierOwnerUsers(p model.CreateOwnerRequest) (*model.CreateOwnerResponse, error) {
msg, err := natsio.GetServer().Request(subject.SupplierUser.CreateOwner, toBytes(p)) msg, err := natsio.GetServer().Request(subject.SupplierUser.CreateOwner, toBytes(p))
if err != nil { if err != nil {
@ -99,7 +182,7 @@ func (s SupplierUser) UpdateSupplierStaffUsers(p model.UpdateStaffRequest) error
} }
func (s SupplierUser) UpdateStatus(p model.UpdateStatusRequest) error { func (s SupplierUser) UpdateStatus(p model.UpdateStatusRequest) error {
msg, err := natsio.GetServer().Request(subject.SupplierUser.UpdateStaff, toBytes(p)) msg, err := natsio.GetServer().Request(subject.SupplierUser.UpdateStatus, toBytes(p))
if err != nil { if err != nil {
return err return err
} }
@ -138,3 +221,23 @@ func (s SupplierUser) ResetPassword(p model.ResetPasswordRequest) (*model.ResetP
return r.Data, nil return r.Data, nil
} }
func (s SupplierUser) ChangePassword(p model.ChangePasswordRequest) error {
msg, err := natsio.GetServer().Request(subject.SupplierUser.UpdateStatus, toBytes(p))
if err != nil {
return err
}
var r struct {
Error string `json:"error"`
}
if err = json.Unmarshal(msg.Data, &r); err != nil {
return err
}
if r.Error != "" {
return errors.New(r.Error)
}
return nil
}

39
client/withdraw.go Normal file
View File

@ -0,0 +1,39 @@
package client
import (
"encoding/json"
"errors"
"git.selly.red/Selly-Modules/natsio"
"git.selly.red/Selly-Modules/natsio/model"
"git.selly.red/Selly-Modules/natsio/subject"
)
// Withdraw ...
type Withdraw struct{}
// GetWithdraw ...
func GetWithdraw() Withdraw {
return Withdraw{}
}
// GetSupplierCash ...
func (o Withdraw) GetSupplierCash(p model.WithdrawSupplierCashReq) (*model.WithdrawSupplierCashRes, error) {
msg, err := natsio.GetServer().Request(subject.Withdraw.GetSupplierCash, toBytes(p))
if err != nil {
return nil, err
}
var (
r struct {
Data model.WithdrawSupplierCashRes `json:"data"`
Error string `json:"error"`
}
)
if err = json.Unmarshal(msg.Data, &r); err != nil {
return nil, err
}
if r.Error != "" {
return nil, errors.New(r.Error)
}
return &r.Data, nil
}

View File

@ -0,0 +1,7 @@
package model
type CheckPermissionRequest struct {
Value []string `json:"value"`
ID string `json:"_id"`
DeviceID string `json:"deviceId"`
}

View File

@ -0,0 +1 @@
package model

View File

@ -1,11 +0,0 @@
package model
// BankBranchBrief ...
type BankBranchBrief struct {
ID string `json:"_id"`
City string `json:"city"`
BankCode string `json:"bankCode"`
Bank string `json:"bank"`
Active bool `json:"active"`
Name string `json:"name"`
}

View File

@ -1,6 +0,0 @@
package model
type BankBranchRequest struct {
BankID string `json:"bankId"`
BranchID string `json:"branchId"`
}

11
model/bank_request.go Normal file
View File

@ -0,0 +1,11 @@
package model
type CheckBankAndBranchByIDRequest struct {
BankID string `json:"bankId"`
BranchID string `json:"branchId"`
}
type GetBankInfoRequest struct {
BankID string `json:"bankId"`
BranchID string `json:"branchId"`
}

View File

@ -1,11 +1,23 @@
package model package model
import "time"
// MultiLang ... // MultiLang ...
type MultiLang struct { type MultiLang struct {
En string `json:"en"` En string `json:"en"`
Vi string `json:"vi"` Vi string `json:"vi"`
} }
// BranchBrief ...
type BranchBrief struct {
ID string `json:"_id"`
City string `json:"city"`
BankCode string `json:"bankCode"`
BankID string `json:"bankId"`
Active bool `json:"active"`
Name string `json:"name"`
}
// BankBrief ... // BankBrief ...
type BankBrief struct { type BankBrief struct {
ID string `json:"_id"` ID string `json:"_id"`
@ -15,7 +27,14 @@ type BankBrief struct {
BenBankName string `json:"benBankName"` BenBankName string `json:"benBankName"`
BankCode int `json:"bankCode"` BankCode int `json:"bankCode"`
IsBranchRequired bool `json:"isBranchRequired"` IsBranchRequired bool `json:"isBranchRequired"`
SearchString string `json:"searchString"`
BeneficiaryForVietinbank string `json:"beneficiaryForVietinbank"` BeneficiaryForVietinbank string `json:"beneficiaryForVietinbank"`
CreatedBy string `json:"createdBy,omitempty"` CreatedBy string `json:"createdBy,omitempty"`
CreatedAt time.Time `json:"createdAt"`
BranchTotal int64 `json:"branchTotal"`
Logo interface{} `json:"logo"`
}
type ResponseBankInfo struct {
Bank BankBrief `json:"bank"`
Branch BranchBrief `json:"branch"`
} }

View File

@ -20,3 +20,32 @@ type ActionBy struct {
ID string `json:"id"` ID string `json:"id"`
Name string `json:"name"` Name string `json:"name"`
} }
// ClickAction ...
type ClickAction struct {
Type string `json:"type"`
Value string `json:"value"`
}
// RequestCondition ...
type RequestCondition struct {
Code int `json:"code"`
Codes []int `json:"codes"`
DistrictCode int `json:"districtCode"`
ProvinceCode int `json:"provinceCode"`
Slug string `json:"slug"`
OldSlug string `json:"oldSlug"`
Slugs []string `json:"slugs"`
OldSlugs []string `json:"oldSlugs"`
DistrictSlug string `json:"districtSlug"`
ProvinceSlug string `json:"provinceSlug"`
Keyword string `json:"keyword"`
Region string `json:"region"`
Page int64 `json:"page"`
Limit int64 `json:"limit"`
}

View File

@ -1,23 +1,65 @@
package model package model
// LocationRequestPayload ... // LocationRequestPayload ...
type LocationRequestPayload struct { type (
LocationRequestPayload struct {
Province int `json:"province"` Province int `json:"province"`
District int `json:"district"` District int `json:"district"`
Ward int `json:"ward"` Ward int `json:"ward"`
} }
// ProvinceRequestPayload ... // ProvinceRequestPayload ...
type ProvinceRequestPayload struct { ProvinceRequestPayload struct {
Codes []int `json:"codes"` Codes []int `json:"codes"`
} }
// DistrictRequestPayload ... // ProvinceRequestCondition ...
type DistrictRequestPayload struct { ProvinceRequestCondition struct {
Code int `json:"code"`
Codes []int `json:"codes"` Codes []int `json:"codes"`
} Slug string `json:"slug"`
Slugs []string `json:"slugs"`
Keyword string `json:"keyword"`
Region string `json:"region"`
}
// WardRequestPayload ... // DistrictRequestPayload ...
type WardRequestPayload struct { DistrictRequestPayload struct {
Codes []int `json:"codes"` Codes []int `json:"codes"`
} }
// DistrictRequestCondition ...
DistrictRequestCondition struct {
Code int `json:"code"`
Codes []int `json:"codes"`
ProvinceCode int `json:"provinceCode"`
Slug string `json:"slug"`
ProvinceSlug string `json:"provinceSlug"`
Keyword string `json:"keyword"`
}
// WardRequestPayload ...
WardRequestPayload struct {
Codes []int `json:"codes"`
}
// WardRequestCondition ...
WardRequestCondition struct {
Code int `json:"code"`
Codes []int `json:"codes"`
DistrictCode int `json:"districtCode"`
ProvinceCode int `json:"provinceCode"`
Slug string `json:"slug"`
DistrictSlug string `json:"districtSlug"`
ProvinceSlug string `json:"provinceSlug"`
Keyword string `json:"keyword"`
}
// ProvinceDistinctWithField ...
ProvinceDistinctWithField struct {
Conditions struct {
Region string `json:"region"`
} `json:"conditions"`
Field string `json:"filed"`
}
)

View File

@ -1,43 +1,87 @@
package model package model
type ResponseLocationAddress struct { type (
// ResponseLocationAddress ...
ResponseLocationAddress struct {
Province LocationProvince `json:"province"` Province LocationProvince `json:"province"`
District LocationDistrict `json:"district"` District LocationDistrict `json:"district"`
Ward LocationWard `json:"ward"` Ward LocationWard `json:"ward"`
} }
// LocationProvince ... // LocationProvince ...
type LocationProvince struct { LocationProvince struct {
ID string `json:"id"` ID string `json:"id"`
Name string `json:"name"` Name string `json:"name"`
Code int `json:"code"` Code int `json:"code"`
} Slug string `json:"slug"`
RegionCode string `json:"regionCode"`
MainRegionCode string `json:"mainRegionCode"`
}
// LocationDistrict ... // LocationDistrict ...
type LocationDistrict struct { LocationDistrict struct {
ID string `json:"id"` ID string `json:"id"`
Name string `json:"name"` Name string `json:"name"`
Code int `json:"code"` Code int `json:"code"`
} Slug string `json:"slug"`
}
// LocationWard ... // LocationWard ...
type LocationWard struct { LocationWard struct {
ID string `json:"id"` ID string `json:"id"`
Name string `json:"name"` Name string `json:"name"`
Code int `json:"code"` Code int `json:"code"`
} Slug string `json:"slug"`
}
// LocationProvinceResponse ... // LocationProvinceResponse ...
type LocationProvinceResponse struct { LocationProvinceResponse struct {
Provinces []LocationProvince `json:"provinces"` Provinces []LocationProvince `json:"provinces"`
} }
// LocationDistrictResponse ... // LocationDistrictResponse ...
type LocationDistrictResponse struct { LocationDistrictResponse struct {
Districts []LocationDistrict `json:"districts"` Districts []LocationDistrict `json:"districts"`
} }
// LocationWardResponse ... // LocationWardResponse ...
type LocationWardResponse struct { LocationWardResponse struct {
Wards []LocationWard `json:"wards"` Wards []LocationWard `json:"wards"`
} }
// LocationProvinceDetailResponse ...
LocationProvinceDetailResponse struct {
ID string `json:"_id"`
Name string `json:"name"`
Slug string `json:"slug"`
Code int `json:"code"`
CountryCode string `json:"countryCode"`
RegionCode string `json:"regionCode"`
MainRegionCode string `json:"mainRegionCode"`
TotalDistricts int `json:"totalDistricts"`
TotalWards int `json:"totalWards"`
}
// LocationDistrictDetailResponse ...
LocationDistrictDetailResponse struct {
ID string `json:"_id"`
Name string `json:"name"`
OldSlugs []string `json:"oldSlugs"`
Slug string `json:"slug"`
Code int `json:"code"`
ProvinceCode int `json:"provinceCode"`
Area int `json:"area"`
TotalWards int `json:"totalWards"`
}
// LocationWardDetailResponse ...
LocationWardDetailResponse struct {
ID string `json:"_id"`
Name string `json:"name"`
OldSlugs []string `json:"oldSlugs"`
Slug string `json:"slug"`
Code int `json:"code"`
DistrictCode int `json:"districtCode"`
ProvinceCode int `json:"provinceCode"`
}
)

View File

@ -0,0 +1,7 @@
package model
type NotificationSupplierChangeBalanceRequestApprovedReq struct {
SupplierID string `json:"supplierId"`
Cash float64 `json:"cash"`
Reason string `json:"reason"`
}

View File

@ -0,0 +1 @@
package model

View File

@ -49,3 +49,7 @@ type OrderSupplierQuery struct {
SupplierID string `json:"supplierId"` SupplierID string `json:"supplierId"`
WarehouseIDs []string `json:"warehouseIDs"` WarehouseIDs []string `json:"warehouseIDs"`
} }
type OrderSupplierCashReq struct {
SupplierID string `json:"supplierId"`
}

View File

@ -33,3 +33,9 @@ type SupplierOrderDelivery struct {
Status string `json:"status" enums:"waiting_to_confirm,waiting_to_pick,picking,picked,delay_pickup,pickup_failed,delivering,delay_delivery,delivered,cancelled,delivery_failed,waiting_to_return,returning,delay_return,compensation,returned"` Status string `json:"status" enums:"waiting_to_confirm,waiting_to_pick,picking,picked,delay_pickup,pickup_failed,delivering,delay_delivery,delivered,cancelled,delivery_failed,waiting_to_return,returning,delay_return,compensation,returned"`
TPLCode string `json:"tplCode" enums:"SLY,GHTK,GHN,SSC,SPY,VTP,SE,NTL,BEST"` TPLCode string `json:"tplCode" enums:"SLY,GHTK,GHN,SSC,SPY,VTP,SE,NTL,BEST"`
} }
type OrderSupplierCashRes struct {
PendingCash float64 `json:"pendingCash"`
WaitingForReconcileCash float64 `json:"waitingForReconcileCash"`
ReconciledCash float64 `json:"reconciledCash"`
}

6
model/segment_request.go Normal file
View File

@ -0,0 +1,6 @@
package model
// GetListSegmentRequest ...
type GetListSegmentRequest struct {
SegmentIds []string `json:"segmentIds"`
}

12
model/segment_response.go Normal file
View File

@ -0,0 +1,12 @@
package model
// ResponseSegmentInfo ...
type ResponseSegmentInfo struct {
ID string `json:"_id"`
Name string `json:"name"`
}
// ResponseListSegmentInfo ...
type ResponseListSegmentInfo struct {
Segments []ResponseSegmentInfo `json:"segments"`
}

View File

@ -0,0 +1 @@
package model

View File

@ -0,0 +1 @@
package model

View File

@ -0,0 +1,24 @@
package model
type GetListPermissionRequest struct {
Page int `json:"page"`
Limit int `json:"limit"`
Group string `json:"group"`
}
type DetailPermissionRequest struct {
ID string `json:"_id"`
}
type CreatePermissionRequest struct {
Name string `json:"name"`
Code string `json:"code"`
Group string `json:"group"`
}
type UpdatePermissionRequest struct {
ID string `json:"_id"`
Name string `json:"name"`
Code string `json:"code"`
Group string `json:"group"`
}

View File

@ -0,0 +1,26 @@
package model
type GetListPermissionResponse struct {
Permissions []PermissionBrief `json:"permissions"`
Total int64 `json:"total"`
}
type PermissionBrief struct {
ID string `json:"_id"`
Name string `json:"name"`
Code string `json:"code"`
Group string `json:"group"`
CreatedAt string `json:"createdAt"`
UpdatedAt string `json:"updatedAt"`
}
type CreatePermissionResponse struct {
ID string `json:"_id"`
}
type PermissionShort struct {
ID string `json:"_id"`
Name string `json:"name"`
Code string `json:"code"`
Group string `json:"group"`
}

View File

@ -23,18 +23,35 @@ type SupplierRequestPayload struct {
ContractStatus string ContractStatus string
} }
type CreateSupplierWarehousePayload struct { // SupplierCashflowCreatePayload ...
type SupplierCashflowCreatePayload struct {
Supplier string `json:"supplier"` Supplier string `json:"supplier"`
Warehouse string `json:"warehouse"` Action string `json:"action"`
ProvinceCode int `json:"provinceCode"` Name string `json:"name"`
DistrictCode int `json:"districtCode"` TargetID string `json:"targetId"`
WardCode int `json:"wardCode"` Value float64 `json:"value"`
ClickAction *ClickAction `json:"clickAction"`
} }
type UpdateSupplierWarehousePayload struct { type SupplierFreeShipInfoRequestPayload struct {
Supplier string `json:"supplier"` SupplierIDs []string `json:"supplierIds"`
Warehouse string `json:"warehouse"` }
ProvinceCode int `json:"provinceCode"`
DistrictCode int `json:"districtCode"` type SupplierUpdateBalanceReq struct {
WardCode int `json:"wardCode"` SupplierID string `json:"supplierId"`
}
type SupplierGetCurrentBalanceReq struct {
SupplierID string `json:"supplierId"`
}
type SupplierDeleteCashflowReq struct {
CashflowID string `json:"cashflowId"`
}
type SupplierFindAllReq struct {
Page int64 `json:"page"`
Limit int64 `json:"limit"`
Segment string `json:"segment"`
IDs []string `json:"ids"`
} }

View File

@ -29,3 +29,54 @@ type SupplierAll struct {
Suppliers []SupplierBrief `json:"suppliers"` Suppliers []SupplierBrief `json:"suppliers"`
Total int64 `json:"total"` Total int64 `json:"total"`
} }
type SupplierListWarehouseFreeShipResponse struct {
Warehouses []string `json:"warehouses"`
}
type SupplierCashflowCreateResponse struct {
ID string `json:"id"`
}
type FreeShip struct {
ID string `json:"_id"`
ShortName string `json:"shortName"`
ListMilestoneText []string `json:"milestoneText"`
Order int `json:"-"`
}
type SupplierFreeShipInfoResponse struct {
SupplierID string `json:"supplierId"`
FreeShips []FreeShip `json:"freeShips"`
}
type SupplierShort struct {
ID string `json:"_id"`
Name string `json:"name"`
Logo interface{} `json:"logo"`
}
type SupplierUpdateBalanceRes struct {
CurrentCash float64 `json:"currentCash"`
TotalPendingCash float64 `json:"totalPendingCash"`
OrderPendingCash float64 `json:"orderPendingCash"`
OrderWaitingForReconcileCash float64 `json:"orderWaitingForReconcileCash"`
OrderReconciledCash float64 `json:"orderReconciledCash"`
WithdrawPendingCash float64 `json:"withdrawPendingCash"`
WithdrawSuccessCash float64 `json:"withdrawSuccessCash"`
WithdrawRejectCash float64 `json:"withdrawRejectCash"`
ChangeBalanceRequestApproved float64 `json:"changeBalanceRequestApproved"`
UpdatedAt string `json:"updatedAt"`
}
type SupplierGetCurrentBalanceRes struct {
CurrentCash float64 `json:"currentCash"`
}
type SyncSupplierWarehousePayload struct {
Supplier string `json:"supplier"`
Warehouse string `json:"warehouse"`
ProvinceCode int `json:"provinceCode"`
DistrictCode int `json:"districtCode"`
WardCode int `json:"wardCode"`
}

View File

@ -1,9 +1,22 @@
package model package model
type GetListRoleRequest struct {
Page int `json:"page"`
Limit int `json:"limit"`
Type string `json:"type"`
SupplierID string `json:"supplierId"`
}
type DetailRoleRequest struct {
ID string `json:"_id"`
}
type CreateRoleRequest struct { type CreateRoleRequest struct {
Name string `json:"name"` Name string `json:"name"`
Code string `json:"code"` Code string `json:"code"`
Type string `json:"type"` Type string `json:"type"`
SupplierID string `json:"supplierId"`
Permissions []string `json:"permissions"`
} }
type UpdateRoleRequest struct { type UpdateRoleRequest struct {
@ -11,4 +24,6 @@ type UpdateRoleRequest struct {
Name string `json:"name"` Name string `json:"name"`
Code string `json:"code"` Code string `json:"code"`
Type string `json:"type"` Type string `json:"type"`
SupplierID string `json:"supplierId"`
Permissions []string `json:"permissions"`
} }

View File

@ -1,5 +1,29 @@
package model package model
type GetListRoleResponse struct {
Roles []RoleBrief `json:"roles"`
Total int64 `json:"total"`
}
type RoleBrief struct {
ID string `json:"_id"`
Name string `json:"name"`
Code string `json:"code"`
Type string `json:"type"`
Permissions []PermissionShort `json:"permissions"`
SupplierId string `json:"supplierId"`
CreatedAt string `json:"createdAt"`
UpdatedAt string `json:"updatedAt"`
}
type CreateRoleResponse struct { type CreateRoleResponse struct {
ID string `json:"_id"` ID string `json:"_id"`
} }
type RoleShort struct {
ID string `json:"_id"`
Name string `json:"name"`
Code string `json:"code"`
Type string `json:"type"`
SupplierId string `json:"supplierId"`
}

View File

@ -1,12 +1,44 @@
package model package model
type LoginUserRequest struct {
Email string `json:"email"`
Password string `json:"password"`
DeviceID string `json:"deviceId"`
AppVersion string `json:"appVersion"`
UserAgent string `json:"userAgent"`
Model string `json:"model"`
Manufacturer string `json:"manufacturer"`
IP string `json:"ip"`
Language string `json:"language"`
FCMToken string `json:"FCMToken"`
AuthToken string `json:"authToken"`
OsName string `json:"osName"`
OsVersion string `json:"osVersion"`
IsMobile bool `json:"isMobile"`
}
type LogoutRequest struct {
ID string `json:"_id"`
}
type GetListUserRequest struct {
Page int `json:"page"`
Limit int `json:"limit"`
Status string `json:"status"`
Type string `json:"type"`
SupplierID string `json:"supplierId"`
}
type DetailUserRequest struct {
ID string `json:"_id"`
}
type CreateOwnerRequest struct { type CreateOwnerRequest struct {
Name string `json:"name"` Name string `json:"name"`
Phone string `json:"phone"` Phone string `json:"phone"`
Email string `json:"email"` Email string `json:"email"`
SupplierID string `json:"supplierId"` SupplierID string `json:"supplierId"`
RoleID string `json:"roleId"` RoleID string `json:"roleId"`
Password string `json:"password"`
} }
type UpdateOwnerRequest struct { type UpdateOwnerRequest struct {
@ -24,7 +56,6 @@ type CreateStaffRequest struct {
Email string `json:"email"` Email string `json:"email"`
SupplierID string `json:"supplierId"` SupplierID string `json:"supplierId"`
RoleID string `json:"roleId"` RoleID string `json:"roleId"`
Password string `json:"password"`
Warehouses []string `json:"warehouses"` Warehouses []string `json:"warehouses"`
} }
@ -47,5 +78,9 @@ type UpdateStatusRequest struct {
type ResetPasswordRequest struct { type ResetPasswordRequest struct {
ID string `json:"_id"` ID string `json:"_id"`
}
type ChangePasswordRequest struct {
ID string `json:"_id"`
Password string `json:"password"` Password string `json:"password"`
} }

View File

@ -1,5 +1,33 @@
package model package model
// LoginUserResponse ...
type LoginUserResponse struct {
ID string `json:"_id"`
RequireToChangePassword bool `json:"requireToChangePassword"`
SupplierID string `json:"supplierId"`
Name string `json:"name"`
}
type GetListUserResponse struct {
SupplierUsers []SupplierUserBrief `json:"supplierUsers"`
Total int64 `json:"total"`
}
type SupplierUserBrief struct {
ID string `json:"_id"`
Role RoleShort `json:"role"`
SupplierID string `json:"supplierId"`
Name string `json:"name"`
Phone string `json:"phone"`
Email string `json:"email"`
Status string `json:"status"`
Avatar interface{} `json:"avatar"`
Type string `json:"type"`
Warehouses []string `json:"warehouses"`
CreatedAt string `json:"createdAt"`
UpdatedAt string `json:"updatedAt"`
}
type CreateOwnerResponse struct { type CreateOwnerResponse struct {
ID string `json:"_id"` ID string `json:"_id"`
} }

View File

@ -119,6 +119,7 @@ type CommonLocation struct {
ID string `json:"id"` ID string `json:"id"`
Name string `json:"name"` Name string `json:"name"`
Code int `json:"code"` Code int `json:"code"`
Slug string `json:"slug"`
} }
// ResponseLatLng ... // ResponseLatLng ...

View File

@ -0,0 +1,5 @@
package model
type WithdrawSupplierCashReq struct {
SupplierID string `json:"supplierId"`
}

View File

@ -0,0 +1,7 @@
package model
type WithdrawSupplierCashRes struct {
PendingCash float64 `json:"pendingCash"`
SuccessCash float64 `json:"successCash"`
RejectCash float64 `json:"rejectCash"`
}

15
subject/auth_sms.go Normal file
View File

@ -0,0 +1,15 @@
package subject
import "fmt"
func getAuthSMSValue(val string) string {
return fmt.Sprintf("%s.%s", prefixes.AuthSMS, val)
}
var AuthSMS = struct {
// AuthSMS
CheckPermission string
}{
// Users
CheckPermission: getAuthSMSValue("check_permission"),
}

View File

@ -7,11 +7,11 @@ func getBankValue(val string) string {
} }
var Bank = struct { var Bank = struct {
GetBankById string GetBankInfo string
GetBankBranchById string GetBankInfoDetail string
CheckBankAndBranchByID string CheckBankAndBranchByID string
}{ }{
GetBankById: getBankValue("get_bank_by_id"), GetBankInfo: getBankValue("get_bank_info"),
GetBankBranchById: getBankValue("get_bank_branch_by_id"), GetBankInfoDetail: getBankValue("get_bank_info_detail"),
CheckBankAndBranchByID: getBankValue("check_bank_and_brach_by_id"), CheckBankAndBranchByID: getBankValue("check_bank_and_branch_by_id"),
} }

View File

@ -9,10 +9,16 @@ var prefixes = struct {
Bank string Bank string
Supplier string Supplier string
Seller string Seller string
AuthSMS string
Selly string
SupplierUser string SupplierUser string
SupplierRole string SupplierRole string
SupplierPermission string
Withdraw string
Notification string
SocialPost string SocialPost string
Staff string Staff string
Segment string
}{ }{
Communication: "communication", Communication: "communication",
Order: "order", Order: "order",
@ -22,8 +28,13 @@ var prefixes = struct {
Supplier: "supplier", Supplier: "supplier",
Bank: "bank", Bank: "bank",
Seller: "seller", Seller: "seller",
AuthSMS: "auth_sms",
Selly: "selly",
SupplierUser: "supplier_user", SupplierUser: "supplier_user",
SupplierRole: "supplier_role", SupplierRole: "supplier_role",
SupplierPermission: "supplier_permission",
Withdraw: "withdraw",
Notification: "notification",
SocialPost: "social_post", SocialPost: "social_post",
Staff: "staff", Staff: "staff",
} }

View File

@ -8,12 +8,40 @@ func getLocationValue(val string) string {
var Location = struct { var Location = struct {
GetLocationByCode string GetLocationByCode string
GetLocationByCodeNew string
GetProvincesByCodes string GetProvincesByCodes string
GetProvincesByCodesNew string
GetDistrictsByCodes string GetDistrictsByCodes string
GetDistrictsByCodesNew string
GetWardsByCodes string GetWardsByCodes string
GetWardsByCodesNew string
GetProvinceByCondition string
GetProvincesByCondition string
GetDistrictByCondition string
GetDistrictsByCondition string
GetWardByCondition string
GetWardsByCondition string
CountProvinceByCondition string
CountDistrictByCondition string
CountWardByCondition string
ProvinceDistinctWithField string
}{ }{
GetLocationByCode: getLocationValue("get_location_warehouse"), GetLocationByCode: getLocationValue("get_location_warehouse"),
GetLocationByCodeNew: getLocationValue("get_location_warehouse_new"),
GetProvincesByCodes: getLocationValue("get_provinces_by_codes"), GetProvincesByCodes: getLocationValue("get_provinces_by_codes"),
GetProvincesByCodesNew: getLocationValue("get_provinces_by_codes_new"),
GetDistrictsByCodes: getLocationValue("get_districts_by_codes"), GetDistrictsByCodes: getLocationValue("get_districts_by_codes"),
GetDistrictsByCodesNew: getLocationValue("get_districts_by_codes_new"),
GetWardsByCodes: getLocationValue("get_wards_by_codes"), GetWardsByCodes: getLocationValue("get_wards_by_codes"),
GetWardsByCodesNew: getLocationValue("get_wards_by_codes_new"),
GetProvinceByCondition: getLocationValue("get_province_by_condition"),
GetProvincesByCondition: getLocationValue("get_provinces_by_condition"),
GetDistrictByCondition: getLocationValue("get_district_by_condition"),
GetDistrictsByCondition: getLocationValue("get_districts_byCondition"),
GetWardByCondition: getLocationValue("get_ward_by_condition"),
GetWardsByCondition: getLocationValue("get_wards_by_condition"),
CountProvinceByCondition: getLocationValue("count_province_by_condition"),
CountDistrictByCondition: getLocationValue("count_district_by_condition"),
CountWardByCondition: getLocationValue("count_ward_by_condition"),
ProvinceDistinctWithField: getLocationValue("province_distinct_with_field"),
} }

13
subject/notification.go Normal file
View File

@ -0,0 +1,13 @@
package subject
import "fmt"
func getNotificationValue(val string) string {
return fmt.Sprintf("%s.%s", prefixes.Notification, val)
}
var Notification = struct {
SupplierChangeBalanceRequestApproved string
}{
SupplierChangeBalanceRequestApproved: getNotificationValue("supplier_change_balance_request_approved"),
}

View File

@ -13,6 +13,7 @@ var Order = struct {
UpdateLogisticInfoFailed string UpdateLogisticInfoFailed string
ORNotUpdateStatus string ORNotUpdateStatus string
GetSupplierOrders string GetSupplierOrders string
GetSupplierCash string
}{ }{
UpdateORStatus: getOrderValue("update_outbound_request_status"), UpdateORStatus: getOrderValue("update_outbound_request_status"),
CancelDelivery: getOrderValue("cancel_delivery"), CancelDelivery: getOrderValue("cancel_delivery"),
@ -20,4 +21,5 @@ var Order = struct {
UpdateLogisticInfoFailed: getOrderValue("update_logistic_info_failed"), UpdateLogisticInfoFailed: getOrderValue("update_logistic_info_failed"),
ORNotUpdateStatus: getOrderValue("outbound_request_not_update_status"), ORNotUpdateStatus: getOrderValue("outbound_request_not_update_status"),
GetSupplierOrders: getOrderValue("get_supplier_orders"), GetSupplierOrders: getOrderValue("get_supplier_orders"),
GetSupplierCash: getOrderValue("get_supplier_cash"),
} }

15
subject/segment.go Normal file
View File

@ -0,0 +1,15 @@
package subject
import "fmt"
// getSegmentValue ...
func getSegmentValue(val string) string {
return fmt.Sprintf("%s.%s", prefixes.Segment, val)
}
// Segment ...
var Segment = struct {
GetListSegmentInfo string
}{
GetListSegmentInfo: getSegmentValue("get_list_segment_info"),
}

View File

@ -10,8 +10,22 @@ var Supplier = struct {
GetListSupplierInfo string GetListSupplierInfo string
GetSupplierContractBySupplierID string GetSupplierContractBySupplierID string
FindAll string FindAll string
GetListWarehouseFreeShip string
CreateCashflow string
DeleteCashflow string
UpdateBalance string
GetCurrentBalance string
GetFreeShipInfo string
FindAllOld string
}{ }{
GetListSupplierInfo: getSupplierValue("get_list_supplier_info"), GetListSupplierInfo: getSupplierValue("get_list_supplier_info"),
GetSupplierContractBySupplierID: getSupplierValue("get_supplier_contract_by_supplier_id"), GetSupplierContractBySupplierID: getSupplierValue("get_supplier_contract_by_supplier_id"),
FindAll: getSupplierValue("find_all"), FindAll: getSupplierValue("find_all"),
GetListWarehouseFreeShip: getSupplierValue("get_list_warehouse_free_ship"),
CreateCashflow: getSupplierValue("create_cashflow"),
DeleteCashflow: getSupplierValue("delete_cashflow"),
UpdateBalance: getSupplierValue("update_balance"),
GetCurrentBalance: getSupplierValue("get_current_balance"),
GetFreeShipInfo: getSupplierValue("get_free_ship_info"),
FindAllOld: getSupplierValue("find_all_old"),
} }

View File

@ -0,0 +1,17 @@
package subject
import "fmt"
func getPermissionValue(val string) string {
return fmt.Sprintf("%s.%s", prefixes.SupplierPermission, val)
}
var SupplierPermission = struct {
GetList string
Create string
Update string
}{
GetList: getPermissionValue("get_list"),
Create: getPermissionValue("create"),
Update: getPermissionValue("update"),
}

View File

@ -7,9 +7,15 @@ func getRoleValue(val string) string {
} }
var SupplierRole = struct { var SupplierRole = struct {
GetList string
Detail string
Create string Create string
Update string Update string
GetListBySupplierID string
}{ }{
GetList: getRoleValue("get_list"),
Detail: getRoleValue("detail"),
Create: getRoleValue("create"), Create: getRoleValue("create"),
Update: getRoleValue("update"), Update: getRoleValue("update"),
GetListBySupplierID: getRoleValue("get_list_by_supplierId"),
} }

View File

@ -8,18 +8,28 @@ func getSupplierUserValue(val string) string {
var SupplierUser = struct { var SupplierUser = struct {
// Users // Users
LoginUser string
Logout string
GetListUser string
DetailUser string
CreateOwner string CreateOwner string
UpdateOwner string UpdateOwner string
CreateStaff string CreateStaff string
UpdateStaff string UpdateStaff string
UpdateStatus string UpdateStatus string
ResetPassword string ResetPassword string
ChangePassword string
}{ }{
// Users // Users
LoginUser: getSupplierUserValue("login_user"),
Logout: getSupplierUserValue("logout"),
GetListUser: getSupplierUserValue("get_list_user"),
DetailUser: getSupplierUserValue("detail_user"),
CreateOwner: getSupplierUserValue("create_owner"), CreateOwner: getSupplierUserValue("create_owner"),
UpdateOwner: getSupplierUserValue("update_owner"), UpdateOwner: getSupplierUserValue("update_owner"),
CreateStaff: getSupplierUserValue("create_staff"), CreateStaff: getSupplierUserValue("create_staff"),
UpdateStaff: getSupplierUserValue("update_staff"), UpdateStaff: getSupplierUserValue("update_staff"),
UpdateStatus: getSupplierUserValue("update_status"), UpdateStatus: getSupplierUserValue("update_status"),
ResetPassword: getSupplierUserValue("reset_password"), ResetPassword: getSupplierUserValue("reset_password"),
ChangePassword: getSupplierUserValue("change_password"),
} }

View File

@ -7,8 +7,7 @@ func getWarehouseValue(val string) string {
} }
var Warehouse = struct { var Warehouse = struct {
CreateWarehouseIntoServiceSupplier string SyncWarehouseIntoServiceSupplier string
UpdateWarehouseIntoServiceSupplier string
CreateOutboundRequest string CreateOutboundRequest string
UpdateOutboundRequestLogistic string UpdateOutboundRequestLogistic string
CancelOutboundRequest string CancelOutboundRequest string
@ -27,8 +26,7 @@ var Warehouse = struct {
GetWarehouses string GetWarehouses string
UpdateORDeliveryStatus string UpdateORDeliveryStatus string
}{ }{
CreateWarehouseIntoServiceSupplier: getWarehouseValue("create_warehouse_into_service_supplier"), SyncWarehouseIntoServiceSupplier: getWarehouseValue("sync_warehouse_into_service_supplier"),
UpdateWarehouseIntoServiceSupplier: getWarehouseValue("update_warehouse_into_service_supplier"),
AfterCreateWarehouse: getWarehouseValue("after_create_warehouse"), AfterCreateWarehouse: getWarehouseValue("after_create_warehouse"),
AfterUpdateWarehouse: getWarehouseValue("after_update_warehouse"), AfterUpdateWarehouse: getWarehouseValue("after_update_warehouse"),
CreateOutboundRequest: getWarehouseValue("create_outbound_request"), CreateOutboundRequest: getWarehouseValue("create_outbound_request"),

13
subject/withdraw.go Normal file
View File

@ -0,0 +1,13 @@
package subject
import "fmt"
func getWithdrawValue(val string) string {
return fmt.Sprintf("%s.%s", prefixes.Withdraw, val)
}
var Withdraw = struct {
GetSupplierCash string
}{
GetSupplierCash: getWithdrawValue("get_supplier_cash"),
}