Commit Graph

633 Commits

Author SHA1 Message Date
kuang.yifei@iwhalecloud.com 05a6a7d943 fix 商品库存问题 2022-07-26 00:18:43 +08:00
donqi ce09120724 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-07-22 22:29:22 +08:00
donqi 9b50c84449 增加商品描述字段 2022-07-22 22:28:58 +08:00
HH 569413f58f Merge remote-tracking branch 'origin/master' 2022-07-22 22:25:53 +08:00
HH cb5b49ee35 子订单取消并发起退款 2022-07-22 22:25:44 +08:00
donqi 0c89bf08a8 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-07-22 21:07:18 +08:00
donqi 8fea394012 根据类目条件查询商品及师傅列表接口修改 2022-07-22 20:58:56 +08:00
kuang.yifei@iwhalecloud.com c92c4e7e41 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-07-22 17:55:30 +08:00
kuang.yifei@iwhalecloud.com 321137a902 后台批量发单初版 2022-07-22 17:55:19 +08:00
HH 7a235f058a 主订单取消并发起退款 2022-07-22 16:16:41 +08:00
HH f31426a97d 如果没有分销人的话分销提成给平台;把所有的支付方式改为延迟分账模式 2022-07-21 18:09:26 +08:00
kuang.yifei@iwhalecloud.com 4e3c29b0b1 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-07-21 17:28:42 +08:00
kuang.yifei@iwhalecloud.com 13faf66901 财务子单类型整理 2022-07-21 17:28:31 +08:00
HH dd477df952 金额判断错了 2022-07-21 17:08:43 +08:00
HH d9f3143414 Merge remote-tracking branch 'origin/master' 2022-07-21 16:33:42 +08:00
HH 40222ba239 确认分账时合并同一个账户的多个子财务单 2022-07-21 16:33:27 +08:00
kuang.yifei@iwhalecloud.com 17b84a4f1c Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-07-21 16:21:07 +08:00
kuang.yifei@iwhalecloud.com 90c5d83da9 如果是本人接单,则需要计算剩余金额 2022-07-21 16:20:56 +08:00
HH 67621c8250 修复支付回调中 支付单、财务单、订单的状态更新失败的问题 2022-07-21 15:47:50 +08:00
HH 619595b08f Merge remote-tracking branch 'origin/master' 2022-07-21 15:12:50 +08:00
HH d37f005b8d payment_id没有保存到financial_master表的问题,以及处理支付回调中 支付单、财务单、订单的关联关系 2022-07-21 15:12:41 +08:00
kuang.yifei@iwhalecloud.com 999ab95487 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-07-21 14:12:12 +08:00
HH 2113e902e7 payment_id没有保存到financial_master表的问题 2022-07-21 14:12:01 +08:00
kuang.yifei@iwhalecloud.com 952839640f Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-07-21 14:11:57 +08:00
kuang.yifei@iwhalecloud.com 9b8781a87b 头像问题 2022-07-21 14:11:51 +08:00
HH fbf122b9b2 payment_id没有保存到financial_master表的问题 2022-07-21 13:33:42 +08:00
HH cfbc5aee58 增加一些日志 2022-07-21 11:44:32 +08:00
kuang.yifei@iwhalecloud.com a6f90fb51c Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-07-21 10:45:04 +08:00
kuang.yifei@iwhalecloud.com 9d911005ab 区域逆解析 2022-07-21 10:44:54 +08:00
HH 5e16125f8a Merge remote-tracking branch 'origin/master' 2022-07-20 18:41:32 +08:00
HH aea293e9a5 在主订单的update方法里触发确认支付和提现 2022-07-20 18:41:12 +08:00
kuang.yifei@iwhalecloud.com 84c10834e3 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-07-20 18:05:12 +08:00
kuang.yifei@iwhalecloud.com c4ce766ae7 区域解析符合前段规范 2022-07-20 18:04:59 +08:00
donqi fa7c2765ac Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-07-20 16:18:08 +08:00
donqi ef1d9800ac 消费者增加分销状态 2022-07-20 16:03:44 +08:00
HH 9a97ad4aad Merge remote-tracking branch 'origin/master' 2022-07-20 15:10:12 +08:00
HH 3e8b80547f 确认支付和自动提现 2022-07-20 15:10:01 +08:00
kuang.yifei@iwhalecloud.com e5d77b4d6c 百度地图api通过经纬度获取地理位置 2022-07-20 14:50:46 +08:00
kuang.yifei@iwhalecloud.com b92c77d64a 百度地图api通过经纬度获取地理位置 2022-07-20 14:42:35 +08:00
kuang.yifei@iwhalecloud.com fbf16fab0e 百度地图api通过经纬度获取地理位置 2022-07-20 14:32:58 +08:00
donqi 7226dab94d Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-07-19 15:13:18 +08:00
donqi d4eafd2e86 订单中的师傅名称查询实名 2022-07-19 15:12:46 +08:00
kuang.yifei@iwhalecloud.com 3518269ae3 新增超时+自动完成订单提现操作 2022-07-19 11:04:23 +08:00
kuang.yifei@iwhalecloud.com 42129f215f 新增超时+自动完成订单提现操作 2022-07-19 09:56:27 +08:00
donqi 248c4d5ee3 地址新增问题修复 2022-07-19 09:55:00 +08:00
donqi a50ccc7f1a 消费者分销信息更新加判断 2022-07-14 16:29:10 +08:00
donqi c150b97111 消费者分销 2022-07-13 23:56:31 +08:00
donqi 09623068b6 微信小程序二维码获取 2022-07-13 16:35:59 +08:00
donqi be11078984 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-07-13 11:11:25 +08:00
donqi f4f37ee068 小程序订单统计接口 2022-07-13 11:11:04 +08:00