Commit Graph

257 Commits

Author SHA1 Message Date
kuang.yifei@iwhalecloud.com d8cceb58ac 师傅端派单接口bug修复 2022-06-10 18:20:58 +08:00
kuang.yifei@iwhalecloud.com 05d4c03cd6 师傅端派单接口 2022-06-10 18:06:26 +08:00
kuang.yifei@iwhalecloud.com 297e441c75 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-06-10 16:44:26 +08:00
kuang.yifei@iwhalecloud.com a8991068d5 新增查询可派单商品数量接口 2022-06-10 16:44:13 +08:00
HH 8cd6050dfe 商品列表增加上架/下架按钮 2022-06-09 19:56:18 +08:00
donqi 4bd975d7c4 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-06-09 18:00:54 +08:00
donqi 9e0d6b2258 orderMaster时间查询字段加JsonFormat注解 2022-06-09 17:59:55 +08:00
kuang.yifei@iwhalecloud.com dc1067c6f1 师傅那边细单展示 2022-06-09 17:52:21 +08:00
kuang.yifei@iwhalecloud.com c6fe9ce12e 补充消费者名称+意向服务时间 2022-06-09 16:46:45 +08:00
kuang.yifei@iwhalecloud.com 75590aa92b 补充消费者名称+意向服务时间 2022-06-09 16:04:46 +08:00
kuang.yifei@iwhalecloud.com 0feed790ce 规范化订单商品表内关联字段,修改订单list接口 2022-06-09 15:11:02 +08:00
kuang.yifei@iwhalecloud.com 6f37b29eb7 修改查询返回实体 2022-06-09 14:51:01 +08:00
kuang.yifei@iwhalecloud.com 10be655d16 查询主单 2022-06-09 14:35:13 +08:00
kuang.yifei@iwhalecloud.com 40e1761f38 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-06-09 14:31:42 +08:00
kuang.yifei@iwhalecloud.com 05c0bcba80 查询主单 2022-06-09 14:31:36 +08:00
donqi b6cd5e1516 修改主订单 2022-06-08 16:51:13 +08:00
kuang.yifei@iwhalecloud.com 3078e8e4c6 查询返回订单编码 2022-06-08 14:54:19 +08:00
kuang.yifei@iwhalecloud.com 940ac02bce 回调修改订单、财务单状态 2022-06-08 14:50:41 +08:00
kuang.yifei@iwhalecloud.com b0476d6bed fix 2022-06-08 14:14:56 +08:00
donqi d819f4fb0c 条件查询goods列表 2022-06-08 13:58:41 +08:00
HH 8dfb3f0002 特殊技能相关接口 2022-06-07 21:51:40 +08:00
kuang.yifei@iwhalecloud.com 5ffaa133a9 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-06-07 17:47:57 +08:00
kuang.yifei@iwhalecloud.com 09cd31ec75 fix 2022-06-07 17:47:35 +08:00
HH 6b005064fc Merge remote-tracking branch 'origin/master' 2022-06-07 17:39:10 +08:00
HH cbd10c575f 特殊技能、师傅特殊技能 表与mapper 2022-06-07 17:39:03 +08:00
kuang.yifei@iwhalecloud.com cb4852ba15 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-06-07 17:08:35 +08:00
kuang.yifei@iwhalecloud.com aef73ce907 fix 2022-06-07 17:08:25 +08:00
HH 1237d578d1 Merge remote-tracking branch 'origin/master' 2022-06-07 16:37:14 +08:00
HH ffc1d6c177 师傅服务类目接口 2022-06-07 16:37:06 +08:00
kuang.yifei@iwhalecloud.com a96ab58e1e Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-06-07 16:23:49 +08:00
kuang.yifei@iwhalecloud.com c4844fa9cf fix 2022-06-07 16:23:39 +08:00
HH b701516896 Merge remote-tracking branch 'origin/master' 2022-06-07 16:00:53 +08:00
HH d2ed20b04d 师傅接单区域 Controller 2022-06-07 16:00:45 +08:00
kuang.yifei@iwhalecloud.com 9a6b4b2e7d 消费者订单接口 2022-06-07 15:55:04 +08:00
kuang.yifei@iwhalecloud.com d0626c36b5 新增商城端-热门商品接口 2022-06-07 10:33:11 +08:00
donqi 87d81b0547 goods列表补全商品规格列表 2022-06-07 10:04:30 +08:00
kuang.yifei@iwhalecloud.com a9d8d7e1f1 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-06-06 17:52:10 +08:00
kuang.yifei@iwhalecloud.com eb6d85e97c 新增商城端-热门类目接口 2022-06-06 17:52:00 +08:00
HH 4355e6dc91 师傅接单区域 Service 和 Mapper 2022-06-06 17:23:32 +08:00
kuang.yifei@iwhalecloud.com 8735f748d5 师傅端 更新师傅服务商、供应商 2022-06-06 13:53:11 +08:00
HH 830f8136cc Merge remote-tracking branch 'origin/master' 2022-06-06 11:12:00 +08:00
HH b688f0f525 分公司类目增加字段 2022-06-06 11:11:51 +08:00
donqi f698f94c6a 问题修复 2022-06-06 10:58:00 +08:00
kuang.yifei@iwhalecloud.com 54da5e3c98 新增商品信息 2022-06-02 14:37:13 +08:00
kuang.yifei@iwhalecloud.com 399a1af0a8 小程序端订单+小程序端财务单 2022-06-01 23:45:50 +08:00
kuang.yifei@iwhalecloud.com ee2d5ea391 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-06-01 22:26:04 +08:00
kuang.yifei@iwhalecloud.com 8d94b1fab1 财务列表时间筛选 2022-06-01 22:25:50 +08:00
但星霖 807a2256a7 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialDetailMapper.java
#	ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java
#	ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java
2022-06-01 22:15:47 +08:00
但星霖 27b598c6d6 订单Vo数据/代码页面补充。 2022-06-01 22:14:02 +08:00
kuang.yifei@iwhalecloud.com 2879ae482c Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-06-01 22:06:42 +08:00