pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity
1,550 Commits
2 Branches
0 Tags
14 MiB
Commit Graph

1396 Commits (ae69749f9391d10501db32a1663dcfdaba2eecec)

Author SHA1 Message Date
panliang b1ba1d373a 1 2022-06-10 15:18:04 +08:00
panliang 4829fa8744 1 2022-06-10 15:06:06 +08:00
panliang 8571603baa 1 2022-06-10 14:54:57 +08:00
panliang 48bbcb73a2 预售库存状态 2022-06-10 14:43:49 +08:00
panliang 1797c09e90 1 2022-06-10 14:15:46 +08:00
panliang 669fe2f353 test 2022-06-10 14:11:06 +08:00
panliang 245add8c2e 1 2022-06-10 11:12:31 +08:00
panliang d8a22a238c order.user 2022-06-10 11:03:57 +08:00
panliang ffcae9b66a order is_pre_sale 2022-06-10 09:24:17 +08:00
panliang 3df12d381c sku 预售 2022-06-09 10:08:13 +08:00
panliang 2030ffdee4 商品预售 2022-06-09 09:44:43 +08:00
panliang 122f9538bf prize-type 2022-06-07 11:14:33 +08:00
panliang 71d287fbf4 order 2022-06-07 10:38:12 +08:00
panliang 3ca83d3773 1 2022-06-06 17:23:19 +08:00
panliang 19ae68841c user:claer 2022-06-06 15:04:20 +08:00
panliang 3914df5523 w 2022-06-02 17:43:57 +08:00
panliang a8d7e98eb8 w 2022-06-02 17:31:12 +08:00
panliang db66134bdd w 2022-06-02 17:24:16 +08:00
panliang d6cbcb1e8a w 2022-06-02 17:22:22 +08:00
panliang 471346c321 w 2022-06-02 17:20:19 +08:00
panliang cf584de24a w 2022-06-02 17:17:39 +08:00
panliang 6effba3cf6 w 2022-06-02 16:40:17 +08:00
panliang 276c431bba w 2022-06-02 16:36:23 +08:00
panliang f4c1aef353 w 2022-06-02 16:24:56 +08:00
panliang 0196522914 w 2022-06-02 16:20:37 +08:00
panliang 1255c0fa5f 1 2022-06-02 16:13:18 +08:00
panliang f7a2a9c29e dis 2022-06-02 14:54:48 +08:00
panliang 762c2a646a Merge branch 'base' of gitee.com:paddy_technology/jiqu-mall-server into base 2022-06-02 13:47:32 +08:00
panliang 2d79958f2b wang-editor 2022-06-02 13:47:23 +08:00
Jing Li 51eb230253 WIP 2022-06-02 11:05:12 +08:00
Jing Li 76c99c66c7 WIP 2022-06-02 10:59:51 +08:00
panliang 5b18fc8002 Merge branch 'base' of gitee.com:paddy_technology/jiqu-mall-server into base 2022-06-02 10:33:11 +08:00
Jing Li 330602b829 Update 2022-06-02 10:32:24 +08:00
panliang 4b700f8c13 Merge branch 'base' of gitee.com:paddy_technology/jiqu-mall-server into base 2022-06-02 10:30:24 +08:00
panliang 8523a44fea color 2022-06-02 10:29:48 +08:00
Jing Li 1cc4cff2b2 WIP 2022-06-02 10:29:43 +08:00
panliang e489bce3d1 线上商品忽略库存 2022-06-02 10:26:23 +08:00
panliang 283f4510e1 agent 2022-06-02 10:03:30 +08:00
panliang b175bbc875 sku 2022-06-02 09:54:26 +08:00
Jing Li b5a1d28226 抽奖活动 2022-06-02 09:53:15 +08:00
panliang c90a503775 1 2022-06-01 16:00:01 +08:00
panliang d657a68aec 1 2022-06-01 15:53:52 +08:00
panliang 1b44673f05 分区商品spu 2022-06-01 15:51:44 +08:00
panliang 91eccc1761 头像.Spu 2022-06-01 15:20:26 +08:00
panliang 51e11fb3d2 pid 2022-05-31 14:04:55 +08:00
panliang fa84e5a685 model 2022-05-31 13:10:02 +08:00
panliang 18c07b1879 model 2022-05-31 13:09:22 +08:00
panliang ad6cff0929 文章分类 2022-05-31 10:09:08 +08:00
panliang 517e96e8a7 文章分类 2022-05-31 10:06:15 +08:00
panliang 53f8327a94 article 2022-05-31 09:57:30 +08:00
panliang 93bbb07cee profit 2022-05-31 09:30:17 +08:00
panliang c38749e452 order-profit 2022-05-30 17:52:36 +08:00
1163816051@qq.com 45fff9f005 admin order 底部统计 2022-05-26 14:17:05 +08:00
1163816051@qq.com f774997e42 admin order 添加成本价/售价总额 2022-05-26 13:42:58 +08:00
1163816051@qq.com f70e9605b6 admin store order 添加成本价/售价总额 2022-05-26 13:40:43 +08:00
1163816051@qq.com fcebed9a9d admin store 统计 2022-05-25 17:44:01 +08:00
panliang c959b718a0 distri 2022-05-23 13:54:37 +08:00
panliang c65385a21c console 2022-05-23 11:27:38 +08:00
panliang f14228509a tag 2022-05-23 11:17:07 +08:00
panliang baeb2a026b 订单生成提成记录 2022-05-23 10:20:19 +08:00
panliang 46a2b2cec0 修复 用户扫码重复生成订单 2022-05-20 17:31:16 +08:00
panliang 8cddeb2387 修复 用户扫码重复生成订单 2022-05-20 17:29:30 +08:00
panliang 5e2fa41603 admin Store/OrderController 2022-05-20 16:36:10 +08:00
panliang 875eed679e 权限 2022-05-20 16:32:16 +08:00
panliang 51278dc9c5 admin UserVipController 2022-05-20 13:33:49 +08:00
panliang 68404f3c9b UserVip HasDateTimeFormatter 2022-05-20 11:25:51 +08:00
panliang 1f79bd118e 订单确认收货，记录业绩 2022-05-20 11:23:12 +08:00
panliang ac998c036c admin user 2022-05-20 11:13:12 +08:00
panliang 4ef6cf2382 线下订单，支付成功，自动发货 2022-05-20 10:52:29 +08:00
panliang fc67994eb4 下载商品末班 2022-05-20 10:34:36 +08:00
panliang 73ed204da2 vip 2022-05-20 10:24:45 +08:00
panliang c2b0f883d5 order-pack 2022-05-19 17:52:39 +08:00
panliang 822f64fee9 admin 门店管理 2022-05-19 17:50:50 +08:00
panliang 3c5ccf66be admin 下载商品导入模板 2022-05-19 11:49:12 +08:00
panliang dc2778fd94 1 2022-05-19 11:40:51 +08:00
panliang 76a3c7e676 admin/user show UserCompany 2022-05-19 10:53:48 +08:00
panliang 558eedbd3d article seeder 2022-05-19 10:35:43 +08:00
panliang 6ecdc00dec 文章 2022-05-19 10:06:34 +08:00
panliang b55e6881df ls 2022-05-18 17:47:37 +08:00
panliang a78dc2c412 user 2022-05-18 17:39:08 +08:00
panliang 31ca699f31 lis 2022-05-18 17:26:44 +08:00
panliang 9d156f4351 1 2022-05-18 17:13:10 +08:00
panliang 3005f25e1d pre 2022-05-18 17:08:14 +08:00
panliang ca9b805cb6 order-pre 2022-05-18 14:48:05 +08:00
panliang d0376a1f00 gitf 2022-05-18 14:42:27 +08:00
panliang 99fe70417c 1 2022-05-18 14:29:38 +08:00
panliang d4450dee61 1 2022-05-18 14:11:05 +08:00
panliang 296eea470e jiqu 2022-05-18 14:03:09 +08:00
panliang 41a6f3f5d0 vip-coupon 2022-05-18 13:43:31 +08:00
panliang 6b4c363a68 vip 2022-05-18 13:14:07 +08:00
panliang f6be64b274 notify 2022-05-18 12:16:10 +08:00
李静 83e8e29de3
Update 2022-05-18 03:40:52 +00:00
panliang 136ea25ded seeder 2022-05-18 11:30:13 +08:00
panliang eece8679ca user 2022-05-18 11:19:11 +08:00
panliang 16b04e024b 会员卡 2022-05-18 11:01:01 +08:00
panliang 0e395eb986 pay 2022-05-17 17:50:30 +08:00
panliang 1686325d66 商品分类 tree 2022-05-17 14:41:39 +08:00
panliang 6e3dc4ad4b 导入商品 2022-05-17 14:31:56 +08:00
panliang d38169f74b 商品导入 2022-05-17 14:18:52 +08:00
panliang b00238f320 api 店铺商品 2022-05-16 14:32:02 +08:00
panliang 713100d0ef store 2022-05-16 13:54:39 +08:00
panliang 59c7c241ec 门店管理后台 2022-05-16 13:19:42 +08:00
panliang 7969745c4c 店铺后台 2022-05-13 17:46:43 +08:00
panliang 093e8770fe dis 2022-05-13 13:46:59 +08:00
panliang 9772dc4e12 command user:token 2022-05-13 13:29:09 +08:00
panliang 74e3550ac8 查看用户上级 2022-05-13 13:23:19 +08:00
panliang d893745407 查看用户上级 2022-05-13 13:21:24 +08:00
panliang cf99ebc801 生成邀请小程序码 2022-05-13 13:04:58 +08:00
panliang cccf1d5fff test 2022-05-13 11:51:36 +08:00
panliang 09c53981b5 企业付款 todo 2022-05-12 17:49:04 +08:00
panliang eecf325b41 order 2022-05-12 13:32:09 +08:00
panliang bc70d2e565 order 2022-05-12 13:31:20 +08:00
panliang dcb9144c32 app 2022-05-12 13:29:37 +08:00
panliang 7b313886ec seeder 2022-05-12 11:09:05 +08:00
panliang 9da8638346 确认收货,发放提成 2022-05-11 17:29:47 +08:00
panliang 4cfa8c68c2 微信服务商 2022-05-11 14:54:02 +08:00
panliang 788769fcfc 微信服务商 2022-05-11 14:46:56 +08:00
panliang d4cd3871b2 测试环境小程序码版本 2022-05-11 14:14:39 +08:00
panliang e85ed583be 1 2022-05-11 13:43:06 +08:00
panliang fd07df5e58 更换提货备注 2022-05-11 13:40:22 +08:00
panliang 5528a867f3 Order/UnlineController 2022-05-11 10:08:04 +08:00
panliang 22b80d067f Store 2022-05-10 17:34:54 +08:00
panliang 611fbb9934 店铺关联商品 2022-05-10 16:18:32 +08:00
panliang d783768e4c Store 2022-05-10 13:42:45 +08:00
panliang 3707ecab87 order_pre 2022-05-10 12:53:24 +08:00
panliang 44dda50250 返利 2022-05-09 17:52:02 +08:00
panliang d69e2a9cfe UserSeeder 2022-05-09 14:16:36 +08:00
panliang ef24fc9823 UserSeeder 2022-05-09 14:12:23 +08:00
panliang 514bf58b2a 微信绑定手机号 2022-05-09 10:16:15 +08:00
panliang 210413542b 微信绑定手机号 2022-05-09 10:13:18 +08:00
panliang 8ec8067174 1 2022-05-07 17:31:44 +08:00
panliang cfcc3b1b3c 切换员工身份 2022-05-07 14:37:34 +08:00
panliang 50fb013f22 add migration 2022-05-07 13:57:54 +08:00
panliang b8cd92a70a add MiniController 2022-05-07 13:32:46 +08:00
panliang bd7e5b899f routes 2022-05-07 13:18:02 +08:00
panliang 8e80d4bebe merge 2022-05-07 12:21:38 +08:00
panliang 1f4961b0f9 Store 店铺管理 2022-05-07 11:53:30 +08:00
panliang fdfa755e57 Revert "小程序授权登录" 
This reverts commit e1c2e18758.
 2022-05-07 10:50:18 +08:00
QQ e1c2e18758 小程序授权登录 2022-05-07 10:36:17 +08:00
李静 0b6d5d7a59 移除分销 2022-04-27 15:22:41 +08:00
李静 6c2dd35acb 移除预成长值 2022-04-27 14:37:32 +08:00
李静 221d1bcda7 移除批零 2022-04-27 14:07:18 +08:00
李静 3cd5161b94 Fix 2022-04-25 13:41:10 +08:00
vine_liutk a759b7c8ee 添加批零订单详情接口to_lvl 2022-04-24 11:44:19 +08:00
vine_liutk 64fbcb102b 调整购物车下单 2022-04-24 11:24:58 +08:00
李静 729f89181d Fix 2022-04-24 11:16:34 +08:00
李静 dd07b345af Fix 2022-04-24 10:36:04 +08:00
李静 bee6098028 批零经销商变更余额 2022-04-24 10:35:26 +08:00
vine_liutk 454e5d39d3 调整批零端计算下单价格接口 2022-04-24 10:22:22 +08:00
李静 3ea9612ae5 批零提现详情,显示管理者 2022-04-24 10:12:58 +08:00
李静 2fcd925831 批零提现时,保存最近的管理者信息 2022-04-24 10:10:26 +08:00
李静 e51d8de60c Update 2022-04-22 17:18:57 +08:00
vine_liutk ccaa77947a 添加云仓单标记已发货状态 2022-04-21 15:10:57 +08:00
李静 9c48f1bb91 优化管理津贴流水 2022-04-19 13:57:41 +08:00
李静 433692d6a0 移除未结算管理津贴 2022-04-19 13:52:02 +08:00
李静 d5692c9c3d 批零统计优化 2022-04-19 13:49:36 +08:00
李静 3405c0f66f WIP 2022-04-19 11:05:03 +08:00
李静 63ef80be23 经销商订单确认收款后即可结算 2022-04-19 10:59:18 +08:00
李静 b2fbee4d71 Fix 2022-04-15 10:03:53 +08:00
李静 d59468ee70 撤销售后单 2022-04-14 15:19:23 +08:00
Jing Li 17caae4370 账号状态检查 2022-04-14 15:19:23 +08:00
vine_liutk b8a9bab95d 调整减免优惠 2022-04-14 14:52:18 +08:00
vine_liutk 25c401672b 调整后台订单显示 2022-04-14 14:01:52 +08:00
vine_liutk bbabc71f82 调整砍价下单计算优惠 2022-04-14 13:30:51 +08:00
vine_liutk 7379446690 调整后台减免金额 2022-04-14 13:29:50 +08:00
李静 e58bc41af7 修复商品优惠金额 2022-04-14 11:55:01 +08:00
vine_liutk c22f2afafd 添加bargain—sku接口返回activity_id 2022-04-14 09:52:32 +08:00
vine_liutk b67c53c2c2 调整下单listener通过活动发送优惠券 2022-04-14 09:43:16 +08:00
李静 9020b9501a 修复送券BUG 2022-04-14 09:40:17 +08:00
vine_liutk aef929bfba 调整提示 2022-04-13 17:04:01 +08:00
vine_liutk 3c8889138d 调整砍价单列表显示备注 2022-04-13 16:03:15 +08:00
李静 dcdcfcbf56 批零提现代付 2022-04-13 13:54:15 +08:00
vine_liutk 704287d550 调整砍价判断 2022-04-13 11:45:52 +08:00
李静 d98d31487b 批零提现状态枚举 2022-04-13 10:52:15 +08:00
李静 5beec69c39 Update 2022-04-13 10:38:51 +08:00
李静 a123a87d1b 关闭商城提现代付 2022-04-13 10:36:42 +08:00
vine_liutk 4c203f4a31 调整后台订单详情显示商品的砍价优惠金额 2022-04-13 10:25:47 +08:00
vine_liutk 82807fdfae 调整砍价 2022-04-13 10:17:31 +08:00
vine_liutk 7c278507eb 调整砍价商品售后问题 2022-04-13 10:17:31 +08:00
李静 3a0ba59c3f WIP 2022-04-12 17:50:56 +08:00
李静 8c1cf2caa2 Update 2022-04-12 17:09:01 +08:00
李静 7eefc5a7a7 Fix 2022-04-12 17:03:23 +08:00
李静 8f7ae2600d debug 2022-04-12 17:01:24 +08:00
vine_liutk e56ff82385 添加砍价订单备注功能 2022-04-12 16:43:31 +08:00
李静 0b1b44af27 Update 2022-04-12 16:40:04 +08:00
李静 051c2452a1 代付回调 2022-04-12 16:25:30 +08:00
vine_liutk 4055e850f4 调整后台砍价订单记录查询 2022-04-12 16:17:26 +08:00
李静 078a52f206 代付交易超时,重新支付 2022-04-12 16:11:32 +08:00
vine_liutk 602d6f30aa 调整砍价订单详情id排版 2022-04-12 15:56:38 +08:00
vine_liutk 1fb919cafa 调整进货补贴查询不存在的数据置为空 2022-04-12 15:55:44 +08:00
vine_liutk c09a691ddc 调整砍价活动详情 2022-04-12 15:50:45 +08:00
李静 e17a2b9357 代付 2022-04-12 14:38:31 +08:00
李静 8a4cc82456 Update 2022-04-12 10:24:49 +08:00
李静 f78debbb37 余额提现状态枚举 2022-04-11 17:47:28 +08:00
vine_liutk d590a90350 调整砍价后台bug 2022-04-11 17:34:41 +08:00
vine_liutk 9ad18cecef 添加后台查看砍价日志明细 2022-04-11 17:29:22 +08:00
vine_liutk f5dbc14334 添加砍价商品返回活动的图片以及分享配置 2022-04-11 17:29:22 +08:00
李静 7308a7d663 银行枚举 2022-04-11 17:27:47 +08:00
vine_liutk b9fa29ac14 调整砍价进度返回 2022-04-11 15:43:20 +08:00
vine_liutk a690e597b3 添加砍价接口返回砍价时间 2022-04-11 15:34:36 +08:00
vine_liutk 27e852f880 添加发起砍价人的头像 2022-04-11 15:02:40 +08:00
vine_liutk 566a39522b 添加发起砍价人的名称 2022-04-11 14:52:28 +08:00
vine_liutk 0ba1c7b985 砍价添加一个单只能砍一次判断 2022-04-11 14:42:04 +08:00
vine_liutk d77c7394bc 调整砍价bug 2022-04-11 09:51:19 +08:00
vine_liutk 0d3e62305d 调整下单砍价优惠默认值 2022-04-08 16:45:08 +08:00
vine_liutk 2deccdff14 调整通过砍价单下单 2022-04-08 16:38:39 +08:00
vine_liutk 4bbd9f9372 返回砍价活动开始时间和结束时间 2022-04-08 16:27:07 +08:00
vine_liutk 942edeabe8 添加砍价接口 2022-04-08 15:56:39 +08:00
vine_liutk a76160ce0d 添加砍价活动后台管理 2022-04-08 15:56:39 +08:00
vine_liutk 5d563592ed 添加砍价表结构迁移 2022-04-08 15:56:38 +08:00
vine_liutk ca66b1d599 调整文章接口 2022-04-07 10:49:11 +08:00
李静 26740087e1 Update 2022-04-06 14:46:42 +08:00
李静 61c91570aa 管理者津贴明细查询 2022-04-06 13:43:24 +08:00
李静 77ee89c1aa 经销商余额充值 2022-04-06 13:43:24 +08:00
Jing Li e06c590496 账号状态检查 2022-04-03 14:42:43 +08:00
李静 3605c7c707 进货业绩按创建时间筛选 2022-04-02 17:38:31 +08:00
李静 6668e210b4 Fix 2022-04-01 15:56:49 +08:00
李静 5fd5aebbac 每月统计 2022-04-01 15:54:31 +08:00
李静 a96e157868 修复任务调度异常 2022-04-01 15:08:28 +08:00
vine_liutk b454d36257 调整删除用户逻辑，添加同时删除用户所有token 2022-04-01 14:54:36 +08:00
李静 2d46ca1b94 修复当期进货业绩 2022-04-01 09:54:53 +08:00
李静 b880ddc322 计算当期进货业绩 2022-04-01 09:50:35 +08:00
李静 79aaa1bd79 小程序码环境 2022-03-30 14:01:45 +08:00
李静 567b23c043 Fix 2022-03-30 13:53:27 +08:00
李静 745ba98708 短信验证码登录 2022-03-30 11:35:17 +08:00
李静 b4dae3373b Update 2022-03-29 17:41:03 +08:00
李静 8f3d3929c9 小程序分享商品 2022-03-29 14:55:08 +08:00
李静 db092125da Fix 2022-03-28 14:17:43 +08:00
李静 9b28685e35 WIP 2022-03-28 11:04:05 +08:00
李静 b9c86da3f9 WIP 2022-03-28 11:02:56 +08:00
李静 6b7e59147a Fix 2022-03-28 10:59:48 +08:00
李静 e298e35fc2 Fix 2022-03-28 10:49:48 +08:00
李静 c8da24009e 签约经销商的渠道补贴自动结算 2022-03-28 10:44:09 +08:00
李静 a08bdab76c 管理津贴订单增加下单人信息 2022-03-28 09:51:27 +08:00
李静 161478fdca 进货业绩每月20号结算 2022-03-25 15:20:44 +08:00
李静 b2ef9cbc3f 进货补贴 2022-03-25 14:35:15 +08:00
李静 94fbe33635 Update 2022-03-25 12:49:29 +08:00
李静 4082740b1c Fix 2022-03-25 09:29:25 +08:00
vine_liutk c0d65f6efb 调整活动领取 2022-03-24 14:15:34 +08:00
vine_liutk 7240f87688 调整订单发货bug 2022-03-24 13:43:59 +08:00
李静 968050e108 Update 2022-03-24 10:35:50 +08:00
vine_liutk 29ad8a666a 调整提示 2022-03-24 10:32:50 +08:00
李静 0a8b3aef08 Fix 2022-03-24 10:05:38 +08:00
vine_liutk 6d33bb6411 修正删除运费模板报错 2022-03-23 16:05:53 +08:00
vine_liutk c71133cec4 调整赠品发起换货 2022-03-23 15:45:56 +08:00
vine_liutk 214fa33aaf 调整换货补货调整数量，导致金额对不上 2022-03-23 15:25:26 +08:00
vine_liutk 7ac3de3449 调整售后修改数量 2022-03-23 15:01:23 +08:00
vine_liutk 391e4082a6 添加后台验证售后调整数量 2022-03-23 14:51:20 +08:00
vine_liutk c1038c1e59 添加售后可修改售后商品数量，并屏蔽分区配置券，商品配置赠品 2022-03-23 14:45:01 +08:00
李静 c69334f8d2 Fix 2022-03-23 13:57:57 +08:00