Commit Graph

141 Commits

Author SHA1 Message Date
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
clunt 2fa74aa3db 补充热门字段 2022-05-19 16:51:34 +08:00
clunt f3eedeb667 用户登录的时候,校验用户是否已经注册,以及未注册的注册接口 2022-05-19 16:21:50 +08:00
clunt f1b54cd54b 用户登录的时候,校验用户是否已经注册,以及未注册的注册接口 2022-05-19 16:21:25 +08:00
clunt 8498005f11 fix 2022-05-17 22:13:47 +08:00
clunt ea564611d3 fix 2022-05-17 22:12:28 +08:00
clunt acfca23160 fix 2022-05-17 21:44:49 +08:00
HH 1c9f6d5d0a 生成财务主单 2022-05-17 21:41:29 +08:00
HH 90b45a05bc Merge remote-tracking branch 'origin/master' 2022-05-17 21:19:48 +08:00
HH 6230095ebe 生成商品订单 2022-05-17 21:19:41 +08:00
donqi fcc321303c Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-05-17 21:10:43 +08:00
donqi cfcc35df91 补充服务地址的查询字段 2022-05-17 21:10:10 +08:00
clunt b8a597b6b1 财务主单类型和时间格式 2022-05-17 21:08:19 +08:00
HH 9e31d58627 OrderGoods Mapper and Service 2022-05-17 20:51:43 +08:00
donqi 1a22ec11b6 新增地址controller补充对service的调用 2022-05-17 13:37:55 +08:00
clunt b1279ce060 省市区名称 2022-05-17 12:38:27 +08:00
clunt 5ac9576d43 参数 2022-05-17 11:28:19 +08:00
clunt 7bcb3e8c8e 接口统一返回 2022-05-17 00:05:50 +08:00
clunt 336e6ba297 消费者地址 2022-05-17 00:00:26 +08:00
clunt 7d5b57c303 订单商品 2022-05-16 22:35:25 +08:00
clunt 1f39b536d2 小程序支付openId的问题 2022-05-16 21:39:24 +08:00
clunt b5880f8c58 钱包+类目 2022-05-16 21:26:38 +08:00
donqi fbb96f42d7 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-05-16 10:25:00 +08:00
donqi 60682813f7 七牛云配置修改 2022-05-16 10:23:57 +08:00
HH 594e16a421 主订单页面 2022-05-15 14:37:20 +08:00
clunt 5537808ad6 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-05-13 10:27:19 +08:00
clunt ae11f0a82c 消费者地址接口 2022-05-13 10:27:08 +08:00
HH 6a0f942ac9 商品类目表Mapper缺少了category_sort字段映射 2022-05-13 09:32:53 +08:00
HH bd01807460 适用于延时分账场景的支付确认 2022-05-13 09:05:53 +08:00
HH 3cb9c512ac 分公司商品类目 2022-05-12 22:37:26 +08:00
clunt 22e2abc461 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-05-12 14:52:34 +08:00
clunt 0fd9842e97 回调接口为http接口 2022-05-12 14:52:18 +08:00
HH dacc4862e6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java
#	ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java
2022-05-12 14:47:22 +08:00
HH 6e9a7e361c 1.余额支付
2.支付参数整理
2022-05-12 14:44:42 +08:00
clunt ad88e1f374 wx pay 2022-05-12 14:35:10 +08:00
clunt 405b2d3361 wx pay 2022-05-12 14:32:42 +08:00
donqi 48425a25ce 测试修改 2022-05-12 14:30:06 +08:00
clunt 9dbeeab71f wx login 2022-05-12 14:13:52 +08:00
clunt d799293b5c wx login 2022-05-12 14:07:30 +08:00