Commit Graph

63 Commits

Author SHA1 Message Date
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
clunt 20a02c586b 下单并生成主单 2022-05-12 10:28:29 +08:00
clunt 2f08e0be4d 下单并生成主单 2022-05-12 10:17:43 +08:00
clunt 77c17aa0bd 下单并生成主单 2022-05-12 10:15:35 +08:00
yangdanqi 83be387381 Merge branch 'master' of https://gitee.com/op-souls/ghy-all 2022-05-12 09:42:50 +08:00
HH 2c5da04cc1 Merge remote-tracking branch 'origin/master' 2022-05-11 20:10:10 +08:00
HH 9f111529de 支付调整 2022-05-11 20:10:00 +08:00
clunt c5eab16b9d 将分销对应关系存储到用户表
订单环节部分
接口请求对象封装
2022-05-11 17:35:13 +08:00
yangdanqi b84cc19a3c 支持分页header参数+小程序端商城list 2022-05-10 23:06:04 +08:00
HH 98fb2c2530 支付宝正扫支付API 2022-05-10 21:32:20 +08:00
HH b79756a488 商品页面OK 2022-05-10 20:54:51 +08:00
HH dc94c472cb 合并代码 2022-05-10 19:34:56 +08:00
HH 82f1cdbad6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java
#	ghy-goods/src/main/java/com/ghy/goods/service/impl/DeptGoodsCategoryServiceImpl.java
2022-05-10 19:27:14 +08:00
HH 79d0296406 商品列表、新增、删除 2022-05-10 19:22:45 +08:00
clunt f05e7914b3 小程序商城段首页类目 2022-05-10 16:02:27 +08:00
clunt ad7357aea7 解决分公司类目从总公司选取的功能 2022-05-10 11:11:50 +08:00
HH 052a74b038 微信小程序支付API 2022-05-09 23:11:42 +08:00
HH 20f8f204b2 dept category 2022-05-08 17:02:30 +08:00
clunt 097965d7a0 系统类目新增半成品 2022-05-07 17:16:36 +08:00
clunt 6a376310cf 系统类目管理总层级 2022-05-07 14:18:17 +08:00
clunt 5d3eacee0a 分公司使用类目 2022-05-06 14:32:42 +08:00
HH a00e9f6b96 创建实名用户、创建结算账户 2022-05-05 21:39:37 +08:00
clunt 2b6c510f42 订单初步模型+商品规格模块,以及平台扣款,分销设置 2022-05-05 16:47:11 +08:00
clunt b249bf73e1 商品模块 2022-05-05 14:35:48 +08:00
clunt 967cac5d8c 修改页面 2022-05-03 01:34:17 +08:00
clunt 51883bd34e 师傅端和部门关联 2022-05-03 01:24:54 +08:00
clunt b68a673796 师傅端模块 2022-05-03 01:06:23 +08:00
clunt 64d87f54bc 消费者模块 2022-05-02 16:31:54 +08:00
clunt 9fc238b20a 消费者模块首页 2022-05-02 14:48:15 +08:00
clunt bb5612143d 极光IM推送,消息聊天室功能开发 2022-04-29 09:32:34 +08:00
HH 51539c8011 主财务单、财务细单接口开发 2022-04-25 20:00:50 +08:00
HH 9b1132d171 主订单、详细订单接口开发 2022-04-25 17:06:55 +08:00
HH 51205df3c7 Merge remote-tracking branch 'origin/master' 2022-04-24 18:19:25 +08:00
HH eaa59ba9a1 支付接口增加分账参数 2022-04-24 18:19:14 +08:00
clunt fd140c6b3b 备案logo以及备案首页开发 2022-04-20 17:33:56 +08:00
clunt 4cb7e800ec 公众号支付 + 回调解析 + 配置文件补充 2022-04-12 10:06:42 +08:00
clunt 9956a2bd7d 公众号支付 + 回调解析 + 配置文件补充 2022-04-11 15:16:21 +08:00
clunt d11d8cb3f9 规范代码,去掉没用的注释 2022-04-11 10:37:58 +08:00
clunt eb8d4a8256 新增adapay的配置,以及微信公众号支付模型。 2022-04-11 10:35:53 +08:00
clunt 7fbee4f068 增加微信授权域名验证
完成微信公众号支付前半段
2022-04-10 18:26:49 +08:00
clunt f1618ce278 Shiro过滤掉wx相关接口拦截
微信token获取等接口开发完成
2022-04-10 17:32:21 +08:00