|
|
e32476cb3b
|
优惠卷列表
|
2024-09-02 18:03:03 +08:00 |
|
|
|
556123aab4
|
删除订单
|
2024-09-02 15:51:24 +08:00 |
|
|
|
b3850469ec
|
会员商品 优惠卷列表
|
2024-09-02 15:30:32 +08:00 |
|
|
|
119b6ba9c7
|
1.下单不打票修复
|
2024-09-02 10:31:56 +08:00 |
|
|
|
7be5d2354f
|
1.创建订单同步保存用户id
2.代客下单订单不重复出票
3.订单支付完毕清楚当前台桌缓存订单号
|
2024-08-31 16:47:12 +08:00 |
|
|
|
1ee3c33fa0
|
Merge remote-tracking branch 'origin/test' into dev
|
2024-08-30 16:25:25 +08:00 |
|
牛叉闪闪
|
43c1505dbe
|
添加会员余额变动通知
|
2024-08-29 15:11:33 +08:00 |
|
牛叉闪闪
|
7fb5322563
|
添加会员余额变动通知
|
2024-08-29 14:46:57 +08:00 |
|
牛叉闪闪
|
67671fcf6c
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-08-29 14:06:57 +08:00 |
|
牛叉闪闪
|
941072171b
|
添加会员余额变动通知
|
2024-08-29 14:05:42 +08:00 |
|
|
|
f6876e3f9c
|
Merge branch 'ww' into test
|
2024-08-29 10:27:21 +08:00 |
|
|
|
01c6e5753c
|
订单列表增加店铺名称
|
2024-08-29 10:26:58 +08:00 |
|
牛叉闪闪
|
75a8e9362f
|
添加会员余额变动通知
|
2024-08-28 17:18:55 +08:00 |
|
牛叉闪闪
|
9bb60335b6
|
添加会员余额变动通知
|
2024-08-28 17:07:39 +08:00 |
|
|
|
e70d6b27b9
|
会员如果手机号在PC存在 则绑定
|
2024-08-27 16:19:44 +08:00 |
|
|
|
01da0ff8a5
|
Merge branch 'test' into dev
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
|
2024-08-27 11:02:42 +08:00 |
|
|
|
1b1fe06844
|
1.查询规格接口同步返回是否售罄
|
2024-08-23 17:39:12 +08:00 |
|
|
|
f16090f04e
|
1.查询规格接口同步返回是否售罄
|
2024-08-23 17:17:35 +08:00 |
|
|
|
7232fb3173
|
1.查询规格接口同步返回是否售罄
|
2024-08-23 16:54:30 +08:00 |
|
|
|
0b511314fb
|
Merge branch 'ww' into test
|
2024-08-23 11:19:07 +08:00 |
|
|
|
870ed00e1c
|
支付完成 修改赠送商品记录状态
|
2024-08-23 11:18:43 +08:00 |
|
|
|
5c84d6ab95
|
Merge branch 'ww' into test
|
2024-08-23 11:09:16 +08:00 |
|
|
|
a8fff70798
|
会员商品 不做起售逻辑
|
2024-08-23 11:08:30 +08:00 |
|
|
|
1791b884e8
|
Merge branch 'ww' into test
|
2024-08-23 11:01:05 +08:00 |
|
|
|
3ea5b8290e
|
活动赠送商品 多个商品时 只展示了一个的问题
|
2024-08-23 10:58:14 +08:00 |
|
|
|
5646c50b4d
|
Merge branch 'ww' into test
|
2024-08-23 10:41:27 +08:00 |
|
|
|
c745e254c0
|
重复扣除的问题
|
2024-08-23 10:40:53 +08:00 |
|
|
|
26f455fcd1
|
参数 undefined的情况
|
2024-08-23 10:40:26 +08:00 |
|
|
|
c0078222f5
|
参数 undefined的情况
|
2024-08-23 10:11:06 +08:00 |
|
|
|
37fffa0f98
|
Merge branch 'ww' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java
# src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateInRecordServiceImpl.java
# src/main/resources/mapper/TbActivateInRecordMapper.xml
|
2024-08-23 10:06:27 +08:00 |
|
|
|
7b09e827fd
|
会员商品 添加购物车 记录
|
2024-08-23 10:04:49 +08:00 |
|
|
|
7b71eced36
|
会员商品 添加购物车 记录
|
2024-08-23 09:57:34 +08:00 |
|
|
|
d264f79c9e
|
商品列表 校验 耗材
|
2024-08-21 14:49:25 +08:00 |
|
|
|
58fa177785
|
注解错误问题
|
2024-08-21 10:22:31 +08:00 |
|
|
|
3ae13b0b7e
|
店铺扩展信息
|
2024-08-21 10:07:48 +08:00 |
|
|
|
fbb69e60d9
|
会员 充值活动 奖励 赠送商品
|
2024-08-21 09:29:50 +08:00 |
|
|
|
9fcee207d5
|
商品列表 校验库存 以及 耗材
|
2024-08-21 09:28:40 +08:00 |
|
|
|
4a379d2730
|
Merge branch 'test' into ww
|
2024-08-20 18:05:00 +08:00 |
|
牛叉闪闪
|
b34eaa2894
|
添加耗材判断
|
2024-08-20 15:53:09 +08:00 |
|
|
|
a316be436b
|
开通会员
|
2024-08-20 11:10:26 +08:00 |
|
|
|
878b21f7f6
|
会员注册接口参数校验
无手机号会员添加手机号接口
重置资金密码 增加参数 判断手机号是会员还是用户
|
2024-08-20 10:00:22 +08:00 |
|
牛叉闪闪
|
2f1f8877fc
|
添加是否允许用户自定义充值金额字段
|
2024-08-19 17:51:45 +08:00 |
|
牛叉闪闪
|
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 |
|
牛叉闪闪
|
5b95673507
|
Merge remote-tracking branch 'origin/hph' into dev
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
|
2024-08-19 17:39:07 +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 |
|
牛叉闪闪
|
31a5c94adf
|
Merge remote-tracking branch 'origin/dev' into hph
|
2024-08-19 17:13:29 +08:00 |
|
|
|
9b868838f4
|
1.公众号订阅新增type类型
|
2024-08-19 17:13:22 +08:00 |
|
GYJ
|
22c04c61f5
|
小程序获取弹窗接口
|
2024-08-19 15:30:14 +08:00 |
|
|
|
952a618175
|
shopId undefined 返回信息
|
2024-08-16 15:31:07 +08:00 |
|
