Commit Graph

764 Commits

Author SHA1 Message Date
gyq 7836222460 优化分享好友演示 2024-11-14 09:05:44 +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