1560 Commits

Author SHA1 Message Date
mkm
04bf34d363 feat: 优化了订单保证金处理逻辑 2024-07-09 17:26:38 +08:00
mkm
426f9ed76c feat: 调整平台和门店的抽成比例 2024-07-09 17:09:58 +08:00
mkm
21b36295d9 feat: 新增用户运费和优惠活动判断逻辑 2024-07-09 17:04:53 +08:00
mkm
a8fa7dd540 feat(OrderLogic): 根据用户等级更新订单价格逻辑 2024-07-09 16:25:38 +08:00
mkm
44e90e03da Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-07-09 16:22:58 +08:00
mkm
f2c4813809 1 2024-07-09 16:22:47 +08:00
liu
44e9478590 收银台预约单子 2024-07-09 16:17:01 +08:00
mkm
c73f829e26 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-07-09 16:09:51 +08:00
mkm
6888c4d929 feat: 修改了CommissionLogic类中的代码,优化了损耗计算和用户余额收入记录的逻辑。 2024-07-09 16:09:46 +08:00
liu
a8214a952b 预约记录 2024-07-09 15:55:43 +08:00
mkm
06ff803ea5 1 2024-07-09 15:20:05 +08:00
mkm
5835271186 feat: 增加根据用户ID判断购物车商品是否参与活动的功能 2024-07-09 15:15:51 +08:00
mkm
02d488c296 feat(ProductLists.php): 添加用户ID获取方式 2024-07-09 14:17:49 +08:00
mkm
150812e936 feat: 新增默认地址查询功能 2024-07-09 10:14:59 +08:00
mkm
654601013c feat(CommissionLogic): 更新CommissionLogic类中用户等级参数 2024-07-09 10:04:43 +08:00
mkm
01915bbaaa feat: 修改CommissionLogic类以优化财务逻辑 2024-07-08 17:55:27 +08:00
mkm
f6c8b7865e feat: 修改购物车商品查询逻辑和订单逻辑,根据用户身份调整商品价格计算方式,并更新相关文档 2024-07-08 17:24:50 +08:00
liu
74c0456f1a 商品规格 2024-07-08 16:09:03 +08:00
liu
820869016c 用户冻结券详情 2024-07-08 15:47:07 +08:00
mkm
07ffabfa52 feat: 移除StoreFinanceFlowLists中的冗余代码 2024-07-08 15:18:56 +08:00
liu
4035333cd4 修改后台的展示 2024-07-08 15:15:15 +08:00
liu
cbdf2c2431 核销修改对应的商品统计记录 2024-07-08 10:45:40 +08:00
liu
c324d025d5 列表厨师判断 2024-07-08 10:36:26 +08:00
mkm
943ac77f6f Merge pull request 'dev' (#34) from dev into main
Reviewed-on: #34
2024-07-06 18:36:35 +08:00
liu
54f5653085 判断 2024-07-06 18:34:10 +08:00
liu
1d57453383 修改充值 2024-07-06 18:25:16 +08:00
liu
89426af815 修改 2024-07-06 18:01:38 +08:00
mkm
f2cc9f7f9f feat(UserLists.php): 更新用户列表查询逻辑 2024-07-06 17:48:51 +08:00
mkm
f81989efc2 feat(UserLists.php): 更新用户列表功能 2024-07-06 17:48:42 +08:00
mkm
1ee0e2b7c2 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-07-06 17:32:56 +08:00
mkm
1bc854cdad feat: 修改StoreController实现条码支付功能 2024-07-06 17:32:51 +08:00
liu
9cc0ce8971 修改标识 2024-07-06 17:31:43 +08:00
liu
c49e91001c 回调调试 2024-07-06 17:28:58 +08:00
liu
b66e01c585 设置支付标识 2024-07-06 17:26:26 +08:00
liu
8312b5755a 兼容充值逻辑首次不支付 2024-07-06 16:53:59 +08:00
mkm
53199c8aa6 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-07-06 16:43:25 +08:00
mkm
9cf4e962bc feat(statistics): 修改销售排名接口逻辑 2024-07-06 16:43:12 +08:00
liu
562567cf07 待返回金额 2024-07-06 16:14:01 +08:00
liu
a6460ecaf0 校验地址逻辑 2024-07-06 16:01:39 +08:00
liu
b72952ce22 修改文字 2024-07-06 15:49:50 +08:00
liu
65a7e2da84 修改充值限制 显示 2024-07-06 15:45:17 +08:00
liu
a19656bbca 修改充值限制 2024-07-06 15:43:42 +08:00
liu
e77be2e3c3 修改种养殖下单不加分润 2024-07-06 14:36:54 +08:00
liu
609f981c9f 首次充值写入店铺数据 2024-07-06 11:53:41 +08:00
mkm
0e91c0cc98 Merge pull request 'dev' (#33) from dev into main
Reviewed-on: #33
2024-07-06 10:08:14 +08:00
liu
9f36a0e968 临时处理活动前端关闭 2024-07-06 10:03:18 +08:00
liu
5f268a60f5 修改 2024-07-06 10:00:40 +08:00
mkm
6df05f4139 Merge pull request '修改默认值' (#32) from dev into main
Reviewed-on: #32
2024-07-06 09:52:05 +08:00
liu
47d0ab5582 修改默认值 2024-07-06 09:50:19 +08:00
mkm
c8d8724b03 Merge pull request 'dev' (#31) from dev into main
Reviewed-on: #31
2024-07-05 19:22:48 +08:00