Commit Graph

291 Commits

Author SHA1 Message Date
YeMingfei666 2e5f94c293 fix: 修改正式环境地址 2025-03-24 18:32:15 +08:00
YeMingfei666 b45ec5e042 fix: 订单详情展示更多信息 2025-03-21 18:12:29 +08:00
YeMingfei666 6368927de3 fix: 增加订单支付各种优惠时的其他优惠重置 2025-03-21 17:32:46 +08:00
YeMingfei666 9609bda23c fix: 优化商品券选择展示 2025-03-21 16:54:05 +08:00
YeMingfei666 d097d73f12 fix: 代客下单修复先打折后选会员导致结算价格为负数问题。订单退款增加安全密码校验,代客下单修复选择用户手机号未展示问题 2025-03-21 16:01:07 +08:00
YeMingfei666 5891fe6e1f fix: 不选择用户后清除优惠券,修改优惠券可用数量计算公式为数量-退菜-退款 2025-03-21 15:07:18 +08:00
YeMingfei666 c011ae22e4 fix: 耗材单位换算计算统一为第一单位大,第二单位*换算值=第一单位 2025-03-21 14:19:19 +08:00
YeMingfei666 61bdfb924b fix: 耗材出入库计算库存代码优化 2025-03-21 13:27:01 +08:00
YeMingfei666 4ab0efd93a fix: 代码合并,耗材出入库代码修改 2025-03-21 11:32:10 +08:00
YeMingfei666 fddbbf44cf fix: 修改耗材出入库计算逻辑,去除部分无用代码 2025-03-21 11:29:05 +08:00
duan 34e1b48489 feat: 修改商品列表保存字符串判断问题 2025-03-21 11:01:51 +08:00
duan 84cea59064 feat: 添加修改库存功能 2025-03-21 10:17:25 +08:00
duan c40281902a feat: 隐藏多规格退款退回库存,修改所有page为1 2025-03-21 09:35:32 +08:00
YeMingfei666 812b01391b fix: 限制积分基本设置最大100,最小0 2025-03-20 17:35:42 +08:00
YeMingfei666 31bc2e84f2 fix: 剔除耗材统计无用传参 2025-03-20 16:03:02 +08:00
YeMingfei666 552e3f20a0 fix: 店铺列表增加单独激活码弹窗,修改耗材列表搜索时间筛选条件传参 2025-03-20 15:38:47 +08:00
YeMingfei666 c73a838e8c fix: 修复支付成功后未成功发送清空购物车消息 2025-03-20 15:09:00 +08:00
YeMingfei666 c4a62b4549 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf 2025-03-20 14:47:06 +08:00
YeMingfei666 546b3f4303 fix: 限制挂账管理编辑挂账人禁止修改挂账方式 2025-03-20 14:46:53 +08:00
duan 112c0dfb8c Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-20 14:07:37 +08:00
duan 3e3d525676 feat: 系统用户功能完善 2025-03-20 14:07:29 +08:00
YeMingfei666 30f10bed93 fix: 增加积分配置1元至少等于1积分,修复跳转到广告页面后其他页面全部为空,调整crud表单样式兼容问题 2025-03-20 10:53:58 +08:00
YeMingfei666 b76e67c207 fix: 修改桌台统计跳转订单页面展示效果,增加员工修改密码弹窗,修改店铺添加激活码为非必填 2025-03-20 10:06:38 +08:00
YeMingfei666 d48199b991 fix: 修改桌台统计跳转订单页面传参,订单页面查询查询台桌改为tableCode 2025-03-20 09:16:06 +08:00
YeMingfei666 aa981c8d5b fix: 修复从数据统计模块下退出登录再重登会跳转404 2025-03-20 09:04:00 +08:00
YeMingfei666 956a8e8aa5 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf 2025-03-19 16:51:11 +08:00
YeMingfei666 35ad3050ec fix: 新增会员数字段名修改 2025-03-19 16:51:00 +08:00
duan 870785ddcd Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-19 16:29:59 +08:00
duan bc75b5f5dd feat: 系统用户部分功能完成 2025-03-19 16:29:32 +08:00
YeMingfei666 4583b7c16e fix: 修改订单列表页面搜索文字 2025-03-19 16:15:10 +08:00
YeMingfei666 c1e4fb9875 fix: 修复桌台统计跳转订单功能 2025-03-19 16:03:11 +08:00
YeMingfei666 c67424fe2c feat: 增加桌台统计跳转订单页面传参 2025-03-19 15:53:09 +08:00
YeMingfei666 6f779f19a3 fix: 修改密码后退出登录 2025-03-19 15:37:05 +08:00
YeMingfei666 b8ea96007a fix: 修改密码后退出登录 2025-03-19 15:31:19 +08:00
YeMingfei666 47442a52fb fix: 店铺安全设置校验安全密码保存时剔除无用参数 2025-03-19 15:17:55 +08:00
YeMingfei666 cae90224a8 fix: 修复代客下单积分使用类型切换引起的无法选择问题 2025-03-19 15:11:55 +08:00
YeMingfei666 eb93ad889a fix: 修复挂账按订单支付还款传参问题,增加修改密功能 2025-03-19 14:56:20 +08:00
YeMingfei666 706ce14395 fix: 编辑员工去除密码修改 2025-03-19 14:15:43 +08:00
YeMingfei666 35cfc10e81 fix: 修改获取订单状态接口,修改数据统计充值统计增加充值退款金额 2025-03-19 11:33:34 +08:00
YeMingfei666 4a4a9b7ed6 fix: 修复数据统计营业实收金额计算公司 2025-03-19 11:17:15 +08:00
YeMingfei666 586e1d5d15 fix: 修复销售统计列表销售金额,退款金额未展示问题 2025-03-19 10:11:24 +08:00
YeMingfei666 906b949879 fix: 修复销售统计分页问题 2025-03-19 10:04:38 +08:00
YeMingfei666 5bf49cb29a fix: 优化称重商品的打包状态编辑 2025-03-18 18:26:44 +08:00
YeMingfei666 f759cd8aa6 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-18 18:21:13 +08:00
YeMingfei666 2837711105 fix: 修复称重商品切换就餐模式时打包数量展示不对问题 2025-03-18 18:18:42 +08:00
duan b51ec0fd05 Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-18 17:59:07 +08:00
duan 71e35528c8 feat: 售罄字段修改 2025-03-18 17:43:40 +08:00
YeMingfei666 8bcc5b8c71 fix: 代客下单和台桌管理联动优化 2025-03-18 17:25:57 +08:00
YeMingfei666 2de28da055 fix: 代客下单优化店铺信息为空时就餐类型联动效果 2025-03-18 17:15:48 +08:00
YeMingfei666 75378c9371 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf 2025-03-18 16:59:28 +08:00