牛叉闪闪
|
be842bc1f6
|
Merge remote-tracking branch 'origin/test' into hph
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
|
2024-08-19 17:47:34 +08:00 |
|
牛叉闪闪
|
5cdc276b0c
|
添加是否允许用户自定义充值金额字段
|
2024-08-19 17:36:55 +08:00 |
|
|
|
a11dcb5811
|
Merge branch 'dev' into test
|
2024-08-19 17:26:01 +08:00 |
|
|
|
9b868838f4
|
1.公众号订阅新增type类型
|
2024-08-19 17:13:22 +08:00 |
|
GYJ
|
22c04c61f5
|
小程序获取弹窗接口
|
2024-08-19 15:30:14 +08:00 |
|
|
|
09768ef42c
|
Merge branch 'ww' into test
|
2024-08-16 09:28:14 +08:00 |
|
|
|
878cc895d4
|
商品 可售时间 分组 排序
会员信息 返回头像
|
2024-08-16 09:27:58 +08:00 |
|
|
|
a4601fac99
|
商品 可售时间 处理
|
2024-08-14 15:32:50 +08:00 |
|
|
|
68d12fe2ed
|
商品 可售时间 处理
|
2024-08-14 11:34:51 +08:00 |
|
|
|
bee86bbb73
|
1.消息推送校验店铺状态
|
2024-08-13 09:44:39 +08:00 |
|
|
|
a789eea6b0
|
商品列表 不展示 套餐商品
|
2024-08-08 15:08:57 +08:00 |
|
|
|
a6fc82c4cb
|
销量
|
2024-08-08 10:44:13 +08:00 |
|
|
|
6ee7b54311
|
1.消息订阅同步保存昵称头像
2.小程序规格获取
|
2024-08-08 10:36:39 +08:00 |
|
|
|
fbabdc5763
|
1.新增商品规格获取接口
2.多规格上下架实现
|
2024-08-06 14:49:07 +08:00 |
|
|
|
cf62b19179
|
扫码点餐部分
|
2024-08-05 11:40:49 +08:00 |
|
|
|
567a5a0e23
|
1.公众号订阅新增type类型
|
2024-08-02 10:59:53 +08:00 |
|
GYJ
|
6a29563de0
|
替换logo图片
|
2024-07-29 14:55:21 +08:00 |
|
|
|
b3fc438e78
|
1.二维码增加ysk logo
2.耗材预警调整
|
2024-07-26 17:04:55 +08:00 |
|
|
|
e87537850a
|
1.新增php推送订阅者openid接口
2.库存预警更改为公众号推送
3.sku商品上下架最低价不正确问题
|
2024-07-25 10:10:54 +08:00 |
|
|
|
5593670348
|
起售(库存校验)
订单备注
登录时传参
|
2024-07-20 16:19:33 +08:00 |
|
|
|
90c834a37d
|
1.下单添加购物车同步校验上下架商品
|
2024-07-20 15:24:42 +08:00 |
|
|
|
266bbd7381
|
1.点歌支付防抖
2.点歌记录倒序
3.下单同步保存库存记录
|
2024-07-17 16:52:19 +08:00 |
|
|
|
d784ba8c27
|
登录 及 会员部分修改
|
2024-07-17 13:39:37 +08:00 |
|
|
|
53eea41196
|
商品列表 起售
|
2024-07-11 18:22:25 +08:00 |
|
|
|
3591d8f675
|
Merge branch 'feature-商品起售数量' into dev
|
2024-07-11 15:41:49 +08:00 |
|
|
|
1487d5a6b1
|
商品起售
|
2024-07-11 10:28:20 +08:00 |
|
|
|
9c9c7d8608
|
1.库存预警提示语修改
2.库存预警30分钟内只推送一次
3.点歌支付成功同步保存平台订单号
|
2024-07-11 09:36:26 +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 |
|
|
|
ec0dbc3337
|
微信小程序点歌接口
|
2024-07-09 17:16:11 +08:00 |
|
GYJ
|
31ca409423
|
Merge branch 'refs/heads/dev'
|
2024-07-05 14:57:37 +08:00 |
|
韩鹏辉
|
b236cac065
|
添加耗材
|
2024-07-05 10:05:57 +08:00 |
|
|
|
6908d8eaf3
|
日志文件 50MB 进行一次打包
|
2024-07-05 09:51:42 +08:00 |
|
GYJ
|
435c81a4f4
|
Merge branch 'refs/heads/dev'
|
2024-07-04 09:32:14 +08:00 |
|
|
|
57160c66c5
|
库存预警支持多用户提醒
|
2024-07-02 15:19:40 +08:00 |
|
|
|
7e00911def
|
新增下单库存预警消息推送
|
2024-06-28 14:13:41 +08:00 |
|
|
|
dbfd971f26
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserShopMsgMapper.java
# src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserShopMsg.java
# src/main/resources/mapper/TbUserShopMsgMapper.xml
|
2024-06-28 14:12:24 +08:00 |
|
|
|
ea4366362e
|
新增下单库存预警消息推送
|
2024-06-28 14:10:32 +08:00 |
|
|
|
7124b8a345
|
sql问题
|
2024-06-28 10:07:19 +08:00 |
|
韩鹏辉
|
05c88e00d3
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service into dev
|
2024-06-28 09:59:50 +08:00 |
|
韩鹏辉
|
1c776b8d5e
|
添加耗材
|
2024-06-28 09:59:16 +08:00 |
|
韩鹏辉
|
58ad37b845
|
添加耗材
|
2024-06-28 09:59:06 +08:00 |
|
|
|
6fc74c9700
|
统一分页配置
|
2024-06-27 14:24:22 +08:00 |
|
|
|
a1894d0953
|
Merge branch 'lyf'
|
2024-06-26 09:35:50 +08:00 |
|
GYJ
|
c24434b121
|
加入购物车扣除库存逻辑修改
|
2024-06-24 15:12:39 +08:00 |
|
GYJ
|
487a9e7b6b
|
添加字段
|
2024-06-24 11:59:07 +08:00 |
|
|
|
4a4c5623aa
|
client 标签打印 长链接
会员绑定
|
2024-06-21 09:18:56 +08:00 |
|
韩鹏辉
|
117fd0dbd2
|
Merge branch 'lyf' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service into lyf
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/CartService1.java
|
2024-06-19 15:10:56 +08:00 |
|
|
|
04c5f783bd
|
无效代码移除
购物车 规格字段
|
2024-06-19 15:06:46 +08:00 |
|
韩鹏辉
|
10432eceb9
|
Merge branch 'lyf' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service into lyf
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java
# src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
|
2024-06-19 09:59:34 +08:00 |
|
