142 Commits

Author SHA1 Message Date
8f698e0bcd 修改订单列表查询 2024-03-15 16:59:12 +08:00
c5dc381a83 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-15 16:31:18 +08:00
f6d1a1046e 调整商品列表 2024-03-15 16:31:14 +08:00
liu
55f98ab3b9 Merge remote-tracking branch 'origin/dev' into dev 2024-03-15 15:34:21 +08:00
liu
180b4dd9a4 数量不对修复 2024-03-15 15:34:07 +08:00
e039e3b931 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-15 15:28:04 +08:00
34277ebd8d 修改订单统计查询 2024-03-15 15:27:52 +08:00
liu
bcef85522c Merge remote-tracking branch 'origin/dev' into dev 2024-03-15 15:27:14 +08:00
liu
45cfecee8f 线上调试 2024-03-15 15:26:59 +08:00
5b08a9618b Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-15 15:19:34 +08:00
3638a971f4 商品列表添加标签 2024-03-15 15:19:27 +08:00
liu
865762e767 商户 批发商户或批发零售商户提交申请 2024-03-15 15:10:36 +08:00
liu
10f2dbc871 商户 批发商户或批发零售商户列表 2024-03-15 14:37:32 +08:00
liu
f2a93affe3 Merge remote-tracking branch 'origin/dev' into dev 2024-03-15 14:03:55 +08:00
liu
0c664395bc 后台审核商户更新身份 2024-03-15 14:03:15 +08:00
fab06892d4 购物车添加查询字段 2024-03-15 13:39:15 +08:00
5198b95428 修改购物车查询 2024-03-15 11:52:27 +08:00
b1aea23f76 调整退款订单 2024-03-15 11:22:58 +08:00
92d4f7263a Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-15 11:15:37 +08:00
6bcdc0f09d 修改用户邀请记录 2024-03-15 11:15:27 +08:00
liu
4057040ce6 修改商户限制 2024-03-15 10:56:13 +08:00
liu
9bd328fee8 Merge remote-tracking branch 'origin/dev' into dev 2024-03-15 10:51:01 +08:00
liu
febf033cd8 商户信息获取 2024-03-15 10:50:43 +08:00
b72714fbd0 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-15 10:50:11 +08:00
3636e67937 迁移老商城代码 2024-03-15 10:50:06 +08:00
liu
4480f95d65 商户信息填写提交 2024-03-15 10:43:57 +08:00
liu
fce64220b9 输入金额和商家id获取商品列表 2024-03-15 09:54:21 +08:00
liuchaofu
46b4ae139d limit 2024-03-14 20:10:57 +08:00
7c743c780f 添加红包使用记录和获取记录 2024-03-14 17:47:35 +08:00
68eaa416bf 添加补贴获取记录 2024-03-14 16:43:23 +08:00
363df36c3d 添加商品分类查询 2024-03-14 15:03:41 +08:00
515338aa89 调整分类查询 2024-03-14 14:38:34 +08:00
87df9ceb37 调整分类查询 2024-03-14 14:37:47 +08:00
4a65e3b78a 调整订单退款和购物卡发货,添加商户余额支付 2024-03-14 14:10:01 +08:00
9ee6264db4 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-14 10:07:10 +08:00
7832a9fee7 修改名优特产查询 2024-03-14 10:07:05 +08:00
liu
a3b21b5bca 更新缺失代码 2024-03-14 09:49:12 +08:00
liu
5335d8341e 更新缺失代码 2024-03-14 09:30:09 +08:00
liu
f04f5b96ff Merge remote-tracking branch 'origin/dev' into dev 2024-03-14 09:27:37 +08:00
liu
ade720215d 更新缺失代码 2024-03-14 09:26:25 +08:00
188957a2a0 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-14 09:16:25 +08:00
d92c4d3804 修改商品列表 2024-03-14 09:16:10 +08:00
mkm
dcaa346295 更新pc 2024-03-13 18:01:24 +08:00
c9b46e3a81 调整商品列表搜索 2024-03-13 17:53:34 +08:00
649f6fbb8e 修改商户列表 2024-03-13 17:15:45 +08:00
56e0af48df 调整商品列表 2024-03-13 17:06:26 +08:00
2950b863a9 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-13 16:30:39 +08:00
6f6e11e296 区分批发和零售订单、购物车数据 2024-03-13 16:30:35 +08:00
liu
9d222a8c87 处理精度溢出 2024-03-13 16:24:31 +08:00
liu
337f3f4bf8 处理传如时间的时间判断 2024-03-13 15:55:31 +08:00