 YeMingfei666
|
94bf94b16a
|
修改优惠金额展示
|
2024-11-25 09:33:06 +08:00 |
GaoHao
|
b9663206f3
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into gh
|
2024-11-23 18:07:18 +08:00 |
|
GaoHao
|
7e728e9df0
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into gh
|
2024-11-23 18:07:00 +08:00 |
|
GaoHao
|
c623a510ef
|
挂账相关更新
|
2024-11-23 18:06:24 +08:00 |
|
YeMingfei666
|
adfdee835b
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf
|
2024-11-23 17:52:04 +08:00 |
|
YeMingfei666
|
5076efee3a
|
修改订单详情金额展示
|
2024-11-23 17:44:21 +08:00 |
|
GaoHao
|
fe4d54440e
|
优惠券相关更新
|
2024-11-23 10:03:22 +08:00 |
duan
|
d704253591
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-22 16:52:37 +08:00 |
|
duan
|
a7a9c42126
|
切换店铺
|
2024-11-22 16:52:24 +08:00 |
|
YeMingfei666
|
d1cbebefe9
|
代客下单增加临时菜
|
2024-11-22 15:45:33 +08:00 |
 gyq
|
19aaea4559
|
优化添加店铺选择主账号
|
2024-11-22 15:36:05 +08:00 |
|
gyq
|
f266501a7b
|
去除商品列表多规格操作编辑
|
2024-11-22 14:31:32 +08:00 |
魏啾
|
04efab005c
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz
|
2024-11-22 09:44:51 +08:00 |
|
魏啾
|
cf9a6d03ff
|
台桌预订短信
|
2024-11-22 09:43:57 +08:00 |
|
gyq
|
796fc49fb1
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-11-22 09:34:22 +08:00 |
|
gyq
|
df9a29359f
|
新增商品增加套餐、称重
|
2024-11-22 09:34:14 +08:00 |
|
GaoHao
|
589483bbcc
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into gh
|
2024-11-21 16:56:59 +08:00 |
|
duan
|
224552f546
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-11-21 15:25:10 +08:00 |
|
YeMingfei666
|
270c7350d3
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-11-21 15:24:52 +08:00 |
|
duan
|
e8299f8d12
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-11-21 15:24:44 +08:00 |
|
YeMingfei666
|
862812caa3
|
修改商品券计算时增加打折比例
|
2024-11-21 15:24:31 +08:00 |
|
duan
|
25c030f2a2
|
营销中心-归档 基于当前dev分支修改
|
2024-11-21 15:23:30 +08:00 |
|
duan
|
f7e4fd77aa
|
提交营销中心
|
2024-11-21 14:50:55 +08:00 |
|
duan
|
8cb0d99962
|
开票功能
|
2024-11-21 10:44:36 +08:00 |
|
duan
|
f8130508a2
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-21 09:24:07 +08:00 |
|
duan
|
f5348be1b8
|
应用中心开票功能
|
2024-11-21 09:23:49 +08:00 |
|
YeMingfei666
|
48b8daea75
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-11-20 18:25:57 +08:00 |
|
YeMingfei666
|
9969251050
|
修改订单管理优惠金额计算，修复订单退款时客座费部分退款问题
|
2024-11-20 18:25:37 +08:00 |
|
YeMingfei666
|
edf8e4e254
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-11-20 16:55:13 +08:00 |
|
YeMingfei666
|
d9cf881b62
|
代客下单打折弹窗应付金额文字改为总价
|
2024-11-20 16:54:43 +08:00 |
|
YeMingfei666
|
e00213be32
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-11-20 16:42:53 +08:00 |
|
YeMingfei666
|
c7283a493c
|
修复整单改价时价格不对的问题
|
2024-11-20 16:36:32 +08:00 |
|
YeMingfei666
|
aa8be5e906
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-11-20 16:10:05 +08:00 |
|
YeMingfei666
|
7ff8632af9
|
去除支付完成强制刷新
|
2024-11-20 16:09:44 +08:00 |
|
YeMingfei666
|
d9c789da8f
|
修改代客下单优惠券，积分抵扣逻辑
|
2024-11-20 15:55:31 +08:00 |
|
GaoHao
|
acc3930f48
|
优惠券修改
|
2024-11-20 15:12:37 +08:00 |
|
YeMingfei666
|
8a8de80321
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-11-19 15:27:49 +08:00 |
|
YeMingfei666
|
07d072ce4c
|
修改代客下单切换会员逻辑
|
2024-11-19 15:21:20 +08:00 |
|
gyq
|
315b3e536d
|
优化积分
|
2024-11-19 15:09:43 +08:00 |
|
gyq
|
e0822677ff
|
修复积分中心基本设置文字错误
|
2024-11-19 13:56:31 +08:00 |
|
YeMingfei666
|
f393b91c2d
|
修改选中的抵扣券不展示商品信息
|
2024-11-19 10:38:55 +08:00 |
|
YeMingfei666
|
db7c64fa8b
|
修改是否启用会员价的字段
|
2024-11-19 10:09:49 +08:00 |
|
YeMingfei666
|
638ed75b4d
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf_test
|
2024-11-19 09:26:58 +08:00 |
|
YeMingfei666
|
910fd4b9ad
|
修复代客下单退菜时历史订单会被标识为客座费问题
|
2024-11-19 09:26:32 +08:00 |
|
YeMingfei666
|
3d287016c0
|
代客下单修改商品抵扣券价格计算逻辑
|
2024-11-18 18:24:28 +08:00 |
|
魏啾
|
ef16e62702
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-14 14:04:40 +08:00 |
|
魏啾
|
094a8fc102
|
优惠劵
|
2024-11-14 14:04:31 +08:00 |
|
gyq
|
3045b3f9a5
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-11-14 13:55:58 +08:00 |
|
gyq
|
85c5b86050
|
优化
|
2024-11-14 13:55:51 +08:00 |
|
魏啾
|
460e3b7201
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz
|
2024-11-14 11:40:59 +08:00 |
|
魏啾
|
95713b5df1
|
优惠劵清空
|
2024-11-14 11:39:39 +08:00 |
|
gyq
|
4aa57227ea
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-11-14 09:05:51 +08:00 |
|
gyq
|
7836222460
|
优化分享好友演示
|
2024-11-14 09:05:44 +08:00 |
|
魏啾
|
e9bd9cc2d8
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-13 18:29:11 +08:00 |
|
魏啾
|
528344d6ce
|
输入金额判断整数
|
2024-11-13 18:28:50 +08:00 |
|
GaoHao
|
b836d1a0b4
|
分享好友 奖励券提示增加
|
2024-11-13 18:22:39 +08:00 |
|
GaoHao
|
76774a4ec5
|
优惠券修改
|
2024-11-13 17:00:15 +08:00 |
|
GaoHao
|
519b28f746
|
优惠券编辑修改
|
2024-11-13 16:21:02 +08:00 |
|
GaoHao
|
cb00d913d0
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-13 14:37:30 +08:00 |
|
GaoHao
|
7275bc66e9
|
门槛限制增加小数点
|
2024-11-13 14:37:25 +08:00 |
|
YeMingfei666
|
13c473a234
|
订单列表增加根据isPostpaid判断是否可以退菜
|
2024-11-13 14:30:57 +08:00 |
|
GaoHao
|
802a8f6ce4
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-13 13:47:16 +08:00 |
|
GaoHao
|
266674272d
|
商品券商品ID字段修改
|
2024-11-13 13:46:40 +08:00 |
|
YeMingfei666
|
e795c49b32
|
Merge branch 'ymf_test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-13 13:46:28 +08:00 |
|
YeMingfei666
|
fabe5e3060
|
修复先付费下现金支付第一次点击时价格为0
|
2024-11-13 13:45:48 +08:00 |
|
YeMingfei666
|
a425baad52
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-13 10:42:16 +08:00 |
|
YeMingfei666
|
d14ba5e812
|
代客下单修改支付成功后的处理
|
2024-11-13 10:41:10 +08:00 |
|
gyq
|
aacb9d966a
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-11-13 10:23:46 +08:00 |
|
gyq
|
93854290fe
|
优化分享好友
|
2024-11-13 10:23:33 +08:00 |
|
YeMingfei666
|
f931cc882d
|
修复已退款显示问题
|
2024-11-13 10:03:59 +08:00 |
|
YeMingfei666
|
7752ce1b8a
|
代客下单修改结账时优惠券couponId改为id
|
2024-11-13 09:58:09 +08:00 |
|
YeMingfei666
|
b7da2d0a7b
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf_test
|
2024-11-13 09:46:20 +08:00 |
|
YeMingfei666
|
f3df88236f
|
修改先付订单未支付显示已退款问题
|
2024-11-13 09:45:36 +08:00 |
|
GaoHao
|
42c2d6891d
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-12 16:15:31 +08:00 |
|
GaoHao
|
251353d48e
|
优惠券满减输入限制
|
2024-11-12 16:15:06 +08:00 |
|
GaoHao
|
ee9405c5a6
|
优惠券满减输入限制
|
2024-11-12 16:09:54 +08:00 |
|
魏啾
|
5b0b69bf97
|
活动修改
|
2024-11-12 15:54:18 +08:00 |
|
魏啾
|
d8eba6ea2e
|
解决冲突
|
2024-11-12 15:07:49 +08:00 |
|
魏啾
|
2a27c5394b
|
优惠卷
|
2024-11-12 15:06:13 +08:00 |
|
duan
|
0a081f21ca
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-11-12 10:11:44 +08:00 |
|
duan
|
e5ba63d8aa
|
添加商品分组排列方式
|
2024-11-12 10:11:33 +08:00 |
|
GaoHao
|
0d37da0a58
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-12 09:42:08 +08:00 |
|
GaoHao
|
8f8cbae221
|
限制金额、数量只能输正整数
|
2024-11-12 09:41:46 +08:00 |
|
GaoHao
|
1df34b598f
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-12 09:40:47 +08:00 |
|
GaoHao
|
fea219ee42
|
限制金额、数量只能输正整数
|
2024-11-12 09:40:23 +08:00 |
|
YeMingfei666
|
bbbe6275ee
|
增加临时菜弹窗
|
2024-11-11 18:23:59 +08:00 |
|
duan
|
964b5a2316
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-11-11 15:39:36 +08:00 |
|
duan
|
0210e61816
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-11-11 15:36:06 +08:00 |
|
YeMingfei666
|
b75318c146
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-11 14:06:23 +08:00 |
|
YeMingfei666
|
176fc55a5c
|
增加优惠券，积分抵扣
|
2024-11-11 14:03:49 +08:00 |
|
魏啾
|
a8f01db5e3
|
活动管理
|
2024-11-11 13:36:44 +08:00 |
|
魏啾
|
c79049443a
|
商品添加缓存 活动
|
2024-11-11 10:39:45 +08:00 |
|
gyq
|
f5368fcf4f
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-11-11 09:53:42 +08:00 |
|
gyq
|
af90b029df
|
新增邀请好友
|
2024-11-09 18:19:47 +08:00 |
|
GaoHao
|
835809910a
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-08 18:24:46 +08:00 |
|
GaoHao
|
4f6fbf376a
|
优惠券领取详情更新
|
2024-11-08 18:24:14 +08:00 |
|
GaoHao
|
43df2b637b
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-08 16:07:25 +08:00 |
|
GaoHao
|
0a470c3d7d
|
优惠券增加有效天数
|
2024-11-08 16:06:26 +08:00 |
|
YeMingfei666
|
28fdcd9e5c
|
增加商品券抵扣以及商品券抵扣后价格计算过滤不满足满减条件的优惠券，修改部分代客下单逻辑
|
2024-11-07 17:04:00 +08:00 |
|
YeMingfei666
|
a9a4efabe9
|
修改部分代客下单逻辑
|
2024-11-07 13:30:58 +08:00 |
|
魏啾
|
4acb025bb9
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz
|
2024-11-06 17:51:30 +08:00 |
|
魏啾
|
883a6ffa1a
|
添加出入库供应商
|
2024-11-06 17:51:12 +08:00 |
|
YeMingfei666
|
a8c1440a02
|
1.代课下单修改监听用户改变事件
减少重复请求
2.当会员优惠未0时不展示会员优惠
|
2024-11-06 15:39:52 +08:00 |
|
YeMingfei666
|
958229f63d
|
代客下单修复：
结算时切换用户未重新获取订单信息
|
2024-11-06 15:29:31 +08:00 |
|
YeMingfei666
|
3ad1407173
|
修改价格计算公式
|
2024-11-06 15:26:52 +08:00 |
|
YeMingfei666
|
8528341101
|
修改价格计算，总价格包含赠送商品价格，最后结果为总价格-赠送商品-会员优惠
|
2024-11-06 15:20:20 +08:00 |
|
YeMingfei666
|
ef8cd6da3a
|
增加会员价展示
|
2024-11-06 14:58:46 +08:00 |
|
gyq
|
a9691e5891
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-11-05 17:09:47 +08:00 |
|
gyq
|
da1812f78b
|
优化积分中心新增类型
|
2024-11-05 17:09:40 +08:00 |
|
YeMingfei666
|
dfe65e0ae6
|
修复积分抵扣接口报错问题
|
2024-11-05 16:41:37 +08:00 |
|
YeMingfei666
|
67a892ac01
|
代客下单结账增加积分优惠券支付
|
2024-11-05 16:28:01 +08:00 |
|
GaoHao
|
7d8673e6cf
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-05 10:54:43 +08:00 |
|
GaoHao
|
649f9bd13f
|
添加优惠券名字修改
|
2024-11-05 10:53:43 +08:00 |
|
YeMingfei666
|
63ef70ab6a
|
修复问题：
【管理系统】数据统计-桌台统计页面中，按时间筛选出当日时间各个桌台订单数量，点击跳转到订单页面结果不准确
|
2024-11-04 15:01:29 +08:00 |
|
YeMingfei666
|
f95ae26298
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf_test
|
2024-11-04 14:53:11 +08:00 |
|
YeMingfei666
|
a9736e69f1
|
增加获取优惠券
|
2024-11-04 14:52:36 +08:00 |
|
duan
|
f4467b6a2e
|
桌台日期跳转
|
2024-11-04 14:36:55 +08:00 |
|
duan
|
8ab8fa3a9a
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-04 14:11:41 +08:00 |
|
duan
|
c9d2e3c80f
|
桌台跳转报错
|
2024-11-04 14:11:28 +08:00 |
|
魏啾
|
1b0747ca91
|
添加耗材价格
|
2024-11-04 14:07:22 +08:00 |
|
duan
|
13b4a82ce6
|
修改耗材出库单位
|
2024-11-04 11:38:42 +08:00 |
|
duan
|
933d70445e
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-11-04 11:28:15 +08:00 |
|
duan
|
51f3a382c8
|
耗材主副单位联动
|
2024-11-04 11:27:44 +08:00 |
|
gyq
|
438c11c324
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-11-01 16:00:26 +08:00 |
|
gyq
|
8acea02448
|
积分中心图片增加预览功能
|
2024-11-01 13:48:50 +08:00 |
|
duan
|
da693c2fa2
|
员工管理
|
2024-11-01 13:36:15 +08:00 |
|
魏啾
|
281a4d200a
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz
|
2024-11-01 13:35:57 +08:00 |
|
魏啾
|
367cb7c2d7
|
隐藏耗材管理
|
2024-11-01 13:35:20 +08:00 |
|
YeMingfei666
|
1067da51c4
|
修复订单列表页面退菜文字错误
|
2024-11-01 11:28:13 +08:00 |
|
YeMingfei666
|
b0fd39fa87
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf_test
|
2024-11-01 11:16:49 +08:00 |
|
YeMingfei666
|
8c99f49700
|
代客下单部分逻辑处理优化，订单管理退款退菜结账跳转功能问题处理
|
2024-11-01 11:16:12 +08:00 |
|
gyq
|
964877f763
|
优惠券api管理
|
2024-11-01 10:24:16 +08:00 |
|
gyq
|
9621b5bb86
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-11-01 10:23:36 +08:00 |
|
gyq
|
9bf1dda6dc
|
1.新增店铺装修小票设置
2.店铺装修新增pad点餐设置
3.应用中心新增会员积分
4.店铺设置新增积分设置
|
2024-11-01 10:23:05 +08:00 |
|
YeMingfei666
|
924f296ad1
|
修改代客下单相关逻辑
|
2024-10-31 18:25:52 +08:00 |
|
duan
|
96730712f3
|
修改副单位样式
|
2024-10-31 16:40:26 +08:00 |
|
YeMingfei666
|
8403afd685
|
代客下单新逻辑梳理
|
2024-10-31 16:36:21 +08:00 |
|
duan
|
20df5c3ca4
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-10-31 16:14:37 +08:00 |
|
duan
|
515b12f09a
|
修改主副单位
|
2024-10-31 16:14:34 +08:00 |
|
魏啾
|
a841858316
|
Merge branch 'wwzdiv' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-10-31 10:18:54 +08:00 |
|
魏啾
|
df10beaaec
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-10-31 10:18:09 +08:00 |
|
魏啾
|
4af25b2b80
|
1
|
2024-10-31 10:17:30 +08:00 |
|
duan
|
58ed04ea71
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-10-31 10:17:03 +08:00 |
|
duan
|
63a6305d46
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-10-31 10:12:42 +08:00 |
|
duan
|
461150f9ba
|
添加出入库的欠款金额
|
2024-10-31 10:12:39 +08:00 |
|
GaoHao
|
29283c3487
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-10-31 09:30:42 +08:00 |
|
GaoHao
|
f68cf9fab0
|
优惠券详情修改
|
2024-10-31 09:30:18 +08:00 |
|
duan
|
c103e026e5
|
入库出库null的问题
|
2024-10-31 09:14:10 +08:00 |
|
duan
|
909760e9bf
|
耗材副单位回显修改
|
2024-10-30 16:50:32 +08:00 |
|
gyq
|
f4b0414856
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-10-30 13:38:41 +08:00 |