39 Commits
Author SHA1 Message Date
zhangji b3c8c4b8a0 汇总下单只取上架商品 2025-11-19 09:50:33 +08:00
zhangji 66dacd1f8b 机器和商品部门权限 2025-11-10 13:52:30 +08:00
zhangji 01892098f2 .. 2025-10-14 14:35:41 +08:00
zhangji 510a254c9f .. 2025-09-19 15:34:01 +08:00
zhangji c430c5d890 .. 2025-09-19 14:52:06 +08:00
zhangji d199edb5ee 一键清库存 2025-09-17 16:55:29 +08:00
zhangji f2ea57a57b .. 2025-09-16 10:18:04 +08:00
zhangji 9b5fcec27f .. 2025-09-16 10:16:58 +08:00
zhangji 71e9565ea6 .. 2025-09-15 13:53:04 +08:00
zhangji e08a49ba15 .. 2025-09-15 09:38:17 +08:00
zhangji e852d7f5e5 一键补货 2025-09-12 11:49:19 +08:00
zhangji 1c01a2fa09 mapper冲突解决 2025-09-10 16:18:50 +08:00
zhangji 247d38b34b 贩卖机测试,测试日志 2025-09-10 15:49:41 +08:00
zhangji 88cbffa5bc 新增机器货道配置表 2025-09-09 15:27:00 +08:00
zhangji e4ab1124c3 Merge remote-tracking branch 'origin/main' 2025-09-08 15:10:03 +08:00
zhangji 7a960dad8b 下单修改 2025-09-08 15:00:24 +08:00
zhangji c59a491bb7 商品增加绑定设备IMEI 2025-09-04 16:43:51 +08:00
zhangji 6c9ecebbb3 导出金额返回元 2025-09-02 11:37:04 +08:00
zhangji 04ffe7f847 商品分页返回值加上skus 2025-09-01 16:44:21 +08:00
zhangji d1e0f7a972 新增 增加库存接口和库存变更日志记录 2025-09-01 15:11:59 +08:00
zhangji 4d51240c3d 查询订单销售统计详情加时间 2025-08-29 13:59:07 +08:00
zhangji 74cff7122e 查询订单销售统计详情,导出 2025-08-29 09:27:43 +08:00
zhangji 45aa7b72c3 增加设备出货日志 2025-08-26 15:52:50 +08:00
zhangji ea2bff19a9 Merge remote-tracking branch 'origin/main' 2025-08-22 13:53:20 +08:00
zhangji 57f34353ba 订单详情增加设备信息 2025-08-22 13:53:02 +08:00
zhangji 987473449e 贩卖机字段判空注释 2025-08-19 09:48:36 +08:00
zhangji ef962891dc 订单销量统计 2025-08-15 14:41:29 +08:00
zhangji cd0c2aff92 Merge remote-tracking branch 'origin/main' 2025-08-13 08:15:34 +08:00
zhangji b411ab9f40 新增商品用户数据权限 2025-08-13 08:14:40 +08:00
zhangji 6cfa240cdb 新增商品汇总信息,订单 2025-08-12 13:44:03 +08:00
zhangji 5c62b26dc3 Merge remote-tracking branch 'origin/main' 2025-07-25 15:38:15 +08:00
zhangji 87486b9ea0 新增提货券 2025-07-25 15:37:10 +08:00
zhangji b0d6e56c42 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java
2025-07-17 14:23:08 +08:00
zhangji 3fd4b91bf0 不判断订单金额是不是0 2025-07-17 14:20:25 +08:00
zhangji c9f0aeb0ec 贩卖机图片上传 2025-07-14 10:28:02 +08:00
zhangji 81f46a161d 提货柜代码提交 2025-07-14 09:11:35 +08:00
zhangji f378572ee6 最新代码提交 2025-05-14 14:50:47 +08:00
zhangji e0ccdd908c .. 2025-04-02 11:24:45 +08:00
zhangji f18cafac20 代码提交 2025-04-02 11:20:53 +08:00