777 Commits

Author	SHA1	Message	Date
luofei	fd161f381d	修改商户冻结金转账时间	2024-03-16 11:45:21 +08:00
luofei	d5fdcd2262	调整订单数量查询，处理商户销售金额的错误	2024-03-12 14:06:54 +08:00
luofei	be1b95d6d6	调整退款的错误	2024-03-12 11:38:05 +08:00
luofei	c13dbd0145	Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev	2024-03-12 09:56:32 +08:00
luofei	a0bf3b3432	调整确认收货	2024-03-12 09:56:20 +08:00
liu	53f2fbf9ae	商品导出excel	2024-03-12 09:50:33 +08:00
luofei	9abcf8d92a	订单退款，减少商户销售金额和采购金额	2024-03-11 14:33:47 +08:00
luofei	528635aeb7	商户余额支付，冻结订单金额	2024-03-11 10:09:36 +08:00
liu	657849f2cf	添加更新时间	2024-03-09 17:52:56 +08:00
liu	4fe3f45e7a	添加账单商家信息	2024-03-09 16:34:12 +08:00
liu	c4c62d64cb	账单管理日账单查询修改	2024-03-09 16:05:20 +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
luofei	6679124abf	处理推广佣金发放的错误	2024-03-09 11:12:03 +08:00
liu	847b30637b	Merge remote-tracking branch 'origin/dev' into dev	2024-03-09 10:03:00 +08:00
liu	acd937ab81	更改展示信息	2024-03-09 10:02:35 +08:00
luofei	7048613cd1	处理推广佣金发放的错误	2024-03-09 09:39:52 +08:00
luofei	6b759c4be4	处理推广佣金到账的错误	2024-03-08 16:09:29 +08:00
luofei	d865bf4fdb	店铺申请同步店铺资质	2024-03-07 16:10:05 +08:00
luofei	b7cad3cee8	店铺申请同步店铺资质	2024-03-07 16:00:57 +08:00
luofei	92ed3cef19	处理转账订单的错误	2024-03-07 15:15:37 +08:00
luofei	1c6517ee20	修改转账订单	2024-03-07 14:54:08 +08:00
luofei	5396dde520	修改商户交易申请审核	2024-03-07 14:34:04 +08:00
luofei	614c2bd4bf	修改商户交易信息保存	2024-03-07 11:58:55 +08:00
luofei	b1da50e180	修改店铺押金计算的错误	2024-03-07 11:50:19 +08:00
luofei	e833b21b46	订单支持商户余额支付	2024-03-07 10:44:25 +08:00
luofei	535177563a	修改用户订单数量统计	2024-03-06 10:52:19 +08:00
luofei	273815b728	购物卡不计入采购金额，修改增收补贴	2024-03-05 17:37:23 +08:00
luofei	6999d00e07	处理订单自动发货的错误	2024-03-04 17:28:48 +08:00
luofei	8b6f0d7c04	修改商户手续费	2024-03-04 15:52:46 +08:00
luofei	65a156fbff	修改商户入驻申请	2024-03-04 14:31:35 +08:00
luofei	3d08875baa	修改订单流水的错误	2024-03-04 13:42:36 +08:00
luofei	c5d18019d7	修改商户账单的错误	2024-03-02 18:11:00 +08:00
luofei	3f48a6e43a	处理线下支付的错误	2024-03-02 18:02:19 +08:00
luofei	fbc0a5f841	修改订单财务流水的错误	2024-03-02 16:49:50 +08:00
luofei	52c6e4ca5d	修改订单财务流水的错误	2024-03-02 16:48:43 +08:00
luofei	5e31108d99	修改商户销售金额和采购金额的错误	2024-03-02 15:32:54 +08:00
luofei	109a1b1dd2	调整线下扫码支付	2024-03-02 15:29:47 +08:00
luofei	014cd84106	更新h5页面，修改订单金额的错误	2024-03-02 15:14:32 +08:00
luofei	3356f40744	修改用户订单列表查询，添加订单资金流水	2024-03-02 14:13:34 +08:00
luofei	40cc91a7ac	修改商户入驻申请	2024-03-02 10:13:36 +08:00
luofei	cdfca47d9e	商品标签添加字段	2024-03-01 15:36:41 +08:00
mkm	738cca59bc	更新	2024-03-01 15:06:05 +08:00
luofei	37bd5326b6	修改商户列表数据返回	2024-03-01 14:42:23 +08:00
lewis	87d120e32c	修改商户交易申请	2024-03-01 11:49:13 +08:00
lewis	53856b1c4a	线下扫码支付同步采购金额和销售金额	2024-02-29 21:53:16 +08:00
lewis	58a03e755e	调整线下扫码支付	2024-02-29 21:09:37 +08:00
lewis	735db0e46d	调整种养殖户入驻	2024-02-29 20:21:40 +08:00
lewis	1ddb5b2f02	调整补贴使用限制	2024-02-29 19:59:42 +08:00
luofei	ba6c337fe2	补贴仅限官方店铺使用	2024-02-29 17:52:40 +08:00