TaskSystem

mkm/TaskSystem

Fork 0

Commit Graph

Select branches

Hide Pull Requests

chenbo_dev

dev

dev_1201_newpay

dev_task

dev_towntask

feature

master

master-yajin-feature

master_旧

mkm

mkm-2

preview

zhangwei

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

e53d20a596 add:bugfix chenbo 2023-09-08 12:20:55 +08:00
178203bae6 add:使用通用的redis logic chenbo 2023-09-08 12:05:34 +08:00
8f3c044f41 add:封装通用的获取redis实例的logic chenbo 2023-09-08 12:03:44 +08:00
70ece3ed15 add:封装通用的获取redis实例的logic chenbo 2023-09-08 12:03:19 +08:00
b86c3a0390 add:封装通用的redis方法 chenbo 2023-09-08 11:45:14 +08:00
cfdc37810f add:redis chenbo 2023-09-08 11:38:00 +08:00
ef84d4afd7 add:redis chenbo 2023-09-08 11:36:03 +08:00
5ea2d88044 add:redis chenbo 2023-09-08 11:29:18 +08:00
47b092b494 add:redis chenbo 2023-09-08 11:26:17 +08:00
d220c90529 add:企业认证时增加异步回调通知标记，定时任务监听回调是否超时，超时则记录日志。 chenbo_dev chenbo 2023-09-08 11:13:27 +08:00
849119e15c 修复任务交易列表错误 mkm 2023-09-08 10:25:10 +08:00
dadab9f08e Merge branch 'master' of https://gitea.lihaink.cn/mkm/TaskSystem into mkm mkm 2023-09-08 09:46:17 +08:00
344a60a7f8 Merge pull request '更新 app/common/logic/task/TaskLogic.php' (#27) from dev into master mkm 2023-09-07 21:16:02 +08:00
15e4f8f6fa 更新 app/common/logic/task/TaskLogic.php mkm 2023-09-07 21:14:35 +08:00
63f1dcc4c0 Merge pull request '更新 app/common/logic/task/TaskLogic.php' (#26) from dev into master mkm 2023-09-07 21:12:37 +08:00
89e789ca19 更新 app/common/logic/task/TaskLogic.php mkm 2023-09-07 21:12:15 +08:00
de91da0904 Merge pull request '合并更新' (#25) from dev into master mkm 2023-09-07 20:54:10 +08:00
01d0fcacbf 更新 app/common/logic/task/TaskLogic.php mkm 2023-09-07 20:52:28 +08:00
d0dcded2f9 add:1.企业实名认证改为根据异步回调认证，如果失败记录认证失败原因。 chenbo 2023-09-07 19:06:35 +08:00
36b32cbf31 修复任务天数记录问题 shengchanzhe 2023-09-07 19:01:08 +08:00
edc20b92bd Merge pull request '修改回调' (#24) from mkm into dev mkm 2023-09-07 18:04:25 +08:00
fb663fef31 修改回调 mkm 2023-09-07 18:03:49 +08:00
20abbed208 add:1.企业实名认证时即做人脸识别上传校验，返回人脸识别地址后发短信通知公司法人做人脸识别。 chenbo 2023-09-07 16:42:35 +08:00
1959359a45 Merge branch 'dev' into chenbo_dev chenbo 2023-09-07 16:20:58 +08:00
b31b69a4d0 add:1.企业实名认证时即做人脸识别上传校验，返回人脸识别地址后发短信通知公司法人做人脸识别。 chenbo 2023-09-07 16:20:26 +08:00
3aab67fa92 Merge pull request 'patch' (#23) from zhangwei into dev weiz 2023-09-07 15:45:10 +08:00
676f479b74 patch unknown 2023-09-07 15:44:38 +08:00
1522bb99f3 Merge pull request '修复任务排序区域经理显示其他公司问题' (#22) from mkm into dev mkm 2023-09-07 15:35:37 +08:00
a3cc42524d 修复任务排序区域经理显示其他公司问题 mkm 2023-09-07 15:27:14 +08:00
681087341d Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-09-07 15:19:19 +08:00
40121a4603 add:1.企业实名认证时加上法人身份证，方便后续签约时可用人脸识别，预留手机号后续可能使用短信验证。2.公司创建时即短信告知公司法人作人脸识别 chenbo 2023-09-07 15:18:57 +08:00
e06d777a8a Merge pull request '更新信息更新错误和时间问题' (#21) from mkm into dev mkm 2023-09-07 14:52:52 +08:00
8297752d06 更新信息更新错误和时间问题 mkm 2023-09-07 14:50:16 +08:00
07805cf444 Merge pull request 'patch' (#20) from zhangwei into dev weiz 2023-09-07 14:14:30 +08:00
6c3915f606 patch unknown 2023-09-07 14:12:58 +08:00
64c6dcf868 Merge pull request 'patch' (#19) from zhangwei into dev weiz 2023-09-07 14:07:14 +08:00
09a30c0b5f patch unknown 2023-09-07 14:06:42 +08:00
f112d64468 Merge pull request '上传自有车辆图片' (#18) from zhangwei into dev weiz 2023-09-07 13:40:51 +08:00
50228d0968 上传自有车辆图片 unknown 2023-09-07 13:39:28 +08:00
d8c32c0467 Merge pull request 'patch' (#17) from zhangwei into dev weiz 2023-09-07 10:44:43 +08:00
9ecbaf6339 patch unknown 2023-09-07 10:44:14 +08:00
e4cffb8455 Merge pull request 'master' (#16) from master into dev weiz 2023-09-07 10:41:03 +08:00
11e35dd1f1 Merge pull request '修改租赁车辆选择功能3' (#15) from zhangwei into master weiz 2023-09-07 10:24:50 +08:00
b1a3827ba8 修改租赁车辆选择功能3 unknown 2023-09-07 10:24:13 +08:00
b2c9fff1f1 Merge pull request '修改租赁车辆选择功能2' (#14) from zhangwei into master weiz 2023-09-07 10:09:44 +08:00
77c8ed63dd 修改租赁车辆选择功能2 unknown 2023-09-07 10:09:11 +08:00
4bd5427158 更新小队和结算的types3的屏蔽 mkm 2023-09-07 10:05:30 +08:00
6e8408a490 Merge branch 'chenbo_dev' into dev chenbo 2023-09-07 09:47:38 +08:00
ce3c0ce52f add:1.生成合同，甲方公司不是平台公司时，需要满足与平台公司或上级公司签过合同才能签约。2.带上签约时的验证方式为人脸识别及其阈值。3.添加或编辑公司时，主联系人手机号不能重复使用 chenbo 2023-09-07 09:46:54 +08:00
8931b074de Merge pull request '修改租赁车辆选择功能' (#13) from zhangwei into master weiz 2023-09-07 09:43:25 +08:00
0a11fef3d8 修改租赁车辆选择功能 unknown 2023-09-07 09:41:53 +08:00
becb8c8386 注释 chenbo 2023-09-06 14:49:01 +08:00
b8a04841f9 注释 chenbo 2023-09-06 14:48:03 +08:00
69eb834d95 注释 chenbo 2023-09-06 14:46:33 +08:00
51d4b4c9a2 注释 chenbo 2023-09-06 14:27:11 +08:00
fec7a7f2c6 Merge remote-tracking branch 'origin/master' chenbo 2023-09-06 13:51:29 +08:00
47d5802d89 add:合同详情接口新增字段：已签约合同地址 chenbo 2023-09-06 13:51:01 +08:00
0295ec0ec3 更新 mkm 2023-09-06 11:44:43 +08:00
96d2cd23be update:生成合同时，校验甲方公司是否有过签约 chenbo 2023-09-06 11:01:26 +08:00
2365a4ce5c Merge remote-tracking branch 'origin/master' chenbo 2023-09-06 10:36:46 +08:00
62faa8ee76 update:生成合同时，校验甲方公司是否有过签约 chenbo 2023-09-06 10:36:26 +08:00
349403507d Merge branch 'master' of https://gitea.lihaink.cn/mkm/TaskSystem mkm 2023-09-06 10:04:22 +08:00
942613d0cf 修复报错 mkm 2023-09-06 10:04:21 +08:00
3c80dcad81 Merge pull request '新增镇街合同列表，发起合同，重发短信接口' (#12) from zhangwei into master weiz 2023-09-06 09:50:08 +08:00
8f47f0fc11 新增镇街合同列表，发起合同，重发短信接口 unknown 2023-09-06 09:49:18 +08:00
e095e297ec 修复错误 mkm 2023-09-06 09:36:41 +08:00
8a15d58f90 Merge pull request 'update' (#11) from zhangwei into master weiz 2023-09-05 17:47:05 +08:00
7304ec1e3f update unknown 2023-09-05 17:46:03 +08:00
77198f43bb Merge pull request 'update' (#10) from zhangwei into master weiz 2023-09-05 17:31:12 +08:00
51e27ba429 update unknown 2023-09-05 17:30:53 +08:00
59ceb976f6 修复编辑的错误 mkm 2023-09-05 17:05:53 +08:00
5209382fd4 Merge pull request 'update' (#9) from zhangwei into master weiz 2023-09-05 17:03:34 +08:00
62ddcd3611 update unknown 2023-09-05 17:00:23 +08:00
0f84515d55 Merge pull request 'update' (#8) from zhangwei into master weiz 2023-09-05 16:53:04 +08:00
606802c0be update unknown 2023-09-05 16:51:57 +08:00
211d8cba73 更新pc页面 mkm 2023-09-05 16:39:15 +08:00
733a9527b1 更新 mkm 2023-09-05 16:34:14 +08:00
48abd16af8 修复错误 mkm 2023-09-05 15:52:55 +08:00
07bccac83b 更新任务结算和下发 mkm 2023-09-05 15:52:01 +08:00
9398bf0843 Merge pull request 'update' (#7) from zhangwei into master weiz 2023-09-05 15:06:45 +08:00
6196c10e56 update unknown 2023-09-05 15:04:58 +08:00
79ac7be63f Merge pull request 'chenbo_dev_0904' (#6) from chenbo_dev_0904 into master chenbo 2023-09-05 14:24:32 +08:00
d7981fdd94 Merge branch 'master' into chenbo_dev_0904 chenbo 2023-09-05 14:20:27 +08:00
73166302b7 修复问题 mkm 2023-09-05 14:08:11 +08:00
8c8b48baf5 Merge branch 'master' into chenbo_dev_0904 chenbo 2023-09-05 11:37:43 +08:00
f426d39c1d update:1.编辑公司时，加上更新主联系人身份证的逻辑。2.用户做完人脸识别后跳转到供销系统mobile首页 chenbo 2023-09-05 11:36:46 +08:00
9d1aa148b0 Merge pull request 'update' (#5) from zhangwei into master weiz 2023-09-05 11:13:04 +08:00
148cb72cf8 update unknown 2023-09-05 11:12:32 +08:00
1487f5d65d Merge pull request 'test' (#4) from zhangwei into master weiz 2023-09-05 10:25:47 +08:00
375d91e431 test unknown 2023-09-05 10:25:20 +08:00
5bb2db740a update:添加公司时，校验主联系人身份证不能为空 chenbo 2023-09-05 09:52:21 +08:00
73c8a70069 Merge pull request 'update' (#3) from zhangwei into master weiz 2023-09-04 21:10:49 +08:00
007f0f457b update unknown 2023-09-04 21:09:37 +08:00
1b475eeba4 jwt上传 mkm 2023-09-04 19:20:26 +08:00
4c3df34eec Merge branch 'master' into chenbo_dev_0904 chenbo 2023-09-04 17:50:15 +08:00
db7a68d449 add:企业人脸校验上传 chenbo 2023-09-04 17:48:08 +08:00
6fd3d2a925 更新pc mkm 2023-09-04 16:51:22 +08:00
e019982b9f 更新pc mkm 2023-09-04 16:51:16 +08:00
346a81e794 更新pc mkm 2023-09-04 16:51:01 +08:00
20557acb98 更新事件 mkm 2023-09-04 16:42:24 +08:00