czg_team
/
wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
271 Commits 10 Branches 0 Tags 2.1 MiB
Commit Graph

271 Commits

Author SHA1 Message Date
SongZhang 63c97b781e Merge remote-tracking branch 'origin/dev' 2024-07-26 10:19:34 +08:00
SongZhang 95f529e4d7 1.耗材推送预警值改为等于 
2. 耗材数量为消耗完毕数量
 2024-07-26 10:11:38 +08:00
SongZhang de2300311d 1.模板消息负值不推送 2024-07-25 17:06:07 +08:00
SongZhang e4c3478f8e 1.修改推送标题 2024-07-25 15:03:01 +08:00
SongZhang 93f5c51d44 1.推送异常导致停止推送 2024-07-25 11:26:07 +08:00
SongZhang e87537850a 1.新增php推送订阅者openid接口 
2.库存预警更改为公众号推送
3.sku商品上下架最低价不正确问题
 2024-07-25 10:10:54 +08:00
SongZhang 954bfb00ac 1.多规格商品snap拼接错误 2024-07-23 14:10:30 +08:00
SongZhang 4eb037ad5d Merge remote-tracking branch 'origin/dev' into zs 2024-07-23 11:13:26 +08:00
SongZhang afb920f360 1.储值卡支付同步保存库存消耗记录 2024-07-23 11:13:08 +08:00
wangw 4feb821f70 会员授权 2024-07-23 10:40:28 +08:00
wangw 5ae24fbbfc Merge branch 'dev' 2024-07-23 10:02:57 +08:00
牛叉闪闪 fd293f2df0 Merge remote-tracking branch 'origin/dev' into hph 
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
 2024-07-22 13:55:53 +08:00
牛叉闪闪 45b5566e87 打印 2024-07-22 11:09:53 +08:00
wangw 1d4963c548 起售(库存校验) 
订单备注
登录时传参
 2024-07-22 09:32:11 +08:00
SongZhang f2301ba6ca 1.小程序上下架sku商品不生效调整 2024-07-21 17:40:24 +08:00
wangw 5593670348 起售(库存校验) 
订单备注
登录时传参
 2024-07-20 16:19:33 +08:00
SongZhang 90c834a37d 1.下单添加购物车同步校验上下架商品 2024-07-20 15:24:42 +08:00
SongZhang 4691fa8c31 1.歌曲搜索传入特殊编码字符报错问题修复 2024-07-19 16:17:01 +08:00
SongZhang e52206e6d8 1.点歌记录店铺区分 2024-07-19 13:46:27 +08:00
SongZhang 66cacb668d Merge remote-tracking branch 'origin/dev' into zs 2024-07-19 13:29:46 +08:00
SongZhang 4b7abd516d 1.点歌没有点歌人收个人 2024-07-19 11:20:02 +08:00
GYJ 6686e5da7d Merge branch 'refs/heads/zs' into dev 2024-07-19 10:20:04 +08:00
SongZhang 3a6ce2ee7d Merge remote-tracking branch 'origin/dev' into zs 2024-07-18 13:36:39 +08:00
SongZhang 266bbd7381 1.点歌支付防抖 
2.点歌记录倒序
3.下单同步保存库存记录
 2024-07-17 16:52:19 +08:00
wangw faf33855d6 授权手机号 修改手机号部分 2024-07-17 14:58:47 +08:00
wangw d784ba8c27 登录 及 会员部分修改 2024-07-17 13:39:37 +08:00
SongZhang 50ec8c7cd7 小程序点歌 点歌记录增加shopId 2024-07-16 11:35:33 +08:00
SongZhang e785ee6467 小程序点歌 点歌记录返回状态等字段 2024-07-15 16:07:57 +08:00
SongZhang 37fb8e55c1 小程序点歌 新增待演唱统计数字段 2024-07-12 18:25:15 +08:00
SongZhang 465d6f8d60 Merge remote-tracking branch 'origin/hph' into zs 2024-07-12 16:58:39 +08:00
SongZhang a25e86fcc0 小程序点歌 新增获取正在演唱歌曲接口 2024-07-12 15:46:47 +08:00
SongZhang 41c264d325 小程序点歌 新增获取正在演唱歌曲接口 2024-07-12 14:32:12 +08:00
SongZhang 95c22ee51c Merge remote-tracking branch 'origin/dev' into zs 2024-07-12 14:31:07 +08:00
SongZhang 1fd127023f 耗材重复扣取问题 2024-07-12 14:03:27 +08:00
wangw 53eea41196 商品列表 起售 2024-07-11 18:22:25 +08:00
SongZhang 989bdbad73 1.tb_shop_open_id多条数据查询问题 2024-07-11 16:03:45 +08:00
SongZhang 4e388ea951 1.tb_shop_open_id多条数据查询问题 2024-07-11 15:48:15 +08:00
wangw 3591d8f675 Merge branch 'feature-商品起售数量' into dev 2024-07-11 15:41:49 +08:00
SongZhang 719d578a9c 1.库存预警不提示修复 2024-07-11 11:45:56 +08:00
wangw 1487d5a6b1 商品起售 2024-07-11 10:28:20 +08:00
SongZhang 9c9c7d8608 1.库存预警提示语修改 
2.库存预警30分钟内只推送一次
3.点歌支付成功同步保存平台订单号
 2024-07-11 09:36:26 +08:00
韩鹏辉 736e30543d Merge remote-tracking branch 'origin/dev' into hph 
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
 2024-07-11 09:30:28 +08:00
GYJ 4b2996adb3 修改点歌逻辑 2024-07-10 18:45:23 +08:00
GYJ 89af38dc15 Merge branch 'refs/heads/dev' into gyj 2024-07-10 15:49:38 +08:00
韩鹏辉 96b58cf5a2 修改 2024-07-10 15:13:50 +08:00
韩鹏辉 8ce62ee06c Merge remote-tracking branch 'origin/dev' into hph 
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java
 2024-07-10 15:11:00 +08:00
韩鹏辉 288a8b76be 修改 2024-07-10 15:10:21 +08:00
韩鹏辉 dba97d4dec 添加异常 2024-07-10 14:55:09 +08:00
GYJ 402a9b635f 删除无用文件 2024-07-10 14:50:21 +08:00
SongZhang ec0dbc3337 微信小程序点歌接口 2024-07-09 17:16:11 +08:00