Commit Graph

836 Commits

Author SHA1 Message Date
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
魏啾 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
gyq 8cf46745cd 优化pad点单设置 2024-11-25 16:51:06 +08:00
YeMingfei666 63349360fa 增加单品改价 2024-11-25 16:31:36 +08:00
魏啾 ba5c3714cf 更改订单->隐藏总金额列表 2024-11-25 14:41:04 +08:00
duan d9f97b6ddb 开票注释绑定 2024-11-25 14:25:18 +08:00
duan e0abb6a589 开票隐藏 2024-11-25 13:59:53 +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
gyq 22bec823b2 优化 2024-11-25 09:42:32 +08:00
gyq 468209308c Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq_11.19_dev 2024-11-25 09:41:36 +08:00
gyq 54f0a407c2 更改正式接口 2024-11-25 09:41:24 +08:00
YeMingfei666 94bf94b16a 修改优惠金额展示 2024-11-25 09:33:06 +08:00
YeMingfei666 62d775a668 代码合并 2024-11-23 18:13:23 +08:00
YeMingfei666 ae03b5b9f3 代码合并 2024-11-23 18:13:01 +08:00
YeMingfei666 56b9c1ebf7 代码合并 2024-11-23 17:58:53 +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
YeMingfei666 d1cbebefe9 代客下单增加临时菜 2024-11-22 15:45:33 +08:00
gyq f266501a7b 去除商品列表多规格操作编辑 2024-11-22 14:31:32 +08:00
duan c94acd899a Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-11-21 15:25:28 +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 8318b9ed80 Merge branch 'ymf_test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-11-19 11:22:43 +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