From c4a4786b5c93882aaded3164dc329e35b88eca5b Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 29 三月 2024 16:18:20 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/OperaWtbApplyShopWindow.vue | 4 ++--
company/src/api/business/insuranceApply.js | 5 ++---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 17 ++++++++++++-----
server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java | 6 +-----
company/.env.developmentCom | 2 +-
5 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index fd0d4ea..b9e8f99 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -15,4 +15,4 @@
# 骞冲彴绔�-钀嶅
# VUE_APP_API = 'http://192.168.0.105:10023/'
-VUE_APP_API = 'http://localhost:10032/'
+VUE_APP_API = 'http://192.168.0.176:10032/'
diff --git a/company/src/api/business/insuranceApply.js b/company/src/api/business/insuranceApply.js
index 5d9609b..df25333 100644
--- a/company/src/api/business/insuranceApply.js
+++ b/company/src/api/business/insuranceApply.js
@@ -63,9 +63,8 @@
return request.get(`business/insuranceApply/getSignLink/${id}`)
}
export function getSignTBQRSLink (data) {
- return request.post('/business/insuranceApply/getSignTBQRSLink', data, {
- trim: true
- })
+ // return request.get('/business/insuranceApply/signTBQRSLink')
+ return request.post('/business/insuranceApply/signTBQRSLink', data)
}
export function getMemberListOnlineSignLink (data) {
return request.post('/business/insuranceApply/getMemberListOnlineSignLink', data, {
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index d7ad881..96f358a 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -448,7 +448,7 @@
<div style="width: 100%; display: flex; align-items: center;">
<el-input v-model="form.code" placeholder="璇疯緭鍏�" v-trim/>
<el-button type="primary" style="margin-left: 15px;" @click="send" v-if="num === 0">鍙戦�侀獙璇佺爜</el-button>
- <el-button type="primary" style="margin-left: 15px;" v-else>{{num}}</el-button>
+ <el-button type="primary" style="margin-left: 15px;" v-else>{{num}}s</el-button>
</div>
</el-form-item>
</el-form>
@@ -638,7 +638,7 @@
},
send () {
sendSms({
- phone: this.form1.phone
+ phone: this.form.phone
}).then(res => {
this.num = 60
this.setTime()
diff --git a/server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java b/server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java
index 4260d43..a8180c8 100644
--- a/server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java
+++ b/server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java
@@ -152,22 +152,18 @@
}
-
@ApiOperation("鏂规纭涔︾绔犱笟鍔�")
- @PostMapping("/getSignTBQRSLink ")
+ @PostMapping("/signTBQRSLink")
@RequiresPermissions("business:insuranceapply:query")
public ApiResponse<String> getSignTBQRSLink(@RequestBody SmsCheckDTO smsCheckDTO) {
return ApiResponse.success(insuranceApplyService.getSignTBQRSLink(smsCheckDTO));
}
-
-
@ApiOperation("浜哄憳鍚嶅崟绛剧珷")
@PostMapping("/getMemberListOnlineSignLink")
@RequiresPermissions("business:insuranceapply:query")
public ApiResponse<String> getMemberListOnlineSignLink(@RequestBody SmsCheckDTO smsCheckDTO) {
return ApiResponse.success(insuranceApplyService.getMemberListOnlineSignLink(smsCheckDTO));
}
-
@ApiOperation("鎶曚繚鐢宠鍗曠绔犱笟鍔�")
@PostMapping("/getSignWTBTBDLink")
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index 9cc0e6a..795e597 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -1623,6 +1623,9 @@
}
public List<Integer> getCollectStatus(Integer collectStatus){
+ if(collectStatus ==null){
+ return new ArrayList<>();
+ }
List<Integer> statusList = Constants.InsuranceApplyStatus.getKesByStatus(collectStatus);
if(collectStatus.equals(Constants.ApplyCollectStatus.DCD)){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDCD.getKey()));
@@ -2184,9 +2187,9 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-
- smsEmailService.validateCode(smsCheckDTO.getCode());
-
+ if(!debugModel){
+ smsEmailService.validateCode(smsCheckDTO.getCode());
+ }
MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>()
.selectAll(InsuranceApply.class)
.selectAs(Solutions::getSignKeyword,InsuranceApply::getSignKeyword)
@@ -2282,7 +2285,9 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
//楠岃瘉 楠岃瘉鐮�
- smsEmailService.validateCode(smsCheckDTO.getCode());
+ if(!debugModel){
+ smsEmailService.validateCode(smsCheckDTO.getCode());
+ }
InsuranceApply model = this.queryApplyDetail(smsCheckDTO.getBusinessId());
if(Objects.isNull(model)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇繚鍗曚俊鎭�");
@@ -2343,7 +2348,9 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
//楠岃瘉 楠岃瘉鐮�
- smsEmailService.validateCode(smsCheckDTO.getCode());
+ if(!debugModel){
+ smsEmailService.validateCode(smsCheckDTO.getCode());
+ }
MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>()
.selectAll(InsuranceApply.class)
.selectAs(Solutions::getSignKeyword,InsuranceApply::getSignKeyword)
--
Gitblit v1.9.3