2809 Commits

Author SHA1 Message Date
be1b95d6d6 调整退款的错误 2024-03-12 11:38:05 +08:00
5f7648ccdc 调整订单推广人查询 2024-03-12 10:10:56 +08:00
c13dbd0145 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-12 09:56:32 +08:00
a0bf3b3432 调整确认收货 2024-03-12 09:56:20 +08:00
liu
53f2fbf9ae 商品导出excel 2024-03-12 09:50:33 +08:00
104872a239 调整授权登录 2024-03-12 09:09:22 +08:00
62bde50dfb 添加路由 2024-03-12 09:08:58 +08:00
mkm
208e8e8525 更新 2024-03-11 16:46:40 +08:00
047e174a2f 修改商户订单列表查询 2024-03-11 15:29:49 +08:00
cc8d29f821 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-11 14:33:53 +08:00
9abcf8d92a 订单退款,减少商户销售金额和采购金额 2024-03-11 14:33:47 +08:00
liu
0308cfc9ec 超管后台排序修改 2024-03-11 11:56:34 +08:00
5e1642fb2e 修改用户信息返回 2024-03-11 11:48:22 +08:00
3971af747a 修改用户信息返回 2024-03-11 11:37:37 +08:00
99f136d5b1 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-11 10:58:44 +08:00
fa03d63243 修改商户端订单实付金额展示 2024-03-11 10:58:27 +08:00
liu
4a5caa8af3 Merge remote-tracking branch 'origin/dev' into dev 2024-03-11 10:57:02 +08:00
liu
f7f1d7c388 修复后台excel导出问题 2024-03-11 10:56:35 +08:00
9b066cdfb3 修改商户端订单实付金额展示 2024-03-11 10:55:40 +08:00
db8e9eb6b3 修改用户信息返回 2024-03-11 10:45:28 +08:00
2c06abadf4 添加红包使用记录 2024-03-11 10:32:38 +08:00
528635aeb7 商户余额支付,冻结订单金额 2024-03-11 10:09:36 +08:00
liu
16fead435b 修改查询条件 2024-03-11 09:19:39 +08:00
liu
d614cfc42a 修改优化查询 2024-03-09 18:31:13 +08:00
liu
a007894fa6 优化查询 2024-03-09 18:28:50 +08:00
liu
f8a4f0f71e 优化查询 2024-03-09 18:21:27 +08:00
liu
1bb6aff8b0 Merge remote-tracking branch 'origin/dev' into dev 2024-03-09 17:53:11 +08:00
liu
657849f2cf 添加更新时间 2024-03-09 17:52:56 +08:00
dd5bfd7f11 修改商户冻结金额解冻时间 2024-03-09 17:51:51 +08:00
ca00b1ab27 调整商户押金记录 2024-03-09 16:50:09 +08:00
fc78d3af34 调试微信授权登录 2024-03-09 16:47:06 +08:00
2b56e360df Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-09 16:39:49 +08:00
879e56c3a5 调试微信授权登录 2024-03-09 16:39:38 +08:00
liu
2cc737cd20 Merge remote-tracking branch 'origin/dev' into dev 2024-03-09 16:34:27 +08:00
liu
4fe3f45e7a 添加账单商家信息 2024-03-09 16:34:12 +08:00
60221e78e4 修改邀请记录 采购金额和销售金额的错误 2024-03-09 16:33:35 +08:00
dfa7e6e2c9 调试微信授权登录 2024-03-09 16:27:36 +08:00
14168f2fd8 调试微信授权登录 2024-03-09 16:26:49 +08:00
b1ccf3123d Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-09 16:20:50 +08:00
e687dd5709 处理邀请记录的错误 2024-03-09 16:20:45 +08:00
liu
c23c28724a Merge remote-tracking branch 'origin/dev' into dev 2024-03-09 16:05:35 +08:00
liu
c4c62d64cb 账单管理日账单查询修改 2024-03-09 16:05:20 +08:00
f10071a579 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-09 14:24:20 +08:00
1ef145cb81 修改用户信息返回 2024-03-09 14:24:16 +08:00
liu
5e33bfa9a4 Merge remote-tracking branch 'origin/dev' into dev 2024-03-09 11:50:42 +08:00
liu
ea7a01ecf4 减少查询总数排序 2024-03-09 11:50:23 +08:00
6679124abf 处理推广佣金发放的错误 2024-03-09 11:12:03 +08:00
48ae67064f Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-09 10:44:05 +08:00
cef1d65804 修改APP微信授权登录 2024-03-09 10:43:42 +08:00
liu
847b30637b Merge remote-tracking branch 'origin/dev' into dev 2024-03-09 10:03:00 +08:00