|
e210bb7906
|
feat(WorkbenchController): 修改本月订单数和本月支付人数的统计方式
|
2024-06-18 18:14:25 +08:00 |
|
|
325014ee99
|
feat(user): 添加用户标签功能
|
2024-06-18 15:01:36 +08:00 |
|
liu
|
79e89fa22d
|
修改报错和查询用户余额支付
|
2024-06-18 12:10:21 +08:00 |
|
liu
|
b67259a91e
|
更新修改用户余额支付日志流水记录逻辑修改
|
2024-06-18 11:49:53 +08:00 |
|
|
84d056bfaf
|
feat: 修改支付通知逻辑以增加积分
|
2024-06-18 11:45:09 +08:00 |
|
|
be035be2f5
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-18 11:29:18 +08:00 |
|
|
4b686647c4
|
feat(StoreOrderController): 添加采购款支付处理逻辑
|
2024-06-18 11:29:08 +08:00 |
|
liu
|
c9750921f1
|
修改查询统计字段
|
2024-06-18 11:16:48 +08:00 |
|
liu
|
a546ddd353
|
修改店铺盈收统计相关的数据和收银台下单后默认为成功
|
2024-06-18 10:47:26 +08:00 |
|
|
b5b364a3d1
|
feat: 修改PayNotifyLogic类以正确计算用户利润
|
2024-06-18 10:46:18 +08:00 |
|
|
ac9eb17056
|
feat(store_order): 根据支付类型和用户ID创建订单
|
2024-06-18 10:44:00 +08:00 |
|
|
7cf5379755
|
feat: 新增采购款收银支付方式
|
2024-06-18 10:18:01 +08:00 |
|
|
1c6cb9b1a5
|
refactor(PayNotifyLogic): 移除支付类型为9的订单处理逻辑
|
2024-06-18 10:16:02 +08:00 |
|
|
17504629c2
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-18 10:12:40 +08:00 |
|
|
a08d9ff067
|
feat: 修改用户和订单相关逻辑
|
2024-06-18 10:12:36 +08:00 |
|
liu
|
fe86e652ce
|
店铺端时间查询数据逻辑修改
|
2024-06-18 10:06:41 +08:00 |
|
|
5768afd77a
|
feat: 修改PayNotifyLogic以增加用户积分
|
2024-06-18 09:56:32 +08:00 |
|
|
92c20a1570
|
feat: 添加订单ID到支付通知逻辑
|
2024-06-18 09:53:59 +08:00 |
|
liu
|
7d622b150e
|
更新参数获取
|
2024-06-18 09:47:03 +08:00 |
|
liu
|
5091d0a6bb
|
收银机同步小程序采购款支付vip逻辑
|
2024-06-18 09:44:13 +08:00 |
|
|
c8d20b33d6
|
feat(user): 修改用户编辑逻辑,优化支付通知逻辑
|
2024-06-18 09:37:01 +08:00 |
|
|
9841e1886a
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-18 09:21:21 +08:00 |
|
|
4292c80301
|
feat: 修改支付通知逻辑以增加新的用户签到功能
|
2024-06-18 09:21:17 +08:00 |
|
liuchaofu
|
e5336610ea
|
vip等级为1时加入冻结金额逻辑
|
2024-06-17 21:33:42 +08:00 |
|
|
d43d26163f
|
feat(process): 添加任务处理功能
|
2024-06-17 20:08:38 +08:00 |
|
|
4c1a07e598
|
feat(IndexController): 更新IndexController以支持新的API配置
|
2024-06-17 19:51:13 +08:00 |
|
|
ba9ce8fdf1
|
feat: 增加积分奖励 village_uid 和 brigade_uid
|
2024-06-17 19:46:37 +08:00 |
|
|
6b2be63031
|
feat: 添加 config 接口和更新支付通知逻辑
|
2024-06-17 19:45:17 +08:00 |
|
|
f050252966
|
feat: 修改了库存发送类,增加了参数1到存储方法中
|
2024-06-17 19:02:13 +08:00 |
|
|
30a6a404c6
|
feat: 修改产品库存创建方法
|
2024-06-17 18:17:19 +08:00 |
|
|
029df0e33d
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-17 18:12:36 +08:00 |
|
|
7d84388fc9
|
feat: 添加查询类型字段
|
2024-06-17 18:12:26 +08:00 |
|
liu
|
d1e1c67978
|
商户创建订单时的用户id
|
2024-06-17 18:11:18 +08:00 |
|
|
8d0d8ab603
|
feat: 修改支付成功返回信息,增加订单id
|
2024-06-17 18:03:23 +08:00 |
|
|
fabdddec05
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-17 18:00:44 +08:00 |
|
|
cb6ddb2dbb
|
feat(user): 更新用户标签ID字段更新逻辑
|
2024-06-17 18:00:40 +08:00 |
|
liu
|
ac04cc04d2
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-17 17:54:15 +08:00 |
|
liu
|
991dec0760
|
取消活动价
|
2024-06-17 17:53:59 +08:00 |
|
|
eae6735c30
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-17 17:45:37 +08:00 |
|
|
e6bd6a937d
|
feat: 新增用户真实姓名修改功能
|
2024-06-17 17:45:34 +08:00 |
|
liu
|
c0c61dd042
|
下单时校验用户为当用户为摊贩/酒店/食堂时,返回优惠价
|
2024-06-17 17:38:55 +08:00 |
|
liu
|
4bf661fba0
|
短信校验修改
|
2024-06-17 17:37:55 +08:00 |
|
|
13cbad9329
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-17 17:06:34 +08:00 |
|
|
204e7f006d
|
feat: 添加用户标签功能
|
2024-06-17 17:06:25 +08:00 |
|
liu
|
fdd8e762a4
|
再次购买修改逻辑查询错误
|
2024-06-17 16:50:41 +08:00 |
|
|
adfd149e5d
|
feat(StoreController): 修改店铺搜索接口返回格式
|
2024-06-17 16:46:08 +08:00 |
|
|
89596e38d3
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-17 16:44:35 +08:00 |
|
|
a82e96e259
|
feat: 增加用户积分查询和门店信息查询功能
|
2024-06-17 16:44:32 +08:00 |
|
liu
|
7b6816aa80
|
修改分类同步修改店铺名
|
2024-06-17 16:07:43 +08:00 |
|
|
6aa8964f55
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
|
2024-06-17 15:56:34 +08:00 |
|