xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-04 11:16:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
840 Commits 2 Branches 32 Tags 340 MiB
6a6b39cbae
Commit Graph

243 Commits

Author SHA1 Message Date
Carl
432f2dd840 movie url address to application files. 2022-02-08 11:21:56 +08:00
Carl
4256bb3ef7 fix bugger 2022-02-02 17:35:23 +08:00
Carl
d31b4b45b3 debugger 2022-02-02 15:42:04 +08:00
Carl
3005334e56 debugger 2022-02-02 00:20:37 +08:00
Carl
a57cbe705a debugger 2022-01-30 20:05:23 +08:00
Carl
79c1156767 debugger 2022-01-30 18:28:57 +08:00
Carl
e75e2149dc debugger 2022-01-30 16:04:13 +08:00
Carl
3ca9cbe111 debugger 2022-01-30 15:52:41 +08:00
Carl
3deeab7bc2 debugger 2022-01-30 13:26:41 +08:00
Carl
a48ebf09cd debugger 2022-01-30 12:48:45 +08:00
Carl
1831007a0b debugger 2022-01-30 02:44:51 +08:00
Carl
801ac2979c debugger 2022-01-29 19:40:10 +08:00
Carl
990743412a debugger 2022-01-29 19:29:22 +08:00
Carl
bb2c4903ce debugger 2022-01-29 19:25:33 +08:00
Carl
0c5e6bc33a debugger 2022-01-29 19:14:35 +08:00
Carl
80ac6d1cef debugger 2022-01-29 19:08:12 +08:00
Carl
177b49f4fd debugger 2022-01-29 02:28:57 +08:00
Carl
47c5c1b785 debugger 2022-01-29 02:21:44 +08:00
Carl
49abd63ff9 debugger 2022-01-29 02:14:05 +08:00
Carl
2274267b6f debugger 2022-01-29 02:11:18 +08:00
Carl
abf53cae07 Merge remote-tracking branch 'origin/sit-Carl-V3' into sit-Carl-V3 2022-01-29 02:09:52 +08:00
Carl
90cf0dceaf debugger 2022-01-29 02:09:43 +08:00
Admin
68156909be
!127 2022-1-28 Leung 
Merge pull request !127 from Admin/sit-Leung
 2022-01-28 10:21:30 +00:00
Carl
035d392e76 fix The server time zone value 'Coordinated Universal Time' is unrecognized or represents more than one 2022-01-28 18:05:26 +08:00
Carl
0eb02c313b fix The server time zone value 'Coordinated Universal Time' is unrecognized or represents more than one 2022-01-28 17:58:00 +08:00
Carl
99f4df3c1f fix The server time zone value 'Coordinated Universal Time' is unrecognized or represents more than one 2022-01-28 17:13:18 +08:00
Carl
6496bd0083 fix without basePoint and paytype 2022-01-28 17:00:14 +08:00
Carl
505bf618ac fix without basePoint and paytype 2022-01-28 16:23:11 +08:00
Carl
d42c9546ec add paymentAmount logic 2022-01-28 15:47:23 +08:00
Carl
58bf9c6d02 rel 2022-01-28 14:31:42 +08:00
Admin
a8916ce195
!124 2022-1-28 Jiamin 
Merge pull request !124 from Admin/sit-jiamin-v2
 2022-01-28 03:45:55 +00:00
952108534@qq.com
d0ea3582dd 图片的更改 2022-01-28 11:40:45 +08:00
952108534@qq.com
fc3314230d 图片 2022-01-28 11:32:54 +08:00
Carl
9b1f623be0 add 2022-01-27 16:54:13 +08:00
Carl
04a2710347 fix 2022-01-27 11:15:06 +08:00
Carl
59b505dd8f add sale value 1 2022-01-26 19:20:10 +08:00
Carl
e41361dc6c add sale value 1 2022-01-26 19:00:05 +08:00
Carl
4b73d6585b add sale value 1 2022-01-26 17:51:45 +08:00
Carl
17deaa4f01 add sale value 1 2022-01-26 17:34:52 +08:00
Carl
0bec34a4e3 add sale value 1 2022-01-26 17:13:25 +08:00
Carl
6cae48231c adding H5 wxpay 2022-01-26 16:31:21 +08:00
Carl
b405adfaa8 add sale value 1 2022-01-25 18:37:40 +08:00
Carl
0e47b968e3 add sale value 1 2022-01-25 18:26:18 +08:00
Carl
b7b9f99faf add reg or login logic . 2022-01-25 16:41:29 +08:00
Carl
f219facc4c seeting expire time 365 2022-01-25 12:26:27 +08:00
Carl
bae8ab4422 modify coupon logic ,adding 3 verfiy 2022-01-24 18:24:58 +08:00
Carl
dcf2ab1953 adding install cart verification 2022-01-24 16:41:26 +08:00
Carl
d59ae7cca5 后台增加以下功能： 
1：微信回调后自动获取商品积分
 2022-01-23 21:40:52 +08:00
Carl
9fce9da12e 后台做以下更改： 
1：insertCartProductInfo 新增basePiont
2：getCartProductInfo 新增basePiont
3：新增借口监听支付回调royalcanin/monitorOrderNotify（入参为OrderNumber）
成功回调为 :{ "code": 1, "msg": "SUCCESS", "success": true, "data": null }
失败回调为：{ "code": 9009, "msg": "没有该订单回调数据！", "success": false, "data": null }
 2022-01-23 18:25:36 +08:00
Carl
4a54185c01 搞定了，后台更新了以下几点： 
1：getCartProductInfo 新增了“leftAllotment”字段
2：insertCartProductInfo 新增了“leftAllotment”字段
3：generateOrderWX 入参新增了“basePoint”
4：updateOrderWX微信回调方法，新增了自动增加该账户积分信息。
 2022-01-23 00:27:22 +08:00
Admin
276c1bd403
fix -v 2022-01-22 08:24:06 +00:00
Admin
8418a1489f
fix 2022-01-22 08:18:06 +00:00
Admin
6dd0c8fdad
fix 2022-01-22 08:09:10 +00:00
Admin
74d336c4d6
fix 2022-01-22 08:08:45 +00:00
Admin
397a96f2b9
test 2022-01-22 07:44:42 +00:00
Admin
b0de4dea5c
tes 2022-01-22 07:43:53 +00:00
Admin
c991eb3b06
fix 2022-01-22 07:39:22 +00:00
Admin
5ca37bbf06
fix issue 2022-01-22 07:17:57 +00:00
Admin
3c7efe8ef0
fix -v2 2022-01-22 07:07:27 +00:00
Admin
b14ce83bac
fix 2022-01-22 07:04:21 +00:00
Admin
b0ec2b0d21
fix order bugger 2022-01-22 06:50:45 +00:00
Carl
94906b8260 adding install cart verification 2022-01-21 17:09:16 +08:00
Carl
c0a4d1d375 change Alipay pay bill logic and modify goods API entity 2022-01-21 16:18:10 +08:00
Carl
b326400e16 change Alipay pay bill logic and modify goods API entity 2022-01-21 14:50:16 +08:00
Carl
942dab06ce adding productsearchTag select 2022-01-20 18:54:15 +08:00
Carl
6060715361 adding productsearchTag select 2022-01-20 17:09:59 +08:00
Carl
3cde853f9e adding productsearchTag select 2022-01-20 15:32:03 +08:00
Carl
8ca5dddd59 adding productsearchTag select 2022-01-19 19:31:28 +08:00
Carl
3293b25734 Adding repayOrderWX API 2022-01-19 15:16:37 +08:00
Carl
b15b585d4c Adding repayOrderWX API 2022-01-19 14:46:19 +08:00
Carl
d442e3bb74 Adding repayOrderWX API 2022-01-19 14:22:30 +08:00
Carl
6a0c203220 add notify logic 2022-01-19 00:56:30 +08:00
Carl
cc93585525 add notify logic 2022-01-19 00:37:35 +08:00
Carl
0eaf96bfd1 add notify logic 2022-01-19 00:34:57 +08:00
Carl
37a6426ae0 add notify logic 2022-01-19 00:34:31 +08:00
Carl
997041abba add notify logic 2022-01-18 23:38:15 +08:00
Carl
458ea2aba3 test 2022-01-18 23:30:53 +08:00
Carl
fc580f6773 modify notify_url 2022-01-18 19:02:06 +08:00
Carl
826ef7d4d9 modify notify_url 2022-01-18 19:01:26 +08:00
Carl
8c3506a757 modify notify_url 2022-01-18 18:50:54 +08:00
Carl
6a2ba23d55 modify notify_url 2022-01-18 18:43:40 +08:00
Carl
17d5182878 modify notify_url 2022-01-18 18:34:35 +08:00
Carl
e7c6497b20 modify notify_url 2022-01-18 18:18:04 +08:00
Carl
752e59f475 adding notify log 2022-01-18 17:51:41 +08:00
Carl
fdbd5ae1d3 adding notify log 2022-01-18 17:50:55 +08:00
Carl
0f540205eb modify respone html type 2022-01-18 16:36:28 +08:00
Carl
66d7a0556b add jwt decode and remove shopping cart API parameter memberId 2022-01-17 14:35:20 +08:00
Carl
cfcc3396ea add jwt decode and remove shopping cart API parameter memberId 2022-01-17 14:20:29 +08:00
Carl
d6e668a5ea remove msgNum on SMSscript 2022-01-14 18:29:31 +08:00
Carl
4e53691ef5 adding 2 more coupon type ID calculation 2022-01-12 17:29:24 +08:00
Carl
ac15aa35c9 bug fix 2022-01-11 16:40:02 +08:00
Carl
8eea4568b5 bug fix 2022-01-11 15:57:55 +08:00
Carl
425d7f475b bug fix 2022-01-07 19:54:48 +08:00
Carl
728f9b69c9 bug fix 2022-01-07 19:50:03 +08:00
Carl
fe641bb3c5 bug fix 2022-01-07 18:05:30 +08:00
Carl
2efb0f2fd2 bug fix 2022-01-07 17:40:44 +08:00
Carl
a5c665b822 modify product_id -> product_code 2022-01-06 16:57:38 +08:00
Carl
6e46d5743a 优惠卷 2022-01-06 16:03:19 +08:00
Carl
c0252fcb2d adding JiaMin coding 2022-01-06 11:22:07 +08:00
Carl
78736daf83 adding JiaMin coding 2022-01-06 11:19:36 +08:00