kuang.yifei@iwhalecloud.com
|
75590aa92b
|
补充消费者名称+意向服务时间
|
2022-06-09 16:04:46 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
0feed790ce
|
规范化订单商品表内关联字段，修改订单list接口
|
2022-06-09 15:11:02 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
6f37b29eb7
|
修改查询返回实体
|
2022-06-09 14:51:01 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
40e1761f38
|
Merge branch 'master' of https://gitee.com/op-souls/ghy-all
|
2022-06-09 14:31:42 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
05c0bcba80
|
查询主单
|
2022-06-09 14:31:36 +08:00 |
donqi
|
b6cd5e1516
|
修改主订单
|
2022-06-08 16:51:13 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
3078e8e4c6
|
查询返回订单编码
|
2022-06-08 14:54:19 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
940ac02bce
|
回调修改订单、财务单状态
|
2022-06-08 14:50:41 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
b0476d6bed
|
fix
|
2022-06-08 14:14:56 +08:00 |
|
donqi
|
d819f4fb0c
|
条件查询goods列表
|
2022-06-08 13:58:41 +08:00 |
HH
|
8dfb3f0002
|
特殊技能相关接口
|
2022-06-07 21:51:40 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
09cd31ec75
|
fix
|
2022-06-07 17:47:35 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
cb4852ba15
|
Merge branch 'master' of https://gitee.com/op-souls/ghy-all
|
2022-06-07 17:08:35 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
aef73ce907
|
fix
|
2022-06-07 17:08:25 +08:00 |
HH
|
ffc1d6c177
|
师傅服务类目接口
|
2022-06-07 16:37:06 +08:00 |
|
HH
|
b701516896
|
Merge remote-tracking branch 'origin/master'
|
2022-06-07 16:00:53 +08:00 |
|
HH
|
d2ed20b04d
|
师傅接单区域 Controller
|
2022-06-07 16:00:45 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
9a6b4b2e7d
|
消费者订单接口
|
2022-06-07 15:55:04 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
d0626c36b5
|
新增商城端-热门商品接口
|
2022-06-07 10:33:11 +08:00 |
|
donqi
|
87d81b0547
|
goods列表补全商品规格列表
|
2022-06-07 10:04:30 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
eb6d85e97c
|
新增商城端-热门类目接口
|
2022-06-06 17:52:00 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
8735f748d5
|
师傅端 更新师傅服务商、供应商
|
2022-06-06 13:53:11 +08:00 |
|
HH
|
830f8136cc
|
Merge remote-tracking branch 'origin/master'
|
2022-06-06 11:12:00 +08:00 |
|
HH
|
b688f0f525
|
分公司类目增加字段
|
2022-06-06 11:11:51 +08:00 |
|
donqi
|
f698f94c6a
|
问题修复
|
2022-06-06 10:58:00 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
54da5e3c98
|
新增商品信息
|
2022-06-02 14:37:13 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
399a1af0a8
|
小程序端订单+小程序端财务单
|
2022-06-01 23:45:50 +08:00 |
但星霖
|
807a2256a7
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialDetailMapper.java
# ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java
# ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java
|
2022-06-01 22:15:47 +08:00 |
|
但星霖
|
27b598c6d6
|
订单Vo数据/代码页面补充。
|
2022-06-01 22:14:02 +08:00 |
|
donqi
|
e44483498d
|
修改团队成员备注接口开发
|
2022-06-01 21:29:28 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
0212e22984
|
收入和支出统计
|
2022-06-01 18:11:29 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
fa166fa42b
|
fix import
|
2022-06-01 16:56:09 +08:00 |
|
HH
|
5c34b2ad56
|
Merge remote-tracking branch 'origin/master'
|
2022-06-01 16:30:01 +08:00 |
|
HH
|
2423fd9fe2
|
撤销支付接口
|
2022-06-01 16:29:52 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
9443a8ca24
|
Merge branch 'master' of https://gitee.com/op-souls/ghy-all
|
2022-06-01 16:21:09 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
4fbe5a0698
|
师傅团队
|
2022-06-01 16:20:50 +08:00 |
|
但星霖
|
4d9d30bde0
|
订单Vo数据/代码页面补充。
|
2022-06-01 15:48:19 +08:00 |
|
但星霖
|
ea52a9b469
|
订单Vo数据/代码页面补充。
|
2022-06-01 15:41:30 +08:00 |
|
但星霖
|
c448ab8a6d
|
Merge remote-tracking branch 'origin/master'
|
2022-06-01 14:51:09 +08:00 |
|
但星霖
|
07fde0c962
|
订单Vo数据/代码页面补充。
|
2022-06-01 14:50:58 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
2bb9d1ee0a
|
fix bug
|
2022-06-01 13:48:36 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
ca4773db99
|
批量发布商品+转派初版
|
2022-05-31 23:27:30 +08:00 |
|
HH
|
24a4872ccf
|
Merge remote-tracking branch 'origin/master'
|
2022-05-31 20:55:18 +08:00 |
|
HH
|
98bef1400a
|
1.撤销支付2.重新整理回调
|
2022-05-31 20:55:09 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
55dc415d7c
|
干掉没用的变量
|
2022-05-31 13:57:37 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
6c88cd78f9
|
多级分销+平台扣点+截留扣点生成细单
|
2022-05-30 15:40:57 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
f5202904f9
|
解决回调的部分，改为策略模式
|
2022-05-30 10:42:40 +08:00 |
|
kuang.yifei@iwhalecloud.com
|
feb38f18c3
|
修复回调部分东西
|
2022-05-29 19:22:12 +08:00 |
|
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 |
|
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 |
|
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
|
5de6f3e79d
|
银行卡绑定
|
2022-05-26 11:01:04 +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
|
4b75257368
|
部分pom问题
|
2022-05-24 14:38:13 +08:00 |
|
clunt
|
03cc3cd3be
|
手机号授权+消费者/师傅手机号更新
|
2022-05-24 11:42:00 +08:00 |
|
clunt
|
d9de7f85f5
|
手机号授权
|
2022-05-23 18:02:18 +08:00 |
|
clunt
|
000af7f7da
|
师傅端登陆 注册
|
2022-05-23 14:28:37 +08:00 |
|
clunt
|
d995af8dfe
|
小程序、公众号支付调整
|
2022-05-23 10:36:06 +08:00 |
|
clunt
|
65b3680c49
|
微信密钥
|
2022-05-23 09:53:14 +08:00 |
|
HH
|
d0016e9d16
|
Adapay修改为多商户模式
|
2022-05-21 16:50:56 +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
|
f3eedeb667
|
用户登录的时候，校验用户是否已经注册，以及未注册的注册接口
|
2022-05-19 16:21:50 +08:00 |
|
clunt
|
f1b54cd54b
|
用户登录的时候，校验用户是否已经注册，以及未注册的注册接口
|
2022-05-19 16:21:25 +08:00 |
|
HH
|
1c9f6d5d0a
|
生成财务主单
|
2022-05-17 21:41:29 +08:00 |
|
HH
|
6230095ebe
|
生成商品订单
|
2022-05-17 21:19:41 +08:00 |
|
donqi
|
1a22ec11b6
|
新增地址controller补充对service的调用
|
2022-05-17 13:37:55 +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
|
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 |
|
HH
|
ac5505b260
|
GoodsCategoryController
|
2022-03-20 16:32:35 +08:00 |
|
clunt
|
c901d276c9
|
新增部门配置模块
|
2022-03-18 15:04:01 +08:00 |
|
clunt
|
4dad73799e
|
新增区域模块controller层
|
2022-03-17 15:33:05 +08:00 |
|
clunt
|
e2ac70f656
|
商品模块问题修复
|
2022-03-17 14:54:11 +08:00 |
|
clunt
|
f650c0a833
|
解决用户不同公司登陆进来后，看到的数据不同
|
2022-03-15 14:30:05 +08:00 |
|
clunt
|
d7597eef12
|
新增七牛云功能
|
2022-03-14 16:56:11 +08:00 |
|
clunt
|
488d871fa4
|
修改swagger配置
|
2022-03-14 14:42:03 +08:00 |
|
clunt
|
cbd2cd2f54
|
新增商品模块所有可能用到的接口
|
2022-03-14 13:55:40 +08:00 |
|
clunt
|
2eaf01593d
|
修改为工圈子项目
|
2022-03-07 10:14:11 +08:00 |
|
clunt
|
7a66a5b9e4
|
修改首页部分不要菜单栏
|
2022-02-08 12:49:31 +08:00 |
|
clunt
|
a28f2d7188
|
清除不必要的文件
|
2022-02-08 12:26:36 +08:00 |
|
clunt
|
f92b41a614
|
修改配置文件
|
2022-02-08 12:24:52 +08:00 |
|
clunt
|
7396f45cca
|
初始话项目版本
|
2022-02-08 11:36:50 +08:00 |