Commit Graph

Select branches

Hide Pull Requests

dev

master

#1

Mono Color

• 7942b7067d 更新 dev mkm 2024-03-23 20:00:13 +08:00
• 7403ef49d4 更新查询数据 codeliu 2024-03-23 14:45:38 +08:00
• c2921e165d 更新查询数据 codeliu 2024-03-23 14:30:12 +08:00
• c4b821d3ea 更新逻辑 codeliu 2024-03-23 14:25:46 +08:00
• e29afd5c50 增加操作人员信息 codeliu 2024-03-23 14:16:58 +08:00
• 2f084ec602 增加后台操作人员信息 codeliu 2024-03-23 13:52:22 +08:00
• 8081b7aaad 线下扫码付款直接待评价 codeliu 2024-03-23 12:26:30 +08:00
• 74cbfef69e 修改逻辑 codeliu 2024-03-23 11:48:03 +08:00
• 953210ea9f 数据不对 codeliu 2024-03-23 11:28:25 +08:00
• 428ee0f429 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev luofei 2024-03-23 11:04:37 +08:00
• 454ede18f8 修改店铺券使用 luofei 2024-03-23 11:04:24 +08:00
• f59249a6ba 处理价格不在区间范围内但是又有设置的商品匹配返回 codeliu 2024-03-23 10:54:53 +08:00
• aac0774b9c 修改店铺券使用 luofei 2024-03-23 10:49:08 +08:00
• 1b6b2709a1 修改优惠券使用比例 luofei 2024-03-23 09:42:50 +08:00
• c0f71cf4a6 修改商户更替身份的店铺类型 codeliu 2024-03-23 09:22:18 +08:00
• 08c790fd18 Merge remote-tracking branch 'origin/dev' into dev codeliu 2024-03-22 17:53:47 +08:00
• bb1ac57e0c 扫码支付设置默认 codeliu 2024-03-22 17:53:17 +08:00
• 677251b0f8 修改优惠券使用 luofei 2024-03-22 17:53:02 +08:00
• 09b800960e Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev luofei 2024-03-22 17:44:29 +08:00
• 738880dff1 调整补贴发放 luofei 2024-03-22 17:44:08 +08:00
• faafdde06f 打开限制 codeliu 2024-03-22 17:37:02 +08:00
• ce84c4c8aa 修改扫码商户下单限制 codeliu 2024-03-22 17:00:49 +08:00
• e371179faf 修改增收补贴列表 luofei 2024-03-22 16:57:42 +08:00
• cdbf8cc0c9 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev luofei 2024-03-22 16:28:06 +08:00
• e55321b5f8 修改推荐商品列表 luofei 2024-03-22 16:28:01 +08:00
• 76dab72a8e 扫码提货限制购物车会有检测限制 codeliu 2024-03-22 16:22:59 +08:00
• 1e37ca795d 修改支付下单主订单 codeliu 2024-03-22 15:50:41 +08:00
• 4c279f2153 修改增收补贴发放的错误 luofei 2024-03-22 15:38:39 +08:00
• 50fe835c74 修改增收补贴发放的错误 luofei 2024-03-22 15:36:51 +08:00
• 2338f133a1 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev luofei 2024-03-22 15:20:54 +08:00
• 157044ae9f 调整密码校验 luofei 2024-03-22 15:20:28 +08:00
• 75ee72e389 Merge remote-tracking branch 'origin/dev' into dev codeliu 2024-03-22 15:18:22 +08:00
• 2fadf3f8e0 修改支付下单金额逻辑 codeliu 2024-03-22 15:18:04 +08:00
• 69ef10109f 更新 mkm 2024-03-22 15:17:12 +08:00
• d1896638d5 修改增收补贴发放的错误 luofei 2024-03-22 15:04:28 +08:00
• 6874dab755 修改增收补贴发放的错误 luofei 2024-03-22 14:52:26 +08:00
• cf1a38ea0f Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev luofei 2024-03-22 12:08:35 +08:00
• 4282a50d18 修改订单统计 luofei 2024-03-22 12:04:56 +08:00
• 19087229e4 修改返回格式 liu 2024-03-22 11:59:48 +08:00
• 618f9c3831 用户佣金 liu 2024-03-22 11:09:43 +08:00
• 46141c5d41 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev luofei 2024-03-22 11:02:43 +08:00
• 339cade7cc 调整支付校验 luofei 2024-03-22 11:02:08 +08:00
• b3e2bfc0a9 商户冻结资金列表和提前解冻 liu 2024-03-22 10:27:11 +08:00
• 454eca8c1d 修改优惠券详情的错误 luofei 2024-03-22 10:02:58 +08:00
• ba61566ae8 修改商品匹配的错误 luofei 2024-03-22 09:40:18 +08:00
• e25473971a 修改商品匹配的错误 luofei 2024-03-21 17:40:03 +08:00
• f9caf19c5e Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev luofei 2024-03-21 17:24:17 +08:00
• 49fa0bcd76 修改补贴金额的错误 luofei 2024-03-21 17:24:00 +08:00
• 644e7d520c 对公转账二次支付 liu 2024-03-21 17:20:15 +08:00
• de9a758c22 调整补贴列表 luofei 2024-03-21 16:46:57 +08:00
• c2d6ece975 调整补贴列表 luofei 2024-03-21 16:37:43 +08:00
• 541990a1b2 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev luofei 2024-03-21 16:19:26 +08:00
• 8e72121a32 调整补贴列表 luofei 2024-03-21 16:19:21 +08:00
• aed6a946a3 参数接受修改 liu 2024-03-21 15:52:46 +08:00
• b3408a8ff5 处理代码缺失 liu 2024-03-21 15:46:46 +08:00
• 473314def9 整合商户信息 liu 2024-03-21 14:40:59 +08:00
• 6674cd6b28 审核人员默认头像 liu 2024-03-21 13:42:48 +08:00
• 2b732fb5f4 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev luofei 2024-03-21 11:53:44 +08:00
• 60f335f44c 修改后台订单统计 luofei 2024-03-21 11:53:39 +08:00
• 19b1cde138 返回商户头像,只有审核通过更改 liu 2024-03-21 11:48:27 +08:00
• de32a8dc0e 修改状态 liu 2024-03-21 11:31:16 +08:00
• db53121924 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev luofei 2024-03-21 11:29:54 +08:00
• 76a8afe6cd 添加校验支付密码 luofei 2024-03-21 11:29:49 +08:00
• 7a86d42aa5 审核后直接显示并且上架 liu 2024-03-21 11:27:33 +08:00
• dc7c90d466 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev liu 2024-03-21 10:58:07 +08:00
• 1a75f8fec9 后台审核更新商户 liu 2024-03-21 10:57:50 +08:00
• f7dcde9937 添加优惠券拒绝领取 luofei 2024-03-21 10:34:04 +08:00
• ca07bd58a8 暂时关闭支付密码校验 luofei 2024-03-21 10:28:34 +08:00
• ff2d4582b2 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev luofei 2024-03-21 10:23:49 +08:00
• 4064e7e9fe 修改支付密码校验 luofei 2024-03-21 10:23:36 +08:00
• c415e94f88 审核列表接口和后台申请限制 liu 2024-03-21 10:21:45 +08:00
• 6748227b4f Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev luofei 2024-03-21 10:04:08 +08:00
• 2aa0325af7 调整补贴列表 luofei 2024-03-21 10:04:03 +08:00
• 9d4e91bf72 更新 mkm 2024-03-21 09:50:25 +08:00
• 1dd46946f5 修改订单数量统计 luofei 2024-03-21 09:40:38 +08:00
• 00b31013a1 添加支付密码校验 luofei 2024-03-20 17:38:27 +08:00
• d404fc4ed2 修改补贴发放 luofei 2024-03-20 17:02:15 +08:00
• c2d875b6b7 修改补贴金额展示的错误 luofei 2024-03-20 16:51:00 +08:00
• c518d87b39 修改补贴金额的错误 luofei 2024-03-20 16:38:50 +08:00
• 5af33cdc7d 修改订单数量统计的错误 luofei 2024-03-20 16:19:30 +08:00
• 15131252f1 修改商户入驻申请审核 luofei 2024-03-20 16:03:17 +08:00
• d7663328ac 调整订单默认配送方式 luofei 2024-03-20 15:48:17 +08:00
• 55968578cf 修改扫码商品获取 luofei 2024-03-20 15:33:47 +08:00
• e51561a7cb Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev luofei 2024-03-20 15:29:52 +08:00
• 373cd3a5dc 修改扫码商品获取 luofei 2024-03-20 15:29:48 +08:00
• 8310d742c7 更新 mkm 2024-03-20 13:34:06 +08:00
• db870ba53e 更新申请接口 liu 2024-03-20 12:08:32 +08:00
• 230847a59b 更新申请接口 liu 2024-03-20 11:57:33 +08:00
• 7675060d60 详情更改 liu 2024-03-20 11:40:42 +08:00
• 7bffc57f20 修改上传类型更改 liu 2024-03-20 11:35:36 +08:00
• 160eb5fbc2 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev luofei 2024-03-20 11:05:58 +08:00
• d5a81d6ba4 修改补贴列表 luofei 2024-03-20 11:05:47 +08:00
• 802faea110 修改上传类型判断 liu 2024-03-20 11:04:35 +08:00
• 2c07c80bcc 修改待付款订单 luofei 2024-03-20 10:33:43 +08:00
• 181b999350 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev luofei 2024-03-20 10:23:02 +08:00
• fc5885494b 扫码支付不扣库存 luofei 2024-03-20 10:22:33 +08:00
• 88d4efc723 增加财务上传成功修改 liu 2024-03-20 09:58:59 +08:00
• ad48d8aba6 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev luofei 2024-03-20 09:21:56 +08:00
• ce2c3817ba 修改财务流水保存的错误 luofei 2024-03-20 09:11:20 +08:00
• 0f35b7e76a 修改财务审批状态 liu 2024-03-20 08:58:27 +08:00