From 5847c29f150c0cdb4932efd3d433fe65e60593a0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 一月 2024 13:54:20 +0800
Subject: [PATCH] 开发业务接口

---
 server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java                         |    1 
 server/service/src/main/java/com/doumee/core/utils/Constants.java                            |   53 ++++++++++---
 server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java |   21 ++++
 server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java              |    4 
 server/service/src/main/java/com/doumee/dao/business/model/Company.java                      |    4 
 server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java               |    5 +
 server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java      |    1 
 server/service/src/main/java/com/doumee/dao/business/model/Multifile.java                    |    4 
 server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java      |    5 
 server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java         |    4 
 company/src/views/business/insuranceApply.vue                                                |   98 +++++++++++++----------
 11 files changed, 135 insertions(+), 65 deletions(-)

diff --git a/company/src/views/business/insuranceApply.vue b/company/src/views/business/insuranceApply.vue
index 0b613b9..b51a383 100644
--- a/company/src/views/business/insuranceApply.vue
+++ b/company/src/views/business/insuranceApply.vue
@@ -3,18 +3,20 @@
         <!-- 鎼滅储琛ㄥ崟 -->
         <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
             <el-form-item label="淇濆崟鐘舵��" prop="status">
-                <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
+                <el-select v-model="searchForm.statusCollect" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
                     <el-option label="寰呭鎵�" value="0"></el-option>
-                    <el-option label="寰呭嚭鍗�" value="3"></el-option>
-                    <el-option label="淇濋殰涓�" value="5"></el-option>
-                    <el-option label="宸茶繃鏈�" value="8"></el-option>
-                    <el-option label="宸查��鍥�" value="7"></el-option>
+                    <el-option label="寰呭嚭鍗�" value="1"></el-option>
+                    <el-option label="淇濋殰涓�" value="2"></el-option>
+                    <el-option label="宸茶繃鏈�" value="3"></el-option>
+                    <el-option label="宸查��鍥�" value="4"></el-option>
+                    <el-option label="閫�鍥炵敵璇蜂腑" value="5"></el-option>
+                    <el-option label="宸插叧闂�" value="6"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="鎶曚繚浼佷笟" prop="companyId">
                 <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
                     <el-option
-                        v-for="item in options"
+                        v-for="item in companyList"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value">
@@ -24,7 +26,7 @@
             <el-form-item label="淇濋櫓鏂规" prop="solutionId">
                 <el-select v-model="searchForm.solutionId" placeholder="璇烽�夋嫨" @change="search">
                     <el-option
-                        v-for="item in options"
+                        v-for="item in solutionList"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value">
@@ -63,17 +65,19 @@
                 </el-table-column>
                 <el-table-column prop="status" label="鎶曚繚鐘舵��" min-width="100px">
                     <template slot-scope="{row}">
-                        <span v-if="row.status === 0">寰呭鏍�</span>
-                        <span v-if="row.status === 3">寰呭嚭鍗�</span>
-                        <span v-if="row.status === 5">淇濋殰涓�</span>
-                        <span v-if="row.status === 8">宸茶繃鏈�</span>
-                        <span v-if="row.status === 7">宸查��鍥�</span>
+                        <span v-if="row.statusCollect === 0">寰呭鏍�</span>
+                        <span v-if="row.statusCollect === 1">寰呭嚭鍗�</span>
+                        <span v-if="row.statusCollect === 2">淇濋殰涓�</span>
+                        <span v-if="row.statusCollect === 3">宸茶繃鏈�</span>
+                        <span v-if="row.statusCollect === 4">宸查��鍥�</span>
+                        <span v-if="row.statusCollect === 5">閫�鍥炵敵璇蜂腑</span>
+                        <span v-if="row.statusCollect === 6">宸插叧闂�</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="companyId" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
-                <el-table-column prop="solutionId" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
-                <el-table-column prop="createDate" label="鎶曚繚浜烘暟" min-width="100px"></el-table-column>
-                <el-table-column prop="createDate" label="鎬昏垂鐢紙鍏冿級" min-width="100px"></el-table-column>
+                <el-table-column prop="companyName" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
+                <el-table-column prop="solutionsName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
+                <el-table-column prop="insureNum" label="鎶曚繚浜烘暟" min-width="100px"></el-table-column>
+                <el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級" min-width="100px"></el-table-column>
                 <el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
                 <el-table-column
                     v-if="containPermissions(['business:insuranceapply:update', 'business:insuranceapply:delete'])"
@@ -99,33 +103,41 @@
 </template>
 
 <script>
-    import BaseTable from '@/components/base/BaseTable'
-    import TableLayout from '@/layouts/TableLayout'
-    import Pagination from '@/components/common/Pagination'
-    import OperaInsuranceApplyWindow from '@/components/business/OperaInsuranceApplyWindow'
-    export default {
-        name: 'InsuranceApply',
-        extends: BaseTable,
-        components: { TableLayout, Pagination, OperaInsuranceApplyWindow },
-        data () {
-            return {
-                // 鎼滅储
-                searchForm: {
-                    createDate: '',
-                    solutionId: '',
-                    companyId: '',
-                    status: ''
-                }
-            }
-        },
-        created () {
-            this.config({
-                module: '鎶曚繚鐢宠淇℃伅琛�',
-                api: '/business/insuranceApply',
-                'field.id': 'id',
-                'field.main': 'id'
-            })
-            this.search()
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import Pagination from '@/components/common/Pagination'
+import OperaInsuranceApplyWindow from '@/components/business/OperaInsuranceApplyWindow'
+export default {
+    name: 'InsuranceApply',
+    extends: BaseTable,
+    components: { TableLayout, Pagination, OperaInsuranceApplyWindow },
+    data () {
+        return {
+            // 鎼滅储
+            searchForm: {
+                createDate: '',
+                solutionId: '',
+                companyId: '',
+              statusCollect: ''
+            },
+          solutionList:[],
+          companyList:[]
         }
+    },
+    created () {
+        this.config({
+            module: '鎶曚繚鐢宠淇℃伅琛�',
+            api: '/business/insuranceApply',
+            'field.id': 'id',
+            'field.main': 'id'
+        })
+        this.search()
+        this.loadSelectList()
+    },
+  methods (){
+    loadSelectList(){
+
     }
+  }
+}
 </script>
diff --git a/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java b/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java
index 10980dd..13468a3 100644
--- a/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java
+++ b/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java
@@ -141,7 +141,6 @@
             }
         }
         LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions);
-
         // 楠岃瘉鐢ㄦ埛
         return new SimpleAuthenticationInfo(userInfo, user.getPassword(), this.getName());
     }
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 2325066..f09eabb 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -745,28 +745,30 @@
     }
 
     public  enum InsuranceApplyStatus {
-        UPLOAD(0, "鎻愪氦鎶曚繚",""),
-        PLATFORM_RETURN(1, "瀹℃牳涓嶉�氳繃","鎻愪氦鎰忚锛�${param}"),
-        WAIT_SIGNATURE(2, "宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔�",""),
-        SIGNATURE(3, "宸茬绔犲緟涓婁紶淇濋櫓鍗�",""),
-        FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�",""),
-        UPLOAD_INSURANCE(5, "淇濆崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param}鍙樻洿涓�${param1}"),
-        COMPANY_BACK_APPLY_UPLOAD(6, "浼佷笟鐢宠閫�鍥�(鎻愪氦鎶曚繚)","鎻愪氦鎰忚锛�${param}"),
-        COMPANY_BACK_APPLY_WAIT_SIGNATURE(7, "浼佷笟鐢宠閫�鍥�(寰呯绔�)","鎻愪氦鎰忚锛�${param}"),
-        COMPANY_BACK_APPLY_SIGNATURE(8, "浼佷笟鐢宠閫�鍥�(宸茬绔�)","鎻愪氦鎰忚锛�${param}"),
-        CLOSE(9, "璁㈠崟鍏抽棴",""),
-        PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃",""),
+        UPLOAD(0, "鎻愪氦鎶曚繚","",0),
+        PLATFORM_RETURN(1, "瀹℃牳涓嶉�氳繃","鎻愪氦鎰忚锛�${param}",4),
+        WAIT_SIGNATURE(2, "宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔�","",1),
+        SIGNATURE(3, "宸茬绔犲緟涓婁紶淇濋櫓鍗�","",1),
+        FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�","",0),
+        UPLOAD_INSURANCE(5, "淇濆崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param}鍙樻洿涓�${param1}",2),
+        COMPANY_BACK_APPLY_UPLOAD(6, "浼佷笟鐢宠閫�鍥�(鎻愪氦鎶曚繚)","鎻愪氦鎰忚锛�${param}",5),
+        COMPANY_BACK_APPLY_WAIT_SIGNATURE(7, "浼佷笟鐢宠閫�鍥�(寰呯绔�)","鎻愪氦鎰忚锛�${param}",5),
+        COMPANY_BACK_APPLY_SIGNATURE(8, "浼佷笟鐢宠閫�鍥�(宸茬绔�)","鎻愪氦鎰忚锛�${param}",5),
+        CLOSE(9, "璁㈠崟鍏抽棴","",6),
+        PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃","",1),
         ;
         // 鎴愬憳鍙橀噺
         private String name;
         private String info;
         private int key;
+        private int collectStatus;
 
         // 鏋勯�犳柟娉�
-        InsuranceApplyStatus(int key, String name,String info) {
+        InsuranceApplyStatus(int key, String name,String info,int collectStatus) {
             this.name = name;
             this.key = key;
             this.info = info;
+            this.collectStatus = collectStatus;
         }
 
         // 鏅�氭柟娉�
@@ -774,6 +776,25 @@
             for (InsuranceApplyStatus c : InsuranceApplyStatus.values()) {
                 if (c.getKey() == index) {
                     return c.name;
+                }
+            }
+            return null;
+        }
+        public static List<Integer> getKesByStatus(Integer collectStatus) {
+            List<Integer>  list = new ArrayList<>();
+            if(collectStatus!=null){
+                for (InsuranceApplyStatus c : InsuranceApplyStatus.values()) {
+                    if (Constants.equalsInteger(c.getCollectStatus() ,collectStatus)) {
+                        list.add(c.getKey());
+                    }
+                }
+            }
+            return list;
+        }
+        public static Integer getCollectStatus(Integer index) {
+            for (InsuranceApplyStatus c : InsuranceApplyStatus.values()) {
+                if (Constants.equalsInteger(c.getKey() , index)) {
+                    return c.collectStatus;
                 }
             }
             return null;
@@ -811,6 +832,14 @@
         public void setInfo(String info) {
             this.info = info;
         }
+
+        public int getCollectStatus() {
+            return collectStatus;
+        }
+
+        public void setCollectStatus(int collectStatus) {
+            this.collectStatus = collectStatus;
+        }
     }
 
     public static BigDecimal countDetailFee(Solutions solutions,Date startDate, Date endDate){
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java
index 0e3c827..6cbf09d 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java
@@ -1,6 +1,7 @@
 package com.doumee.dao.business.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.doumee.core.annotation.excel.ExcelColumn;
@@ -58,5 +59,6 @@
 
     @ApiModelProperty(value = "鍗冲皢澶辨晥璁㈠崟锛�0=鍚︼紱1=鏄�")
     private Integer loseEfficacy;
-
+    @ApiModelProperty(value = "鐘舵�� 0寰呭鎵� 1寰呭嚭鍗� 2淇濋殰涓�  3宸茶繃鏈� 4宸叉挙鍥� 5閫�鍥炵敵璇蜂腑 6宸插叧闂�", example = "1")
+    private Integer statusCollect;
 }
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Company.java b/server/service/src/main/java/com/doumee/dao/business/model/Company.java
index 9a19e07..c39b7f9 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -9,6 +9,8 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
@@ -20,7 +22,7 @@
 @Data
 @ApiModel("浼佷笟淇℃伅琛�")
 @TableName("`company`")
-public class Company {
+public class Company implements Serializable {
 
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
index c634acc..ed07e3a 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
@@ -9,6 +9,8 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
@@ -20,7 +22,7 @@
 @Data
 @ApiModel("浼佷笟鍙敤淇濋櫓鏂规鍏宠仈琛�")
 @TableName("`company_solution`")
-public class CompanySolution {
+public class CompanySolution implements Serializable {
 
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
index 3172fee..20ca2e1 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
@@ -170,6 +170,11 @@
     @ApiModelProperty(value = "澶勭悊浼佷笟鐢宠鐘舵��  0鍚屾剰 1椹冲洖")
     @TableField(exist = false)
     private int dealBackApply;
+    @ApiModelProperty(value = "鐘舵�� 0寰呭鎵� 1寰呭嚭鍗� 2淇濋殰涓�  3宸茶繃鏈� 4宸叉挙鍥� 5閫�鍥炵敵璇蜂腑 6宸插叧闂�", example = "1")
+    @TableField(exist = false)
+    private Integer statusCollect;
+
+
 
 
     public TaxesInvoicingVO getTaxesInvoicingVO(){
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java b/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
index a0fde81..c01e1a9 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
@@ -9,6 +9,8 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -19,7 +21,7 @@
 @Data
 @ApiModel("闄勪欢涓婁紶淇℃伅琛�")
 @TableName("`multifile`")
-public class Multifile {
+public class Multifile implements Serializable {
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "涓婚敭", example = "1")
     @ExcelColumn(name="涓婚敭")
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 a966bdd..063f9f1 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
@@ -757,16 +757,22 @@
         IPage<InsuranceApply> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
         MPJLambdaWrapper<InsuranceApply> queryWrapper = new MPJLambdaWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
+        List<Integer> statusList = Constants.InsuranceApplyStatus.getKesByStatus(pageWrap.getModel().getStatusCollect());
         queryWrapper.selectAll(InsuranceApply.class);
         queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName);
         queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName);
         queryWrapper.select(" DATEDIFF( t.END_TIME ,now()  ) AS loseEfficacyDays ");
         queryWrapper.select(" ( select count(1) from apply_detail ad  where ad.apply_id = t.id ) as insureNum");
-        queryWrapper.select(" ( select sum(td.fee) from taxes ts inner join tax_detial td on ts.TAX_ID = ts.id  where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ) as taxesMoney");
-        queryWrapper.select(" ( select td.CREATE_DATE from taxes ts inner join tax_detial td on ts.TAX_ID = ts.id  where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id order by td.CREATE_DATE desc limit 1 ) as taxesLast ");
+        queryWrapper.select(" ( select sum(td.fee) from taxes ts inner join tax_detial td on td.TAX_ID = ts.id  where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ) as taxesMoney");
+        queryWrapper.select(" ( select td.CREATE_DATE from taxes ts inner join tax_detial td on td.TAX_ID = ts.id  where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id order by td.CREATE_DATE desc limit 1 ) as taxesLast ");
         queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
         queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId);
         queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO);
+        queryWrapper.in(statusList.size()>0,InsuranceApply::getStatus,statusList);
+        if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.THREE) ){
+            queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
+            queryWrapper.lt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
+        }
         //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
         if(loginUserInfo.getType().equals(Constants.ONE)){
             queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
@@ -809,6 +815,17 @@
             }
         }
         PageData<InsuranceApply> pageData = PageData.from(insuranceApplyJoinMapper.selectJoinPage(page,InsuranceApply.class, queryWrapper));
+        if(pageData.getRecords()!=null){
+            for (InsuranceApply apply : pageData.getRecords()){
+                apply.setStatusCollect(Constants.InsuranceApplyStatus.getCollectStatus(apply.getStatus()));
+                if(Constants.equalsInteger(apply.getStatusCollect(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
+                    //濡傛灉宸插畬鎴�
+                    if(apply.getEndTime()==null || System.currentTimeMillis()>apply.getEndTime().getTime()){
+                        apply.setStatusCollect(Constants.THREE);//宸茶繃鏈�
+                    }
+                }
+            }
+        }
         return pageData;
     }
 
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
index 8b982d8..aa9a5d8 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
@@ -374,6 +374,7 @@
             }
         }
         PageData<Solutions> pageData = PageData.from(solutionsJoinMapper.selectJoinPage(page,Solutions.class, queryWrapper));
+
         return pageData;
     }
     @Override
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index ae3bc84..2f0c381 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -18,7 +18,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -58,7 +57,7 @@
         loginLog.setServerIp(Utils.Server.getIP());
         // 鏍¢獙楠岃瘉鐮�
         try {
-            if(debugModel){
+            if(!debugModel){
                 captchaService.check(dto.getUuid(), dto.getCode());
             }
         } catch (Exception e) {
@@ -100,7 +99,7 @@
         // 鏍¢獙楠岃瘉鐮�
         if(type!= Constants.TWO){
             try {
-                if(debugModel){
+                if(!debugModel){
                     SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,dto.getPhone(), dto.getCode());
                 }
             } catch (Exception e) {

--
Gitblit v1.9.3