kuang.yifei@iwhalecloud.com
|
7b289e435c
|
消费者下单，商品发布，商品详情接口
|
2022-05-28 15:41:42 +08:00 |
 clunt
|
43496cdd94
|
Merge branch 'master' of https://gitee.com/op-souls/ghy-all
|
2022-05-27 11:18:28 +08:00 |
|
clunt
|
1bc5946a49
|
消费者银行卡查询+师傅银行卡查询
|
2022-05-27 11:18:06 +08:00 |
HH
|
a742333647
|
Merge remote-tracking branch 'origin/master'
|
2022-05-27 11:13:03 +08:00 |
|
HH
|
04b8c0637c
|
支付与回调保存支付记录 修改财务单状态
|
2022-05-27 11:12:54 +08:00 |
|
clunt
|
020e8a7676
|
师傅注册adapay用户，以及绑定银行卡
|
2022-05-27 10:29:54 +08:00 |
|
clunt
|
af8bfa5a4c
|
师傅注册adapay用户，以及绑定银行卡
|
2022-05-27 10:00:16 +08:00 |
|
HH
|
70872cbb1f
|
Merge remote-tracking branch 'origin/master'
|
2022-05-26 21:12:52 +08:00 |
|
HH
|
3e3a66b3f4
|
主财务单表增加 payment_id
|
2022-05-26 21:12:20 +08:00 |
donqi
|
d532c3757e
|
暂时去掉订单查询接口的权限限制
|
2022-05-26 20:35:08 +08:00 |
|
HH
|
f5fdb55476
|
创建 Adapay 实名账户时先判断账户是否存在
|
2022-05-26 19:55:51 +08:00 |
|
clunt
|
76e0093428
|
银行卡取错字段
|
2022-05-26 16:16:01 +08:00 |
|
clunt
|
2472d265bd
|
银行卡取错字段
|
2022-05-26 16:09:30 +08:00 |
|
clunt
|
ab81da724f
|
Merge branch 'master' of https://gitee.com/op-souls/ghy-all
|
2022-05-26 15:47:35 +08:00 |
|
clunt
|
5f1a5aa29e
|
改为true
|
2022-05-26 15:47:21 +08:00 |
|
HH
|
b491e7d9d7
|
Adapay 多商户模式需要指定 merchant_key
|
2022-05-26 15:35:42 +08:00 |
|
clunt
|
acbf0a6e95
|
fix
|
2022-05-26 15:08:52 +08:00 |
|
clunt
|
0aefc0cb95
|
Merge branch 'master' of https://gitee.com/op-souls/ghy-all
|
2022-05-26 14:44:19 +08:00 |
|
clunt
|
7d6b6bda97
|
fix
|
2022-05-26 14:44:06 +08:00 |
|
HH
|
f63ba73cd3
|
合并代码出错
|
2022-05-26 11:27:12 +08:00 |
|
HH
|
6fd119b2aa
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ghy-common/src/main/java/com/ghy/common/utils/AdapayUtils.java
|
2022-05-26 11:23:37 +08:00 |
|
HH
|
7e03b61ab1
|
修改一下 Adapay member_id 的生成方式
|
2022-05-26 11:21:48 +08:00 |
|
clunt
|
419f2a907a
|
师傅银行卡表+唯一memberId生成
|
2022-05-26 11:04:14 +08:00 |
|
clunt
|
5de6f3e79d
|
银行卡绑定
|
2022-05-26 11:01:04 +08:00 |
|
clunt
|
763b4d9202
|
师傅服务区域和师傅技能表
|
2022-05-26 10:42:30 +08:00 |
|
clunt
|
604e7bc703
|
Merge branch 'master' of https://gitee.com/op-souls/ghy-all
|
2022-05-26 10:38:36 +08:00 |
|
clunt
|
c237039206
|
部分pom问题
|
2022-05-26 10:38:00 +08:00 |
|
HH
|
cb00f25c00
|
师傅派单给其他师傅
|
2022-05-26 10:15:51 +08:00 |
|
HH
|
3a8ab950ac
|
财务子单mapper
|
2022-05-25 11:48:07 +08:00 |
|
HH
|
014a9ae814
|
Merge remote-tracking branch 'origin/master'
|
2022-05-24 22:26:39 +08:00 |
|
HH
|
f459d3fc9c
|
生成财务主单和财务子单
|
2022-05-24 22:26:26 +08:00 |
|
clunt
|
a1d370b170
|
Merge branch 'master' of https://gitee.com/op-souls/ghy-all
|
2022-05-24 14:38:18 +08:00 |
|
clunt
|
4b75257368
|
部分pom问题
|
2022-05-24 14:38:13 +08:00 |
|
donqi
|
03cd7ff503
|
修改用户帐号和手机号 问题修复
|
2022-05-24 13:50:09 +08:00 |
|
clunt
|
03cc3cd3be
|
手机号授权+消费者/师傅手机号更新
|
2022-05-24 11:42:00 +08:00 |
|
clunt
|
d9de7f85f5
|
手机号授权
|
2022-05-23 18:02:18 +08:00 |
|
clunt
|
b1dff3834d
|
少判断条件
|
2022-05-23 17:13:38 +08:00 |
|
clunt
|
000af7f7da
|
师傅端登陆 注册
|
2022-05-23 14:28:37 +08:00 |
|
clunt
|
d995af8dfe
|
小程序、公众号支付调整
|
2022-05-23 10:36:06 +08:00 |
|
clunt
|
c0249bd8cc
|
层级
|
2022-05-23 10:08:05 +08:00 |
|
clunt
|
65b3680c49
|
微信密钥
|
2022-05-23 09:53:14 +08:00 |
|
HH
|
d0016e9d16
|
Adapay修改为多商户模式
|
2022-05-21 16:50:56 +08:00 |
|
clunt
|
e901ff18de
|
Merge branch 'master' of https://gitee.com/op-souls/ghy-all
|
2022-05-20 10:36:29 +08:00 |
|
clunt
|
585f294e52
|
新增银行卡+adapy注册关系
|
2022-05-20 10:36:09 +08:00 |
|
HH
|
c245e3d9b7
|
订单商品页
|
2022-05-19 21:40:00 +08:00 |
|
clunt
|
eaf042352e
|
Merge branch 'master' of https://gitee.com/op-souls/ghy-all
|
2022-05-19 19:31:22 +08:00 |
|
clunt
|
4be6e699d9
|
细单
|
2022-05-19 19:31:08 +08:00 |
|
HH
|
821b09ae01
|
财务主单列表页
|
2022-05-19 19:26:22 +08:00 |
|
donqi
|
86e03c7b2b
|
用户信息注册修改
|
2022-05-19 18:53:19 +08:00 |
|
clunt
|
dcc628e43c
|
获取用户信息
|
2022-05-19 17:29:53 +08:00 |