Commit Graph

292 Commits

Author SHA1 Message Date
Hiven
335ecc1f41 分支合并 2023-07-28 11:20:12 +08:00
Hiven
334ea4aa3f 支付成功回调 2023-07-28 11:15:42 +08:00
eson
3be161a011 tijiao 2023-07-27 19:47:52 +08:00
eson
64c6c19918 更新 新的表 2023-07-27 16:56:51 +08:00
eson
d635811b5f Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-07-27 16:49:25 +08:00
eson
0ce35645b2 for save 2023-07-27 16:48:43 +08:00
Hiven
dbf500813c 支付成功通知 2023-07-26 19:23:16 +08:00
laodaming
88a59bbdea fix 2023-07-26 16:00:19 +08:00
laodaming
736f57c0c2 fix 2023-07-26 14:17:30 +08:00
Hiven
e05fcd8248 合并代码 2023-07-26 11:09:18 +08:00
Hiven
95baad761a 支付模块 2023-07-26 11:06:05 +08:00
laodaming
c7536d0fdb fix 2023-07-26 11:02:30 +08:00
Hiven
fd9e30ea74 订单列表--完善 2023-07-24 18:04:24 +08:00
laodaming
7e4708e8d8 fix 2023-07-21 14:07:42 +08:00
laodaming
50817d7ae2 fix 2023-07-21 12:27:37 +08:00
laodaming
edd4104ce7 fix 2023-07-21 10:33:43 +08:00
laodaming
532929a563 fix 2023-07-20 18:18:36 +08:00
laodaming
0e752e31fd fix 2023-07-20 18:04:50 +08:00
Hiven
2f5ce8dd77 用户订单列表完善 2023-07-20 17:49:09 +08:00
laodaming
0e72027ff3 fix 2023-07-20 17:35:13 +08:00
laodaming
20e32ae078 fix 2023-07-20 15:43:55 +08:00
laodaming
9ff4468778 fix 2023-07-20 14:56:28 +08:00
Hiven
52d47f78ac 获取用户订单列表接口,以及工具方法 2023-07-20 14:43:59 +08:00
laodaming
4a2230d90c fix 2023-07-20 12:27:07 +08:00
laodaming
b8333ecaf8 fix 2023-07-20 11:08:35 +08:00
eson
6264440017 添加gorm的model结构一个表名的入口 2023-07-20 10:13:18 +08:00
eson
20a7149eb6 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-19 16:45:07 +08:00
eson
a3151acb70 修改fs_user的sub字段 2023-07-19 16:44:45 +08:00
laodaming
f09220cf2d fix 2023-07-19 14:01:53 +08:00
laodaming
e1bc5fbe51 fix 2023-07-17 17:08:45 +08:00
laodaming
73ce1e6db3 fix 2023-07-17 14:40:24 +08:00
laodaming
fffdf448c4 fix 2023-07-17 11:42:29 +08:00
laodaming
0db42491ae fix 2023-07-14 16:48:04 +08:00
laodaming
3a6ab7a666 fix 2023-07-14 15:57:27 +08:00
laodaming
86a2deacfb fix 2023-07-14 14:38:34 +08:00
laodaming
6cd5a6d0e8 fix 2023-07-13 19:05:13 +08:00
laodaming
e4925c2194 fix 2023-07-13 11:36:02 +08:00
laodaming
98c5727c7e fix 2023-07-11 17:08:19 +08:00
laodaming
bb18b5effa fix 2023-07-11 15:01:08 +08:00
laodaming
8e207ef600 fix 2023-07-11 14:16:13 +08:00
laodaming
8c2cfcb37b fix 2023-07-11 11:53:15 +08:00
laodaming
22d0f6a5b1 fix 2023-07-11 11:28:57 +08:00
laodaming
f07e4a2084 fix 2023-07-10 19:42:55 +08:00
laodaming
852fca2afa fix 2023-07-10 18:28:37 +08:00
eson
8f95be2ba5 测试登录成功 2023-07-10 17:38:44 +08:00
laodaming
791121c574 fix 2023-07-06 17:55:59 +08:00
laodaming
2b1728aac5 fix 2023-07-06 17:43:07 +08:00
laodaming
6337371cd1 fix 2023-07-05 16:03:16 +08:00
laodaming
31d22cda63 fix 2023-07-04 16:48:56 +08:00
laodaming
22b27141a4 fix 2023-07-03 17:33:59 +08:00
eson
5934017dbf 修改 model 序列化提示, 防止空值传入 2023-07-03 14:47:10 +08:00
eson
07121d0294 序列化修复 2023-07-03 14:36:11 +08:00
laodaming
c17ab5ae5c fix 2023-06-30 17:20:11 +08:00
eson
7d386237fb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-29 18:05:38 +08:00
eson
9b56d7ba51 TODO: render/ 相关模块 2023-06-29 18:04:59 +08:00
laodaming
f09e1b8f93 fix 2023-06-29 13:59:55 +08:00
eson
8ba8a67dfb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-28 19:33:00 +08:00
eson
d4e75b1efc TODO: 反射 2023-06-28 19:32:41 +08:00
laodaming
6abca6b271 fix 2023-06-28 17:05:31 +08:00
laodaming
b012db8e4e fix 2023-06-28 14:55:13 +08:00
laodaming
5b9a814fbb fix 2023-06-28 12:25:40 +08:00
laodaming
19f41f6dbc fix 2023-06-27 18:35:26 +08:00
eson
0851c922ef Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-27 18:10:18 +08:00
eson
13c5a45a5e 报价单接近完成 2023-06-27 18:09:56 +08:00
laodaming
66ed487249 fix 2023-06-27 17:04:58 +08:00
laodaming
c5bcf9d676 fix 2023-06-27 14:25:25 +08:00
eson
a101764dcb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-26 18:20:04 +08:00
eson
d74d27ab2d backend 2023-06-26 18:19:51 +08:00
laodaming
7f71afd8b0 fix 2023-06-26 16:53:36 +08:00
eson
150ae1df77 TODO: backend 2023-06-25 20:00:27 +08:00
eson
1a0156c686 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-25 18:30:58 +08:00
eson
96c43325c0 添加后台用户表直接分离 2023-06-25 18:30:39 +08:00
laodaming
d876884397 fix 2023-06-25 17:11:42 +08:00
laodaming
81b315b12b fix 2023-06-25 12:16:01 +08:00
laodaming
1a48387e92 fix 2023-06-25 11:28:37 +08:00
eson
efe02a0355 修复 AuthKey为空的时候 也可以过. 2023-06-25 11:26:47 +08:00
eson
8bd6f019ba Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-21 18:59:44 +08:00
eson
d987601afd faq 2023-06-21 18:59:27 +08:00
laodaming
cac0161585 fix 2023-06-21 18:06:39 +08:00
eson
b27aaab6b6 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-21 16:40:20 +08:00
eson
29d5c91736 修改api的request 2023-06-21 16:39:55 +08:00
laodaming
dfcceaea8e fix 2023-06-21 16:35:43 +08:00
laodaming
89dfd58e1c fix 2023-06-21 15:06:09 +08:00
laodaming
41386fca3b fix 2023-06-21 12:34:57 +08:00
eson
4fb57e1c39 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-21 12:22:18 +08:00
eson
7fe53f749e 完成AllModels序列化 2023-06-21 12:21:56 +08:00
laodaming
db9c2f3cc7 fix 2023-06-21 12:11:43 +08:00
eson
389f12b8c5 添加AllModels 2023-06-21 11:29:09 +08:00
laodaming
edeb2bb5f1 fix 2023-06-20 19:56:18 +08:00
eson
b2062d6448 修复SetStatus错误 2023-06-20 19:52:38 +08:00
eson
e6971575f1 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-20 19:37:08 +08:00
eson
e50dac6b1c Order订单待测试 2023-06-20 19:36:28 +08:00
laodaming
313e8a9457 fix 2023-06-20 18:05:29 +08:00
eson
d4d11db732 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-20 17:29:18 +08:00
eson
6c6066cea1 更新合并 2023-06-20 17:29:02 +08:00
laodaming
7ef6f453dc fix 2023-06-20 17:28:28 +08:00
eson
c870ab773a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-20 16:47:14 +08:00
eson
2d3c394c73 Order 枚举 2023-06-20 16:46:56 +08:00
laodaming
0f4ae5164b fix 2023-06-20 14:59:13 +08:00
eson
8a4e122a0a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-20 12:15:37 +08:00
eson
58547706c7 修改Order的命名域 2023-06-20 12:15:14 +08:00
laodaming
fbe3b42153 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-06-20 11:52:34 +08:00
laodaming
e71fb08bd4 fix 2023-06-20 11:52:26 +08:00
eson
db155a71a0 todo: add-address 2023-06-19 20:10:32 +08:00
eson
640d3261e0 添加自增控制 2023-06-19 18:27:31 +08:00
laodaming
6a9650b9d1 fix 2023-06-19 14:47:54 +08:00
laodaming
bbb1a845ad fix 2023-06-19 12:23:02 +08:00
eson
038d2d36a4 for save 2023-06-19 10:12:58 +08:00
laodaming
c5ecca3da2 fix 2023-06-19 09:53:35 +08:00
eson
de05b0a78b 所有uint64 -> int64 2023-06-16 19:51:41 +08:00
eson
2399c2deeb 修复gorm的默认值 2023-06-16 19:29:48 +08:00
laodaming
30ecb70cd7 fix 2023-06-16 19:26:48 +08:00
laodaming
350c6a5548 fix 2023-06-16 19:05:38 +08:00
eson
90871c1ab0 解决冲突 2023-06-16 19:04:13 +08:00
eson
87c9246c34 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-16 19:00:18 +08:00
eson
8679ba1ba3 完成序列化 2023-06-16 18:52:24 +08:00
laodaming
c6292a97dd fix 2023-06-16 18:48:05 +08:00
laodaming
175583ca51 fix 2023-06-16 18:24:31 +08:00
laodaming
47bf9580da fix 2023-06-16 15:11:37 +08:00
laodaming
68c431bda2 fix 2023-06-16 14:52:45 +08:00
eson
31111a5332 修改gorm序列化错误 2023-06-16 10:58:43 +08:00
laodaming
4a5d84fb22 fix 2023-06-15 19:14:19 +08:00
eson
51a33052d9 完成一些测试 2023-06-15 17:51:06 +08:00
eson
66c043534f Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-15 16:10:35 +08:00
eson
ab4e5852c1 修复序列化代码 2023-06-15 16:08:43 +08:00
laodaming
1f941b7c9d fixz 2023-06-15 15:28:17 +08:00
eson
c55d837670 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-06-14 18:20:04 +08:00
eson
6a2cfb14e9 finish: gorm序列化 2023-06-14 18:17:45 +08:00
laodaming
a5c3463fa9 fix 2023-06-14 17:59:48 +08:00
laodaming
f7da17778e fix 2023-06-14 16:04:43 +08:00
laodaming
83e45f26b2 fix 2023-06-14 15:45:56 +08:00
laodaming
6f6da3f481 fix 2023-06-14 14:05:27 +08:00
laodaming
d523d62abd fix 2023-06-13 19:07:57 +08:00
laodaming
d941402ef1 fix 2023-06-13 17:47:48 +08:00
laodaming
da347feac9 fix 2023-06-13 14:29:44 +08:00
laodaming
147af8ae29 fix 2023-06-13 14:13:40 +08:00
laodaming
be3279ba7e fix 2023-06-13 13:07:09 +08:00
laodaming
d455f3b256 fix 2023-06-13 12:15:06 +08:00
laodaming
7f4f8dddad fix 2023-06-12 18:06:47 +08:00
laodaming
973df7a901 fix 2023-06-12 17:47:20 +08:00
laodaming
7f19e29bb3 fix 2023-06-12 17:00:37 +08:00
laodaming
b1393950f2 fix 2023-06-12 16:47:48 +08:00