1087 Commits

Author SHA1 Message Date
mkm
a9091c03ea Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-07-01 11:04:20 +08:00
mkm
b63ae912bb feat: 添加订单推送功能异常处理 2024-07-01 11:04:08 +08:00
liu
229725c449 按照比例预设退兑换券和新增兑换券 2024-07-01 10:47:03 +08:00
liu
0838dba507 总后台限制查询 2024-07-01 10:00:49 +08:00
liu
6a87e58705 兼容店铺无商品得逻辑 2024-07-01 09:42:49 +08:00
mkm
00f71306b5 feat(UserShipLists): 增加用户等级限制功能 2024-07-01 09:41:04 +08:00
mkm
bc5a7d78f5 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-07-01 09:25:37 +08:00
mkm
a1504ba090 feat: 增加经纬度判断逻辑 2024-07-01 09:25:33 +08:00
liu
677eaf781d 修改回调逻辑 2024-07-01 09:23:37 +08:00
liu
fab1cb9b3b 修改创建订单自提校验得逻辑方式 2024-07-01 09:19:25 +08:00
mkm
f3f5fa705f Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-29 18:25:57 +08:00
mkm
4268069a16 feat(config): 修改服务器监听地址为环境变量HOST 2024-06-29 18:25:46 +08:00
liu
82a4fddcfe 处理小程序新增订单商品缺失新增到缺失列表 2024-06-29 18:04:21 +08:00
mkm
0fa71e2fe8 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-29 17:38:24 +08:00
mkm
e702f786fd feat(config): 更新服务器监听地址 2024-06-29 17:38:18 +08:00
liu
9d27d32f37 检验下单得创建逻辑 2024-06-29 17:31:24 +08:00
mkm
f3089c4277 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-29 17:17:01 +08:00
mkm
9ac84ac72f feat: 创建用户商品存储列表类UserProductStorageLists 2024-06-29 17:16:56 +08:00
liu
fb7a7fe68f 修改参数 2024-06-29 16:52:03 +08:00
liu
a4b07bc878 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-29 16:50:50 +08:00
liu
04e8f6eccc 创建订单显示最近店铺 2024-06-29 16:50:24 +08:00
mkm
bf958fcf75 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-29 16:49:21 +08:00
mkm
2ae18e951c feat: 增加支付通知功能 2024-06-29 16:49:16 +08:00
liu
4177bf71ed 修改取值参数 2024-06-29 16:36:59 +08:00
liu
1761d038b4 订单商家展示 2024-06-29 16:19:45 +08:00
liu
01f0dab6de 预留余额支付兑换券逻辑 2024-06-29 16:13:34 +08:00
liu
b63052f604 回调日志处理 2024-06-29 16:10:04 +08:00
liu
ef7f100767 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-29 15:53:15 +08:00
liu
e813680170 修改取字段值 2024-06-29 15:53:04 +08:00
mkm
54bb838ab6 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-29 15:52:19 +08:00
mkm
e63582acec 修改兑换券逻辑和增加注释 2024-06-29 15:52:12 +08:00
liu
355b18900e 收银台现金支付直接加解冻礼品券 2024-06-29 15:41:23 +08:00
liu
18c660df09 删除多余调试 2024-06-29 15:32:38 +08:00
mkm
4d4772a035 移除VipLogic中的afterPay方法 2024-06-29 15:27:49 +08:00
mkm
594a31e93c Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-29 15:14:56 +08:00
mkm
8d73511117 增加员工ID到财务处理逻辑 2024-06-29 15:14:40 +08:00
liu
18134f3f37 注释 2024-06-29 15:11:54 +08:00
liu
1e1b176f7b Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-29 15:07:06 +08:00
liu
af4af0d1ed 购物车逻辑兼容 2024-06-29 15:06:41 +08:00
mkm
7064c67262 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-29 14:56:33 +08:00
mkm
a4fdbc5256 调整用户会员类型管理控制器 2024-06-29 14:56:22 +08:00
liu
f96538a4b4 调用修复 2024-06-29 14:55:46 +08:00
mkm
ab018ba12d Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-29 14:46:29 +08:00
mkm
ed983e0971 更新UserShip模型与相关控制器 2024-06-29 14:46:23 +08:00
liu
f7f60c47d9 注释验证码 2024-06-29 14:45:39 +08:00
liu
70920df001 会员下单不加兑换券 2024-06-29 14:40:20 +08:00
mkm
61f7ce9332 修改礼品券统计描述与逻辑 2024-06-29 14:14:01 +08:00
mkm
d4eef002fe 禁用商品退款金额统计 2024-06-29 14:00:55 +08:00
mkm
085ad190fc Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-29 13:52:52 +08:00
mkm
e975c3e28e 修改退款充值状态筛选逻辑 2024-06-29 13:52:42 +08:00