clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Commit Graph

  • b0476d6bed fix kuang.yifei@iwhalecloud.com 2022-06-08 14:14:56 +0800
  • d819f4fb0c 条件查询goods列表 donqi 2022-06-08 13:58:41 +0800
  • 8dfb3f0002 特殊技能相关接口 HH 2022-06-07 21:51:40 +0800
  • 5ffaa133a9 Merge branch 'master' of https://gitee.com/op-souls/ghy-all kuang.yifei@iwhalecloud.com 2022-06-07 17:47:57 +0800
  • 09cd31ec75 fix kuang.yifei@iwhalecloud.com 2022-06-07 17:47:35 +0800
  • 6b005064fc Merge remote-tracking branch 'origin/master' HH 2022-06-07 17:39:10 +0800
  • cbd10c575f 特殊技能、师傅特殊技能 表与mapper HH 2022-06-07 17:39:03 +0800
  • cb4852ba15 Merge branch 'master' of https://gitee.com/op-souls/ghy-all kuang.yifei@iwhalecloud.com 2022-06-07 17:08:35 +0800
  • aef73ce907 fix kuang.yifei@iwhalecloud.com 2022-06-07 17:08:25 +0800
  • 1237d578d1 Merge remote-tracking branch 'origin/master' HH 2022-06-07 16:37:14 +0800
  • ffc1d6c177 师傅服务类目接口 HH 2022-06-07 16:37:06 +0800
  • a96ab58e1e Merge branch 'master' of https://gitee.com/op-souls/ghy-all kuang.yifei@iwhalecloud.com 2022-06-07 16:23:49 +0800
  • c4844fa9cf fix kuang.yifei@iwhalecloud.com 2022-06-07 16:23:39 +0800
  • b701516896 Merge remote-tracking branch 'origin/master' HH 2022-06-07 16:00:53 +0800
  • d2ed20b04d 师傅接单区域 Controller HH 2022-06-07 16:00:45 +0800
  • 9a6b4b2e7d 消费者订单接口 kuang.yifei@iwhalecloud.com 2022-06-07 15:55:04 +0800
  • d0626c36b5 新增商城端-热门商品接口 kuang.yifei@iwhalecloud.com 2022-06-07 10:33:11 +0800
  • 87d81b0547 goods列表补全商品规格列表 donqi 2022-06-07 10:04:30 +0800
  • a9d8d7e1f1 Merge branch 'master' of https://gitee.com/op-souls/ghy-all kuang.yifei@iwhalecloud.com 2022-06-06 17:52:10 +0800
  • eb6d85e97c 新增商城端-热门类目接口 kuang.yifei@iwhalecloud.com 2022-06-06 17:52:00 +0800
  • 4355e6dc91 师傅接单区域 Service 和 Mapper HH 2022-06-06 17:23:32 +0800
  • 8735f748d5 师傅端 更新师傅服务商、供应商 kuang.yifei@iwhalecloud.com 2022-06-06 13:53:11 +0800
  • 830f8136cc Merge remote-tracking branch 'origin/master' HH 2022-06-06 11:12:00 +0800
  • b688f0f525 分公司类目增加字段 HH 2022-06-06 11:11:51 +0800
  • f698f94c6a 问题修复 donqi 2022-06-06 10:58:00 +0800
  • 54da5e3c98 新增商品信息 kuang.yifei@iwhalecloud.com 2022-06-02 14:37:13 +0800
  • 399a1af0a8 小程序端订单+小程序端财务单 kuang.yifei@iwhalecloud.com 2022-06-01 23:45:50 +0800
  • ee2d5ea391 Merge branch 'master' of https://gitee.com/op-souls/ghy-all kuang.yifei@iwhalecloud.com 2022-06-01 22:26:04 +0800
  • 8d94b1fab1 财务列表时间筛选 kuang.yifei@iwhalecloud.com 2022-06-01 22:25:50 +0800
  • 807a2256a7 Merge remote-tracking branch 'origin/master' 但星霖 2022-06-01 22:15:47 +0800
  • 27b598c6d6 订单Vo数据/代码页面补充。 但星霖 2022-06-01 22:14:02 +0800
  • 2879ae482c Merge branch 'master' of https://gitee.com/op-souls/ghy-all kuang.yifei@iwhalecloud.com 2022-06-01 22:06:42 +0800
  • 4cd21aa340 提供给前台的财务单 kuang.yifei@iwhalecloud.com 2022-06-01 22:06:29 +0800
  • e44483498d 修改团队成员备注接口开发 donqi 2022-06-01 21:29:28 +0800
  • 1f84c777a8 Merge branch 'master' of https://gitee.com/op-souls/ghy-all kuang.yifei@iwhalecloud.com 2022-06-01 18:16:25 +0800
  • 0212e22984 收入和支出统计 kuang.yifei@iwhalecloud.com 2022-06-01 18:11:29 +0800
  • d21a38bad1 团队及个人信息查询，字段补充 donqi 2022-06-01 18:07:56 +0800
  • fa166fa42b fix import kuang.yifei@iwhalecloud.com 2022-06-01 16:56:09 +0800
  • 5c34b2ad56 Merge remote-tracking branch 'origin/master' HH 2022-06-01 16:30:01 +0800
  • 2423fd9fe2 撤销支付接口 HH 2022-06-01 16:29:52 +0800
  • 9443a8ca24 Merge branch 'master' of https://gitee.com/op-souls/ghy-all kuang.yifei@iwhalecloud.com 2022-06-01 16:21:09 +0800
  • 4fbe5a0698 师傅团队 kuang.yifei@iwhalecloud.com 2022-06-01 16:20:50 +0800
  • 4d9d30bde0 订单Vo数据/代码页面补充。 但星霖 2022-06-01 15:48:19 +0800
  • ea52a9b469 订单Vo数据/代码页面补充。 但星霖 2022-06-01 15:41:30 +0800
  • c448ab8a6d Merge remote-tracking branch 'origin/master' 但星霖 2022-06-01 14:51:09 +0800
  • 07fde0c962 订单Vo数据/代码页面补充。 但星霖 2022-06-01 14:50:58 +0800
  • 2bb9d1ee0a fix bug kuang.yifei@iwhalecloud.com 2022-06-01 13:48:36 +0800
  • 6400095500 fix bug kuang.yifei@iwhalecloud.com 2022-06-01 00:29:00 +0800
  • 6a68a6ae44 发布商品批量新增bug 商品图片少了类型字段入库 kuang.yifei@iwhalecloud.com 2022-06-01 00:18:46 +0800
  • ca4773db99 批量发布商品+转派初版 kuang.yifei@iwhalecloud.com 2022-05-31 23:27:30 +0800
  • 24a4872ccf Merge remote-tracking branch 'origin/master' HH 2022-05-31 20:55:18 +0800
  • 98bef1400a 1.撤销支付2.重新整理回调 HH 2022-05-31 20:55:09 +0800
  • c28e975288 Merge remote-tracking branch 'origin/master' 但星霖 2022-05-31 14:18:43 +0800
  • c4c1cbbc7d 订单Vo补充。 但星霖 2022-05-31 14:18:33 +0800
  • 55dc415d7c 干掉没用的变量 kuang.yifei@iwhalecloud.com 2022-05-31 13:57:37 +0800
  • 6c88cd78f9 多级分销+平台扣点+截留扣点生成细单 kuang.yifei@iwhalecloud.com 2022-05-30 15:40:57 +0800
  • b074e3fbce 通过枚举替换if-else kuang.yifei@iwhalecloud.com 2022-05-30 11:01:32 +0800
  • f5202904f9 解决回调的部分，改为策略模式 kuang.yifei@iwhalecloud.com 2022-05-30 10:42:40 +0800
  • feb38f18c3 修复回调部分东西 kuang.yifei@iwhalecloud.com 2022-05-29 19:22:12 +0800
  • e961916a6b mapper部分格式问题 kuang.yifei@iwhalecloud.com 2022-05-29 17:52:49 +0800
  • 7b289e435c 消费者下单，商品发布，商品详情接口 kuang.yifei@iwhalecloud.com 2022-05-28 15:41:42 +0800
  • 43496cdd94 Merge branch 'master' of https://gitee.com/op-souls/ghy-all clunt 2022-05-27 11:18:28 +0800
  • 1bc5946a49 消费者银行卡查询+师傅银行卡查询 clunt 2022-05-27 11:18:06 +0800
  • a742333647 Merge remote-tracking branch 'origin/master' HH 2022-05-27 11:13:03 +0800
  • 04b8c0637c 支付与回调保存支付记录 修改财务单状态 HH 2022-05-27 11:12:54 +0800
  • 020e8a7676 师傅注册adapay用户，以及绑定银行卡 clunt 2022-05-27 10:29:54 +0800
  • af8bfa5a4c 师傅注册adapay用户，以及绑定银行卡 clunt 2022-05-27 10:00:16 +0800
  • 70872cbb1f Merge remote-tracking branch 'origin/master' HH 2022-05-26 21:12:52 +0800
  • 3e3a66b3f4 主财务单表增加 payment_id HH 2022-05-26 21:12:20 +0800
  • d532c3757e 暂时去掉订单查询接口的权限限制 donqi 2022-05-26 20:35:08 +0800
  • f5fdb55476 创建 Adapay 实名账户时先判断账户是否存在 HH 2022-05-26 19:55:51 +0800
  • 76e0093428 银行卡取错字段 clunt 2022-05-26 16:16:01 +0800
  • 2472d265bd 银行卡取错字段 clunt 2022-05-26 16:09:30 +0800
  • ab81da724f Merge branch 'master' of https://gitee.com/op-souls/ghy-all clunt 2022-05-26 15:47:35 +0800
  • 5f1a5aa29e 改为true clunt 2022-05-26 15:47:21 +0800
  • b491e7d9d7 Adapay 多商户模式需要指定 merchant_key HH 2022-05-26 15:35:42 +0800
  • acbf0a6e95 fix clunt 2022-05-26 15:08:52 +0800
  • 0aefc0cb95 Merge branch 'master' of https://gitee.com/op-souls/ghy-all clunt 2022-05-26 14:44:19 +0800
  • 7d6b6bda97 fix clunt 2022-05-26 14:44:06 +0800
  • f63ba73cd3 合并代码出错 HH 2022-05-26 11:27:12 +0800
  • 6fd119b2aa Merge remote-tracking branch 'origin/master' HH 2022-05-26 11:23:37 +0800
  • 7e03b61ab1 修改一下 Adapay member_id 的生成方式 HH 2022-05-26 11:21:48 +0800
  • 419f2a907a 师傅银行卡表+唯一memberId生成 clunt 2022-05-26 11:04:14 +0800
  • 5de6f3e79d 银行卡绑定 clunt 2022-05-26 11:01:04 +0800
  • 763b4d9202 师傅服务区域和师傅技能表 clunt 2022-05-26 10:42:30 +0800
  • 604e7bc703 Merge branch 'master' of https://gitee.com/op-souls/ghy-all clunt 2022-05-26 10:38:36 +0800
  • c237039206 部分pom问题 clunt 2022-05-26 10:38:00 +0800
  • cb00f25c00 师傅派单给其他师傅 HH 2022-05-26 10:15:51 +0800
  • 3a8ab950ac 财务子单mapper HH 2022-05-25 11:48:07 +0800
  • 014a9ae814 Merge remote-tracking branch 'origin/master' HH 2022-05-24 22:26:39 +0800
  • f459d3fc9c 生成财务主单和财务子单 HH 2022-05-24 22:26:26 +0800
  • a1d370b170 Merge branch 'master' of https://gitee.com/op-souls/ghy-all clunt 2022-05-24 14:38:18 +0800
  • 4b75257368 部分pom问题 clunt 2022-05-24 14:38:13 +0800
  • 03cd7ff503 修改用户帐号和手机号 问题修复 donqi 2022-05-24 13:50:09 +0800
  • 03cc3cd3be 手机号授权+消费者/师傅手机号更新 clunt 2022-05-24 11:42:00 +0800
  • d9de7f85f5 手机号授权 clunt 2022-05-23 18:02:18 +0800
  • b1dff3834d 少判断条件 clunt 2022-05-23 17:13:38 +0800
  • 000af7f7da 师傅端登陆 注册 clunt 2022-05-23 14:28:37 +0800
  • d995af8dfe 小程序、公众号支付调整 clunt 2022-05-23 10:36:06 +0800
  • c0249bd8cc 层级 clunt 2022-05-23 10:08:05 +0800