2841 Commits

Author SHA1 Message Date
mkm
7d2cc1e70f 更新 2024-03-14 17:24:36 +08:00
weipengfei
93a5b40cf8 更新h5-微信公众号自动授权 2024-03-14 17:24:36 +08:00
weipengfei
979f9c3871 更新h5-微信公众号自动授权 2024-03-14 17:24:36 +08:00
liu
6a12146f91 上传付款凭证 2024-03-14 17:24:36 +08:00
d62ab0fa87 调整授权登录 2024-03-14 17:24:36 +08:00
25fc0e598a 修改用户合并 2024-03-13 12:03:19 +08:00
6f6d1d7eae 修改用户合并 2024-03-13 12:03:19 +08:00
fdb7c4177a 修改用户合并 2024-03-13 12:03:19 +08:00
0e38d08ad3 修改用户合并 2024-03-13 12:03:19 +08:00
mkm
e42f5716f3 h5 2024-03-13 12:03:19 +08:00
f8530d9a28 修改用户合并 2024-03-13 12:03:19 +08:00
67e0e7b455 修改邀请记录 2024-03-13 12:03:19 +08:00
cbea0aa270 调整邀请注册 2024-03-13 12:03:19 +08:00
30242b1e96 调整订单数量查询,处理商户销售金额的错误 2024-03-13 12:03:19 +08:00
828e228ab6 调整退款的错误 2024-03-13 12:03:19 +08:00
222416cb08 调整订单推广人查询 2024-03-13 12:03:19 +08:00
liu
d826c9777a 商品导出excel 2024-03-13 12:03:19 +08:00
358906854c 调整确认收货 2024-03-13 12:03:19 +08:00
c044855072 添加路由 2024-03-13 12:02:55 +08:00
mkm
89d988cc60 更新 2024-03-13 12:02:55 +08:00
cf98018c6c 修改商户订单列表查询 2024-03-13 12:02:55 +08:00
liu
16e01495e4 超管后台排序修改 2024-03-13 12:02:55 +08:00
671230708f 订单退款,减少商户销售金额和采购金额 2024-03-13 12:02:55 +08:00
lihai
d7189ebf85 Merge pull request '修改微信授权登录' (#175) from fix_bug into master
Reviewed-on: #175
2024-03-12 09:16:37 +08:00
9e79bcab01 修改微信授权登录 2024-03-12 09:12:59 +08:00
mkm
8bc29a1dfa Merge pull request '修改用户信息返回' (#174) from dev into master
Reviewed-on: #174
2024-03-11 11:38:28 +08:00
3971af747a 修改用户信息返回 2024-03-11 11:37:37 +08:00
mkm
0b8010872f Merge pull request 'dev' (#173) from dev into master
Reviewed-on: #173
2024-03-11 11:03:20 +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
mkm
68fac0d248 Merge pull request 'dev' (#172) from dev into master
Reviewed-on: #172
2024-03-11 10:24:17 +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
lihai
8e59dc334c Merge pull request 'dev' (#171) from dev into master
Reviewed-on: #171
2024-03-09 18:00:52 +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