447 Commits

Author SHA1 Message Date
mkm
e9c25fd1de feat: 调整用户签到逻辑以优化首充和礼品券的冻结处理 2024-07-02 14:51:39 +08:00
mkm
0b3fc8a7b6 feat: 修改用户签到逻辑和支付通知逻辑 2024-07-02 14:30:20 +08:00
mkm
83fce9e9dd feat: 移除支付类型为3时的兑换券逻辑 2024-07-02 11:31:52 +08:00
mkm
4b849edc76 feat(UserController): 更新用户签到逻辑,修复积分计算错误 2024-07-02 11:02:00 +08:00
mkm
f1f609563a feat: 新增采购款支付功能 2024-07-01 16:33:14 +08:00
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
677eaf781d 修改回调逻辑 2024-07-01 09:23:37 +08:00
liu
82a4fddcfe 处理小程序新增订单商品缺失新增到缺失列表 2024-06-29 18:04:21 +08:00
mkm
e702f786fd feat(config): 更新服务器监听地址 2024-06-29 17:38:18 +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
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
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
70920df001 会员下单不加兑换券 2024-06-29 14:40:20 +08:00
liu
b679ffa226 整合回调扣对应得礼品券已经加记录日志 2024-06-29 11:59:27 +08:00
liu
f8b3d20c49 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-29 11:43:45 +08:00
liu
cd952ac019 冻结和解冻礼品券逻辑修改和新增 2024-06-29 11:43:40 +08:00
mkm
26f47a0a43 修正损耗注释,删除BackController 2024-06-29 11:41:26 +08:00
mkm
090955158f 优化分润逻辑与财务流水处理 2024-06-29 10:19:08 +08:00
liu
1096901067 修改回调 2024-06-28 19:08:52 +08:00
mkm
aeff0c9d54 feat: 更新了商店财务流水状态更新逻辑 2024-06-28 18:52:55 +08:00
mkm
fa31930be6 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 18:45:59 +08:00
mkm
cdeeaaf717 feat: 更新库存逻辑核销后状态 2024-06-28 18:45:55 +08:00
liu
1acc001559 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 18:42:41 +08:00
liu
944480df4c 日志记录 2024-06-28 18:42:29 +08:00
mkm
28f434f0d7 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 18:38:19 +08:00
mkm
51df5a3a94 feat: 修改了订单核销逻辑和支付通知逻辑 2024-06-28 18:38:14 +08:00
liu
bc7cdeed63 新增采购款退款 2024-06-28 18:32:18 +08:00
mkm
52e63cb05d feat: 添加支付通知逻辑并优化订单处理 2024-06-28 18:04:15 +08:00
mkm
ea8ed066e4 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 16:59:56 +08:00
mkm
c0f64c83fc feat(pay-notify-logic): 修改支付通知逻辑,优化代码结构,提高可读性和可维护性。 2024-06-28 16:58:57 +08:00
liu
d46d6139a0 新增采购款下单不反兑换券 2024-06-28 16:49:53 +08:00
mkm
02cad62671 feat: 增加根据用户昵称或真实姓名搜索用户的功能,只显示正常状态的库存记录 2024-06-28 15:49:39 +08:00
mkm
776ee99b54 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2024-06-28 15:03:19 +08:00
mkm
30cbd5eafe feat: 更新了用户商品存储逻辑和支付通知逻辑 2024-06-28 15:03:14 +08:00
liu
44c1bb40fd 修改充值退款退礼品券的逻辑 2024-06-28 14:43:40 +08:00