 gyq
|
e9b60e238d
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-12-02 11:36:51 +08:00 |
|
gyq
|
1be956da85
|
更改添加商品定时上下架默认时间
|
2024-12-02 11:36:44 +08:00 |
 YeMingfei666
|
1ec393fcf5
|
Merge branch 'ymf_test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-12-02 09:35:57 +08:00 |
|
YeMingfei666
|
42b61fbfa1
|
增加抖音美团核销
|
2024-12-02 09:35:07 +08:00 |
duan
|
8e1991e1bf
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-11-29 16:35:13 +08:00 |
|
duan
|
aa54684e44
|
同步数据
|
2024-11-29 16:34:48 +08:00 |
|
YeMingfei666
|
80d211ced7
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-29 14:12:36 +08:00 |
|
YeMingfei666
|
8baaf8ff94
|
增加扫码验券接口
|
2024-11-29 14:12:32 +08:00 |
GaoHao
|
c5fad9298c
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-29 10:54:49 +08:00 |
|
YeMingfei666
|
fe0eafbbb3
|
Merge branch 'ymf_test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-29 09:58:46 +08:00 |
|
YeMingfei666
|
0768355644
|
限制订单先付费禁止退菜
|
2024-11-29 09:58:22 +08:00 |
|
YeMingfei666
|
5e1d80ce0f
|
Merge branch 'ymf_test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-28 18:27:31 +08:00 |
|
YeMingfei666
|
f663db95f3
|
代客下单增加限制，当价格为0时禁止挂账，增加临时菜展示
|
2024-11-28 18:26:53 +08:00 |
|
YeMingfei666
|
1ada98907c
|
代码合并
|
2024-11-28 17:52:04 +08:00 |
|
YeMingfei666
|
45eaccb9ac
|
代客下单增加单品改价，挂账，等叫，免厨打等功能
|
2024-11-28 17:50:27 +08:00 |
魏啾
|
d101cd763b
|
Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-28 14:28:00 +08:00 |
|
魏啾
|
b5cd694baf
|
删除操作记录IP展示 供应商出入库记录修改
|
2024-11-28 14:04:43 +08:00 |
|
GaoHao
|
41fa2e0c22
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into gh
|
2024-11-27 16:00:00 +08:00 |
|
GaoHao
|
beb9ac4d28
|
挂账手机号限制更新
|
2024-11-27 15:59:44 +08:00 |
|
GaoHao
|
14365be0dd
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-27 15:38:53 +08:00 |
|
GaoHao
|
985a3c6ad6
|
分页数量修改
|
2024-11-27 15:38:30 +08:00 |
|
YeMingfei666
|
b0868703a5
|
代码合并，代客下单增加挂账支付
|
2024-11-27 15:07:40 +08:00 |
|
YeMingfei666
|
74bd8904ac
|
代码合并，增肌挂账人支付
|
2024-11-27 15:06:42 +08:00 |
|
GaoHao
|
b06afa15fe
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-27 14:14:41 +08:00 |
|
GaoHao
|
bd0b9311fd
|
筛选条件调试
|
2024-11-27 14:14:16 +08:00 |
|
GaoHao
|
971cdd8f36
|
挂账记录重置更新
|
2024-11-27 14:01:58 +08:00 |
|
GaoHao
|
c3c47ff647
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-27 11:36:48 +08:00 |
|
GaoHao
|
e62ff19b5f
|
挂账增加防抖
|
2024-11-27 11:35:33 +08:00 |
|
YeMingfei666
|
c4f9bdfb8a
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf_test
|
2024-11-27 09:01:26 +08:00 |
|
魏啾
|
4218084ebf
|
冲突
|
2024-11-26 11:02:34 +08:00 |
|
魏啾
|
feea4c04a6
|
Merge branch 'wwzdiv' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz
|
2024-11-26 10:59:01 +08:00 |
|
魏啾
|
dc0b2f7605
|
耗材盘点
|
2024-11-26 10:05:34 +08:00 |
|
魏啾
|
56c47a1ab2
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwzdiv
|
2024-11-26 09:36:27 +08:00 |
|
duan
|
79abd9c10d
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-11-25 17:55:12 +08:00 |
|
duan
|
cdc02f1ff4
|
打印机开票
|
2024-11-25 17:54:34 +08:00 |
|
GaoHao
|
dc79da043f
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-25 17:27:33 +08:00 |
|
gyq
|
8cf46745cd
|
优化pad点单设置
|
2024-11-25 16:51:06 +08:00 |
|
YeMingfei666
|
63349360fa
|
增加单品改价
|
2024-11-25 16:31:36 +08:00 |
|
GaoHao
|
952574e92d
|
挂账添加
|
2024-11-25 16:26:28 +08:00 |
|
GaoHao
|
d52a755338
|
挂账添加
|
2024-11-25 16:23:03 +08:00 |
|
魏啾
|
0cec66ef27
|
上次一样
|
2024-11-25 14:42:04 +08:00 |
|
魏啾
|
ba5c3714cf
|
更改订单->隐藏总金额列表
|
2024-11-25 14:41:04 +08:00 |
|
魏啾
|
4a62f56c96
|
影藏订单信息中总金额那个接口和列表
|
2024-11-25 14:35:42 +08:00 |
|
duan
|
d9f97b6ddb
|
开票注释绑定
|
2024-11-25 14:25:18 +08:00 |
|
duan
|
0c2d22e1c3
|
开票
|
2024-11-25 14:23:53 +08:00 |
|
duan
|
e0abb6a589
|
开票隐藏
|
2024-11-25 13:59:53 +08:00 |
|
duan
|
4b87e91199
|
开票
|
2024-11-25 13:53:57 +08:00 |
|
duan
|
61c63d71ce
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-11-25 10:59:32 +08:00 |
|
duan
|
161caeeabe
|
开票优化
|
2024-11-25 10:59:20 +08:00 |
|
YeMingfei666
|
603447bc2b
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf_test
|
2024-11-25 10:01:29 +08:00 |
|
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 |