审核/订单获取详细信息

src/main/java/com/izouma/awesomeadmin/dao/PersonalAuthenticationMapper.xml

@@ -16,6 +16,7 @@
                                 <result column="back_image" property="backImage" jdbcType="VARCHAR" />
                                 <result column="status_flag" property="statusFlag" jdbcType="INTEGER" />
                                 <result column="telephone" property="telephone" jdbcType="VARCHAR" />
+                                <result column="remark" property="remark" jdbcType="VARCHAR" />
             </resultMap>
     <sql id="Base_Column_List" >
         <trim  suffixOverrides="," >
@@ -47,6 +48,8 @@
 
             telephone,
 
+            remark,
+
             </trim>
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -103,6 +106,9 @@
             </if>
                 <if test="telephone!= null" >
                 telephone,
+            </if>
+                <if test="remark!= null" >
+                remark,
             </if>
             </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -147,6 +153,9 @@
             </if>
                     <if test="telephone != null" >
                 #{telephone,jdbcType=VARCHAR},
+            </if>
+                    <if test="remark != null" >
+                #{remark,jdbcType=VARCHAR},
             </if>
                 </trim>
     </insert>
@@ -194,6 +203,9 @@
             </if>
                      <if test="telephone != null" >
                telephone= #{telephone,jdbcType=VARCHAR},
+            </if>
+                     <if test="remark != null" >
+               remark= #{remark,jdbcType=VARCHAR},
             </if>
                  </set>
         where id = #{id,jdbcType=INTEGER}
@@ -243,6 +255,9 @@
             </if>
                      <if test="record.telephone != null and !&quot;&quot;.equals(record.telephone)">
                 and  telephone = #{record.telephone}
+            </if>
+                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and  remark = #{record.remark}
             </if>
                   <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
              <trim prefix="and (" suffix=")" prefixOverrides="OR" >
@@ -252,6 +267,7 @@
                                                                                                     OR  idcard LIKE concat('%',#{record.searchKey},'%')
                                                                                                                                                                                                                                       OR  status_flag LIKE concat('%',#{record.searchKey},'%')
                                                                                                     OR  telephone LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
                                                              </trim>
          </if>
 
@@ -305,7 +321,7 @@
             </trim>
             ,
         </if>
-        id desc
+        status_flag , id desc
     </select>
     <select id="queryAllPersonalAuthentication" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.PersonalAuthentication">
         select <include refid="Base_Column_List"/> from personal_authentication
@@ -352,6 +368,9 @@
             </if>
                     <if test="telephone != null and !&quot;&quot;.equals(telephone)">
                 and  telephone = #{telephone}
+            </if>
+                    <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and  remark = #{remark}
             </if>
                     <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR" >
@@ -361,6 +380,7 @@
                                                                                                                                                         OR  idcard LIKE concat('%',#{searchKey},'%')
                                                                                                                                                                                                                                                                                                                                                         OR  status_flag LIKE concat('%',#{searchKey},'%')
                                                                                                                                                         OR  telephone LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
                                                                                         </trim>
             </if>
 <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
@@ -413,7 +433,7 @@
             ,
         </if>
 
-        id desc
+        status_flag ,id desc
     </select>
     <select id="queryPersonalAuthentication" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.PersonalAuthentication">
         select <include refid="Base_Column_List"/> from personal_authentication
@@ -460,6 +480,9 @@
             </if>
                      <if test="telephone != null and !&quot;&quot;.equals(telephone)">
                 and telephone = #{telephone}
+            </if>
+                     <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
             </if>
          
         </where>
@@ -475,7 +498,7 @@
         select <include refid="Base_Column_List"/> from personal_authentication
         <where>
             and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    </where>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    </where>
         order by id desc
     </select>
 </mapper>

src/main/java/com/izouma/awesomeadmin/dao/StoreInfoMapper.java

@@ -29,5 +29,7 @@ public interface StoreInfoMapper{
     StoreInfo queryStoreInfo(StoreInfo record);
 
     List<StoreInfo> query(StoreInfo record);
+
+    int updateUseFlagByUserId(Map<String,Object> parameter);
 }
 

src/main/java/com/izouma/awesomeadmin/dao/StoreInfoMapper.xml

@@ -815,6 +815,21 @@
             AND id = #{id}
         </where>
     </update>
+    <update id="updateUseFlagByUserId">
+        UPDATE store_info
+        <set>
+            <if test="useFlag != null">
+                use_flag= #{useFlag},
+            </if>
+            <if test="typeFlag != null">
+                type_flag= #{typeFlag},
+            </if>
+        </set>
+        <where>
+            AND del_flag = 'N'
+            AND user_id = #{userId}
+        </where>
+    </update>
     <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.StoreInfo">
         select
         <include refid="Base_Column_List"/>

src/main/java/com/izouma/awesomeadmin/dao/UserOrderMapper.xml

@@ -361,8 +361,7 @@
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
-    <select id="queryUserOrderByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.UserOrder">
+    <select id="queryUserOrderByPage" parameterType="java.util.Map" resultMap="AllInfoForGetOne">
         select
         <include refid="Base_Column_List"/>
         from user_order

src/main/java/com/izouma/awesomeadmin/model/CompanyAuthentication.java

@@ -26,6 +26,7 @@ public class CompanyAuthentication{
     private Integer statusFlag;
     private String telephone;
     private String realName;
+    private String remark;
 
 private String searchKey;
 
@@ -165,6 +166,13 @@ private String orderByStr;
     public void setRealName(String realName){
         this.realName = realName;
     }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
 
 public String getSearchKey() {
     return searchKey;

src/main/java/com/izouma/awesomeadmin/model/PersonalAuthentication.java

@@ -22,6 +22,7 @@ public class PersonalAuthentication{
     private String backImage;
     private Integer statusFlag;
     private String telephone;
+    private String remark;
 
 private String searchKey;
 
@@ -133,6 +134,13 @@ private String orderByStr;
     public void setTelephone(String telephone){
         this.telephone = telephone;
     }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
 
 public String getSearchKey() {
     return searchKey;

src/main/java/com/izouma/awesomeadmin/service/CompanyAuthenticationService.java

@@ -1,14 +1,15 @@
 package com.izouma.awesomeadmin.service;
 
 import java.util.*;
+
 import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.model.CompanyAuthentication;
 
 
 /**
-*  service接口类
-*/
-public interface CompanyAuthenticationService{
+ * service接口类
+ */
+public interface CompanyAuthenticationService {
 
     List<CompanyAuthentication> getCompanyAuthenticationList(CompanyAuthentication record);
 
@@ -23,5 +24,9 @@ public interface CompanyAuthenticationService{
     boolean deleteCompanyAuthentication(String id);
 
     boolean updateCompanyAuthentication(CompanyAuthentication record);
+
+    boolean pass(CompanyAuthentication record);
+
+    boolean fail(CompanyAuthentication record);
 }
 

src/main/java/com/izouma/awesomeadmin/service/PersonalAuthenticationService.java

@@ -23,5 +23,9 @@ public interface PersonalAuthenticationService{
     boolean deletePersonalAuthentication(String id);
 
     boolean updatePersonalAuthentication(PersonalAuthentication record);
+
+    boolean pass(PersonalAuthentication record);
+
+    boolean fail(PersonalAuthentication record);
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/CompanyAuthenticationServiceImpl.java

@@ -1,52 +1,66 @@
 package com.izouma.awesomeadmin.service.impl;
 
-import java.util.*;
-import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dao.CompanyAuthenticationMapper;
+import com.izouma.awesomeadmin.dao.StoreInfoMapper;
+import com.izouma.awesomeadmin.dao.UserInfoMapper;
 import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.model.CompanyAuthentication;
+import com.izouma.awesomeadmin.model.UserInfo;
 import com.izouma.awesomeadmin.service.CompanyAuthenticationService;
-import com.izouma.awesomeadmin.dao.CompanyAuthenticationMapper;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
-*  service接口实现类
-*/
+ * service接口实现类
+ */
 @Service
-public class CompanyAuthenticationServiceImpl implements CompanyAuthenticationService{
+public class CompanyAuthenticationServiceImpl implements CompanyAuthenticationService {
 
     private static Logger logger = Logger.getLogger(CompanyAuthenticationServiceImpl.class);
 
     @Autowired
     private CompanyAuthenticationMapper companyAuthenticationMapper;
 
+    @Autowired
+    private UserInfoMapper userInfoMapper;
+
+    @Autowired
+    private StoreInfoMapper storeInfoMapper;
+
+
     @Override
     public List<CompanyAuthentication> getCompanyAuthenticationList(CompanyAuthentication record) {
 
         logger.info("getCompanyAuthenticationList");
         try {
 
-        return companyAuthenticationMapper.queryAllCompanyAuthentication(record);
+            return companyAuthenticationMapper.queryAllCompanyAuthentication(record);
         } catch (Exception e) {
-        logger.error("getCompanyAuthenticationList", e);
+            logger.error("getCompanyAuthenticationList", e);
         }
 
         return null;
     }
+
     @Override
     public List<CompanyAuthentication> getCompanyAuthenticationByPage(Page page, CompanyAuthentication record) {
 
         logger.info("getCompanyAuthenticationByPage");
         try {
 
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
 
-        return companyAuthenticationMapper.queryCompanyAuthenticationByPage(parameter);
+            return companyAuthenticationMapper.queryCompanyAuthenticationByPage(parameter);
         } catch (Exception e) {
-        logger.error("getCompanyAuthenticationByPage", e);
+            logger.error("getCompanyAuthenticationByPage", e);
         }
 
         return null;
@@ -60,7 +74,7 @@ public class CompanyAuthenticationServiceImpl implements CompanyAuthenticationSe
 
             return companyAuthenticationMapper.selectByPrimaryKey(Integer.valueOf(id));
         } catch (Exception e) {
-        logger.error("getCompanyAuthenticationById", e);
+            logger.error("getCompanyAuthenticationById", e);
         }
 
         return null;
@@ -74,7 +88,7 @@ public class CompanyAuthenticationServiceImpl implements CompanyAuthenticationSe
 
             return companyAuthenticationMapper.queryCompanyAuthentication(record);
         } catch (Exception e) {
-        logger.error("getCompanyAuthentication", e);
+            logger.error("getCompanyAuthentication", e);
         }
 
         return null;
@@ -89,7 +103,7 @@ public class CompanyAuthenticationServiceImpl implements CompanyAuthenticationSe
             int updates = companyAuthenticationMapper.insertSelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
             logger.error("createCompanyAuthentication", e);
@@ -104,13 +118,13 @@ public class CompanyAuthenticationServiceImpl implements CompanyAuthenticationSe
         logger.info("deleteCompanyAuthentication");
         try {
 
-             int updates = companyAuthenticationMapper.delete(id);
+            int updates = companyAuthenticationMapper.delete(id);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deleteCompanyAuthentication", e);
+            logger.error("deleteCompanyAuthentication", e);
         }
 
         return false;
@@ -125,10 +139,99 @@ public class CompanyAuthenticationServiceImpl implements CompanyAuthenticationSe
             int updates = companyAuthenticationMapper.updateByPrimaryKeySelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("updateCompanyAuthentication", e);
+            logger.error("updateCompanyAuthentication", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean pass(CompanyAuthentication record) {
+
+        logger.info("passCompanyAuthentication,通过开店申请");
+        try {
+
+            CompanyAuthentication companyAuthentication = companyAuthenticationMapper.selectByPrimaryKey(record.getId());
+
+            if (companyAuthentication != null) {
+
+                if (companyAuthentication.getStatusFlag() == 1) {
+                    return true;
+                }
+
+                UserInfo userInfo = new UserInfo();
+                userInfo.setId(companyAuthentication.getUserId());
+                userInfo.setApproveFlag("Y");
+                userInfo.setStoreFlag("Y");
+                userInfo.setCompanyFlag("Y");
+                userInfoMapper.updateByPrimaryKeySelective(userInfo);//更新用户状态。
+
+                Map<String, Object> parameter = new HashMap<String, Object>();
+                parameter.put("userId", companyAuthentication.getUserId());
+                parameter.put("useFlag", "Y");
+                parameter.put("typeFlag", 1);//企业店铺
+
+                storeInfoMapper.updateUseFlagByUserId(parameter);//更新店铺为可用
+
+                record.setStatusFlag(1);//通过
+                int updates = companyAuthenticationMapper.updateByPrimaryKeySelective(record);
+
+                if (updates > 0) {
+                    return true;
+                }
+            }
+
+
+        } catch (Exception e) {
+            logger.error("passCompanyAuthentication,通过开店申请异常", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean fail(CompanyAuthentication record) {
+
+        logger.info("failCompanyAuthentication,失败开店申请");
+        try {
+
+            CompanyAuthentication companyAuthentication = companyAuthenticationMapper.selectByPrimaryKey(record.getId());
+
+            if (companyAuthentication != null) {
+
+                if (companyAuthentication.getStatusFlag() == 0) {//审核中才能失败
+
+                    UserInfo userInfo = new UserInfo();
+                    userInfo.setId(companyAuthentication.getUserId());
+                    userInfo.setApproveFlag("N");
+                    userInfo.setStoreFlag("N");
+                    userInfo.setCompanyFlag("N");
+                    userInfoMapper.updateByPrimaryKeySelective(userInfo);//更新用户状态。
+
+                    Map<String, Object> parameter = new HashMap<String, Object>();
+                    parameter.put("userId", companyAuthentication.getUserId());
+                    parameter.put("useFlag", "N");
+                    parameter.put("typeFlag", 1);//企业店铺
+
+                    storeInfoMapper.updateUseFlagByUserId(parameter);//更新店铺为不可用
+
+                    record.setStatusFlag(2);//失败
+                    int updates = companyAuthenticationMapper.updateByPrimaryKeySelective(record);
+
+                    if (updates > 0) {
+                        return true;
+                    }
+                }
+
+
+            }
+
+
+        } catch (Exception e) {
+            logger.error("failCompanyAuthentication,失败开店申请异常", e);
         }
 
         return false;

src/main/java/com/izouma/awesomeadmin/service/impl/PersonalAuthenticationServiceImpl.java

@@ -1,6 +1,11 @@
 package com.izouma.awesomeadmin.service.impl;
 
 import java.util.*;
+
+import com.izouma.awesomeadmin.dao.StoreInfoMapper;
+import com.izouma.awesomeadmin.dao.UserInfoMapper;
+import com.izouma.awesomeadmin.model.StoreInfo;
+import com.izouma.awesomeadmin.model.UserInfo;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,42 +16,50 @@ import com.izouma.awesomeadmin.service.PersonalAuthenticationService;
 import com.izouma.awesomeadmin.dao.PersonalAuthenticationMapper;
 
 /**
-*  service接口实现类
-*/
+ * service接口实现类
+ */
 @Service
-public class PersonalAuthenticationServiceImpl implements PersonalAuthenticationService{
+public class PersonalAuthenticationServiceImpl implements PersonalAuthenticationService {
 
     private static Logger logger = Logger.getLogger(PersonalAuthenticationServiceImpl.class);
 
     @Autowired
     private PersonalAuthenticationMapper personalAuthenticationMapper;
 
+    @Autowired
+    private UserInfoMapper userInfoMapper;
+
+    @Autowired
+    private StoreInfoMapper storeInfoMapper;
+
+
     @Override
     public List<PersonalAuthentication> getPersonalAuthenticationList(PersonalAuthentication record) {
 
         logger.info("getPersonalAuthenticationList");
         try {
 
-        return personalAuthenticationMapper.queryAllPersonalAuthentication(record);
+            return personalAuthenticationMapper.queryAllPersonalAuthentication(record);
         } catch (Exception e) {
-        logger.error("getPersonalAuthenticationList", e);
+            logger.error("getPersonalAuthenticationList", e);
         }
 
         return null;
     }
+
     @Override
     public List<PersonalAuthentication> getPersonalAuthenticationByPage(Page page, PersonalAuthentication record) {
 
         logger.info("getPersonalAuthenticationByPage");
         try {
 
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
 
-        return personalAuthenticationMapper.queryPersonalAuthenticationByPage(parameter);
+            return personalAuthenticationMapper.queryPersonalAuthenticationByPage(parameter);
         } catch (Exception e) {
-        logger.error("getPersonalAuthenticationByPage", e);
+            logger.error("getPersonalAuthenticationByPage", e);
         }
 
         return null;
@@ -60,7 +73,7 @@ public class PersonalAuthenticationServiceImpl implements PersonalAuthentication
 
             return personalAuthenticationMapper.selectByPrimaryKey(Integer.valueOf(id));
         } catch (Exception e) {
-        logger.error("getPersonalAuthenticationById", e);
+            logger.error("getPersonalAuthenticationById", e);
         }
 
         return null;
@@ -74,7 +87,7 @@ public class PersonalAuthenticationServiceImpl implements PersonalAuthentication
 
             return personalAuthenticationMapper.queryPersonalAuthentication(record);
         } catch (Exception e) {
-        logger.error("getPersonalAuthentication", e);
+            logger.error("getPersonalAuthentication", e);
         }
 
         return null;
@@ -89,7 +102,7 @@ public class PersonalAuthenticationServiceImpl implements PersonalAuthentication
             int updates = personalAuthenticationMapper.insertSelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
             logger.error("createPersonalAuthentication", e);
@@ -104,13 +117,13 @@ public class PersonalAuthenticationServiceImpl implements PersonalAuthentication
         logger.info("deletePersonalAuthentication");
         try {
 
-             int updates = personalAuthenticationMapper.delete(id);
+            int updates = personalAuthenticationMapper.delete(id);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deletePersonalAuthentication", e);
+            logger.error("deletePersonalAuthentication", e);
         }
 
         return false;
@@ -125,10 +138,97 @@ public class PersonalAuthenticationServiceImpl implements PersonalAuthentication
             int updates = personalAuthenticationMapper.updateByPrimaryKeySelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
+            }
+        } catch (Exception e) {
+            logger.error("updatePersonalAuthentication", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean pass(PersonalAuthentication record) {
+
+        logger.info("passPersonalAuthentication,通过开店申请");
+        try {
+
+            PersonalAuthentication personalAuthentication = personalAuthenticationMapper.selectByPrimaryKey(record.getId());
+
+            if (personalAuthentication != null) {
+
+                if (personalAuthentication.getStatusFlag() == 1) {
+                    return true;
+                }
+
+                UserInfo userInfo = new UserInfo();
+                userInfo.setId(personalAuthentication.getUserId());
+                userInfo.setApproveFlag("Y");
+                userInfo.setStoreFlag("Y");
+                userInfoMapper.updateByPrimaryKeySelective(userInfo);//更新用户状态。
+
+                Map<String, Object> parameter = new HashMap<String, Object>();
+                parameter.put("userId", personalAuthentication.getUserId());
+                parameter.put("useFlag", "Y");
+                parameter.put("typeFlag", 2);//个人店铺
+
+                storeInfoMapper.updateUseFlagByUserId(parameter);//更新店铺为可用
+
+                record.setStatusFlag(1);//通过
+                int updates = personalAuthenticationMapper.updateByPrimaryKeySelective(record);
+
+                if (updates > 0) {
+                    return true;
+                }
             }
+
+
+        } catch (Exception e) {
+            logger.error("passPersonalAuthentication,通过开店申请异常", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean fail(PersonalAuthentication record) {
+
+        logger.info("failPersonalAuthentication,失败开店申请");
+        try {
+
+            PersonalAuthentication personalAuthentication = personalAuthenticationMapper.selectByPrimaryKey(record.getId());
+
+            if (personalAuthentication != null) {
+
+                if (personalAuthentication.getStatusFlag() == 0) {//审核中才能失败
+
+                    UserInfo userInfo = new UserInfo();
+                    userInfo.setId(personalAuthentication.getUserId());
+                    userInfo.setApproveFlag("N");
+                    userInfo.setStoreFlag("N");
+                    userInfoMapper.updateByPrimaryKeySelective(userInfo);//更新用户状态。
+
+                    Map<String, Object> parameter = new HashMap<String, Object>();
+                    parameter.put("userId", personalAuthentication.getUserId());
+                    parameter.put("useFlag", "N");
+                    parameter.put("typeFlag", 2);//个人店铺
+
+                    storeInfoMapper.updateUseFlagByUserId(parameter);//更新店铺为不可用
+
+                    record.setStatusFlag(2);//失败
+                    int updates = personalAuthenticationMapper.updateByPrimaryKeySelective(record);
+
+                    if (updates > 0) {
+                        return true;
+                    }
+                }
+
+
+            }
+
+
         } catch (Exception e) {
-             logger.error("updatePersonalAuthentication", e);
+            logger.error("failPersonalAuthentication,失败开店申请异常", e);
         }
 
         return false;

src/main/java/com/izouma/awesomeadmin/web/CompanyAuthenticationController.java

@@ -1,25 +1,28 @@
 package com.izouma.awesomeadmin.web;
 
-import java.util.*;
-
-import com.izouma.awesomeadmin.util.ExportExcelUtil;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresAuthentication;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
 import com.izouma.awesomeadmin.constant.AppConstant;
 import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.dto.Result;
 import com.izouma.awesomeadmin.model.CompanyAuthentication;
 import com.izouma.awesomeadmin.service.CompanyAuthenticationService;
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
-*  controller类
-*/
+ * controller类
+ */
 @Controller
 @RequestMapping("/companyAuthentication")
 public class CompanyAuthenticationController {
@@ -28,8 +31,8 @@ public class CompanyAuthenticationController {
     private CompanyAuthenticationService companyAuthenticationService;
 
     /**
-    * <p>获取全部记录。</p>
-    */
+     * <p>获取全部记录。</p>
+     */
     @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
@@ -39,8 +42,8 @@ public class CompanyAuthenticationController {
     }
 
     /**
-    * <p>根据Id。</p>
-    */
+     * <p>根据Id。</p>
+     */
     @RequestMapping(value = "/getCompanyAuthentication", method = RequestMethod.GET)
     @ResponseBody
     public Result getCompanyAuthentication(@RequestParam(required = false, value = "id") String id) {
@@ -49,8 +52,8 @@ public class CompanyAuthenticationController {
     }
 
     /**
-    * <p>根据条件获取。</p>
-    */
+     * <p>根据条件获取。</p>
+     */
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @ResponseBody
     public Result getOne(CompanyAuthentication record) {
@@ -60,14 +63,14 @@ public class CompanyAuthenticationController {
 
 
     /**
-    * <p>分页查询。</p>
-    */
+     * <p>分页查询。</p>
+     */
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, CompanyAuthentication record) {
         Map<String, Object> result = new HashMap<>();
 
-        List<CompanyAuthentication> pp =companyAuthenticationService.getCompanyAuthenticationByPage(page, record);
+        List<CompanyAuthentication> pp = companyAuthenticationService.getCompanyAuthenticationByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
@@ -76,94 +79,122 @@ public class CompanyAuthenticationController {
 
 
     /**
-    * <p>保存。</p>
-    */
+     * <p>保存。</p>
+     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(CompanyAuthentication record) {
         boolean num = companyAuthenticationService.createCompanyAuthentication(record);
         if (num) {
-        return new Result(true, record.getId());
+            return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>更新信息。</p>
-    */
+     * <p>更新信息。</p>
+     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateCompanyAuthentication(CompanyAuthentication record) {
         boolean num = companyAuthenticationService.updateCompanyAuthentication(record);
         if (num) {
-        return new Result(true, "保存成功");
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>删除。</p>
-    */
+     * <p>删除。</p>
+     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteCompanyAuthentication(@RequestParam(required = true, value = "id") String id) {
 
         boolean num = companyAuthenticationService.deleteCompanyAuthentication(id);
         if (num) {
-        return new Result(true, "删除成功");
+            return new Result(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
 
     /**
-    * 导出Excel
-    * @param request
-    * @param response
-    * @param record
-    * @throws Exception
-    */
+     * 导出Excel
+     *
+     * @param request
+     * @param response
+     * @param record
+     * @throws Exception
+     */
     @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
     @ResponseBody
     public void exportExcel(HttpServletRequest request, HttpServletResponse response, CompanyAuthentication record) throws Exception {
 
-    List<CompanyAuthentication> companyAuthentications = companyAuthenticationService.getCompanyAuthenticationList(record);
+        List<CompanyAuthentication> companyAuthentications = companyAuthenticationService.getCompanyAuthenticationList(record);
 
 
         String sheetName = "company_authentication";
         String titleName = "企业认证数据表";
         String fileName = "企业认证表";
-        int columnNumber = 18;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户ID" ,   "用户名" ,   "公司名" ,   "注册时间" ,   "工商注册号" ,   "证件" ,   "省" ,   "城市" ,   "国家" ,   "状态" ,   "电话" ,   "姓名"  };
-        String[][] dataList = new String[companyAuthentications.size()][18];
+        int columnNumber = 19;
+        int[] columnWidth = {20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20};
+        String[] columnName = {"", "删除标识", "更新时间", "更新人", "创建时间", "创建人", "用户ID", "用户名", "公司名", "注册时间", "工商注册号", "证件", "省", "城市", "国家", "状态", "电话", "姓名", "备注"};
+        String[][] dataList = new String[companyAuthentications.size()][19];
 
         for (int i = 0; i < companyAuthentications.size(); i++) {
 
-                        dataList[i][0] = String.valueOf(companyAuthentications.get(i).getId());
-                        dataList[i][1] = String.valueOf(companyAuthentications.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(companyAuthentications.get(i).getUpdateTime());
-                        dataList[i][3] = String.valueOf(companyAuthentications.get(i).getUpdateUser());
-                        dataList[i][4] = String.valueOf(companyAuthentications.get(i).getCreateTime());
-                        dataList[i][5] = String.valueOf(companyAuthentications.get(i).getCreateUser());
-                        dataList[i][6] = String.valueOf(companyAuthentications.get(i).getUserId());
-                        dataList[i][7] = String.valueOf(companyAuthentications.get(i).getUserName());
-                        dataList[i][8] = String.valueOf(companyAuthentications.get(i).getCompany());
-                        dataList[i][9] = String.valueOf(companyAuthentications.get(i).getCompanyTime());
-                        dataList[i][10] = String.valueOf(companyAuthentications.get(i).getBusinessNo());
-                        dataList[i][11] = String.valueOf(companyAuthentications.get(i).getCertificate());
-                        dataList[i][12] = String.valueOf(companyAuthentications.get(i).getProvince());
-                        dataList[i][13] = String.valueOf(companyAuthentications.get(i).getCity());
-                        dataList[i][14] = String.valueOf(companyAuthentications.get(i).getCountry());
-                        dataList[i][15] = String.valueOf(companyAuthentications.get(i).getStatusFlag());
-                        dataList[i][16] = String.valueOf(companyAuthentications.get(i).getTelephone());
-                        dataList[i][17] = String.valueOf(companyAuthentications.get(i).getRealName());
-                    }
+            dataList[i][0] = String.valueOf(companyAuthentications.get(i).getId());
+            dataList[i][1] = String.valueOf(companyAuthentications.get(i).getDelFlag());
+            dataList[i][2] = String.valueOf(companyAuthentications.get(i).getUpdateTime());
+            dataList[i][3] = String.valueOf(companyAuthentications.get(i).getUpdateUser());
+            dataList[i][4] = String.valueOf(companyAuthentications.get(i).getCreateTime());
+            dataList[i][5] = String.valueOf(companyAuthentications.get(i).getCreateUser());
+            dataList[i][6] = String.valueOf(companyAuthentications.get(i).getUserId());
+            dataList[i][7] = String.valueOf(companyAuthentications.get(i).getUserName());
+            dataList[i][8] = String.valueOf(companyAuthentications.get(i).getCompany());
+            dataList[i][9] = String.valueOf(companyAuthentications.get(i).getCompanyTime());
+            dataList[i][10] = String.valueOf(companyAuthentications.get(i).getBusinessNo());
+            dataList[i][11] = String.valueOf(companyAuthentications.get(i).getCertificate());
+            dataList[i][12] = String.valueOf(companyAuthentications.get(i).getProvince());
+            dataList[i][13] = String.valueOf(companyAuthentications.get(i).getCity());
+            dataList[i][14] = String.valueOf(companyAuthentications.get(i).getCountry());
+            dataList[i][15] = String.valueOf(companyAuthentications.get(i).getStatusFlag());
+            dataList[i][16] = String.valueOf(companyAuthentications.get(i).getTelephone());
+            dataList[i][17] = String.valueOf(companyAuthentications.get(i).getRealName());
+            dataList[i][18] = String.valueOf(companyAuthentications.get(i).getRemark());
+        }
 
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
+                columnNumber, columnWidth, columnName, dataList, response);
 
 
+    }
+
+    /**
+     * <p>审核通过。</p>
+     */
+    @RequestMapping(value = "/pass", method = RequestMethod.POST)
+    @ResponseBody
+    public Result pass(CompanyAuthentication record) {
+        boolean num = companyAuthenticationService.pass(record);
+        if (num) {
+            return new Result(true, "通过");
+        }
+        return new Result(false, "异常");
+    }
+
+    /**
+     * <p>审核失败。</p>
+     */
+    @RequestMapping(value = "/fail", method = RequestMethod.POST)
+    @ResponseBody
+    public Result fail(CompanyAuthentication record) {
+        boolean num = companyAuthenticationService.fail(record);
+        if (num) {
+            return new Result(true, "成功");
         }
+        return new Result(false, "异常");
     }
+}
 

src/main/java/com/izouma/awesomeadmin/web/PersonalAuthenticationController.java

@@ -18,8 +18,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
-*  controller类
-*/
+ * controller类
+ */
 @Controller
 @RequestMapping("/personalAuthentication")
 public class PersonalAuthenticationController {
@@ -28,8 +28,8 @@ public class PersonalAuthenticationController {
     private PersonalAuthenticationService personalAuthenticationService;
 
     /**
-    * <p>获取全部记录。</p>
-    */
+     * <p>获取全部记录。</p>
+     */
     @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
@@ -39,8 +39,8 @@ public class PersonalAuthenticationController {
     }
 
     /**
-    * <p>根据Id。</p>
-    */
+     * <p>根据Id。</p>
+     */
     @RequestMapping(value = "/getPersonalAuthentication", method = RequestMethod.GET)
     @ResponseBody
     public Result getPersonalAuthentication(@RequestParam(required = false, value = "id") String id) {
@@ -49,8 +49,8 @@ public class PersonalAuthenticationController {
     }
 
     /**
-    * <p>根据条件获取。</p>
-    */
+     * <p>根据条件获取。</p>
+     */
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @ResponseBody
     public Result getOne(PersonalAuthentication record) {
@@ -60,14 +60,14 @@ public class PersonalAuthenticationController {
 
 
     /**
-    * <p>分页查询。</p>
-    */
+     * <p>分页查询。</p>
+     */
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, PersonalAuthentication record) {
         Map<String, Object> result = new HashMap<>();
 
-        List<PersonalAuthentication> pp =personalAuthenticationService.getPersonalAuthenticationByPage(page, record);
+        List<PersonalAuthentication> pp = personalAuthenticationService.getPersonalAuthenticationByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
@@ -76,90 +76,120 @@ public class PersonalAuthenticationController {
 
 
     /**
-    * <p>保存。</p>
-    */
+     * <p>保存。</p>
+     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(PersonalAuthentication record) {
         boolean num = personalAuthenticationService.createPersonalAuthentication(record);
         if (num) {
-        return new Result(true, record.getId());
+            return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>更新信息。</p>
-    */
+     * <p>更新信息。</p>
+     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updatePersonalAuthentication(PersonalAuthentication record) {
         boolean num = personalAuthenticationService.updatePersonalAuthentication(record);
         if (num) {
-        return new Result(true, "保存成功");
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>删除。</p>
-    */
+     * <p>删除。</p>
+     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deletePersonalAuthentication(@RequestParam(required = true, value = "id") String id) {
 
         boolean num = personalAuthenticationService.deletePersonalAuthentication(id);
         if (num) {
-        return new Result(true, "删除成功");
+            return new Result(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
 
     /**
-    * 导出Excel
-    * @param request
-    * @param response
-    * @param record
-    * @throws Exception
-    */
+     * 导出Excel
+     *
+     * @param request
+     * @param response
+     * @param record
+     * @throws Exception
+     */
     @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
     @ResponseBody
     public void exportExcel(HttpServletRequest request, HttpServletResponse response, PersonalAuthentication record) throws Exception {
 
-    List<PersonalAuthentication> personalAuthentications = personalAuthenticationService.getPersonalAuthenticationList(record);
+        List<PersonalAuthentication> personalAuthentications = personalAuthenticationService.getPersonalAuthenticationList(record);
 
 
         String sheetName = "personal_authentication";
         String titleName = "个人认证数据表";
         String fileName = "个人认证表";
-        int columnNumber = 14;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户id" ,   "用户名" ,   "真实姓名" ,   "身份证号" ,   "正面" ,   "背面" ,   "状态" ,   "电话"  };
-        String[][] dataList = new String[personalAuthentications.size()][14];
+        int columnNumber = 15;
+        int[] columnWidth = {20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20};
+        String[] columnName = {"", "删除标识", "更新时间", "更新人", "创建时间", "创建人", "用户id", "用户名", "真实姓名", "身份证号", "正面", "背面", "状态", "电话", "备注"};
+        String[][] dataList = new String[personalAuthentications.size()][15];
 
         for (int i = 0; i < personalAuthentications.size(); i++) {
 
-                        dataList[i][0] = String.valueOf(personalAuthentications.get(i).getId());
-                        dataList[i][1] = String.valueOf(personalAuthentications.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(personalAuthentications.get(i).getUpdateTime());
-                        dataList[i][3] = String.valueOf(personalAuthentications.get(i).getUpdateUser());
-                        dataList[i][4] = String.valueOf(personalAuthentications.get(i).getCreateTime());
-                        dataList[i][5] = String.valueOf(personalAuthentications.get(i).getCreateUser());
-                        dataList[i][6] = String.valueOf(personalAuthentications.get(i).getUserId());
-                        dataList[i][7] = String.valueOf(personalAuthentications.get(i).getUserName());
-                        dataList[i][8] = String.valueOf(personalAuthentications.get(i).getRealName());
-                        dataList[i][9] = String.valueOf(personalAuthentications.get(i).getIdcard());
-                        dataList[i][10] = String.valueOf(personalAuthentications.get(i).getFaceImage());
-                        dataList[i][11] = String.valueOf(personalAuthentications.get(i).getBackImage());
-                        dataList[i][12] = String.valueOf(personalAuthentications.get(i).getStatusFlag());
-                        dataList[i][13] = String.valueOf(personalAuthentications.get(i).getTelephone());
-                    }
+            dataList[i][0] = String.valueOf(personalAuthentications.get(i).getId());
+            dataList[i][1] = String.valueOf(personalAuthentications.get(i).getDelFlag());
+            dataList[i][2] = String.valueOf(personalAuthentications.get(i).getUpdateTime());
+            dataList[i][3] = String.valueOf(personalAuthentications.get(i).getUpdateUser());
+            dataList[i][4] = String.valueOf(personalAuthentications.get(i).getCreateTime());
+            dataList[i][5] = String.valueOf(personalAuthentications.get(i).getCreateUser());
+            dataList[i][6] = String.valueOf(personalAuthentications.get(i).getUserId());
+            dataList[i][7] = String.valueOf(personalAuthentications.get(i).getUserName());
+            dataList[i][8] = String.valueOf(personalAuthentications.get(i).getRealName());
+            dataList[i][9] = String.valueOf(personalAuthentications.get(i).getIdcard());
+            dataList[i][10] = String.valueOf(personalAuthentications.get(i).getFaceImage());
+            dataList[i][11] = String.valueOf(personalAuthentications.get(i).getBackImage());
+            dataList[i][12] = String.valueOf(personalAuthentications.get(i).getStatusFlag());
+            dataList[i][13] = String.valueOf(personalAuthentications.get(i).getTelephone());
+            dataList[i][14] = String.valueOf(personalAuthentications.get(i).getRemark());
+        }
 
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
+                columnNumber, columnWidth, columnName, dataList, response);
+
+
+    }
 
 
+    /**
+     * <p>审核通过。</p>
+     */
+    @RequestMapping(value = "/pass", method = RequestMethod.POST)
+    @ResponseBody
+    public Result pass(PersonalAuthentication record) {
+        boolean num = personalAuthenticationService.pass(record);
+        if (num) {
+            return new Result(true, "通过");
+        }
+        return new Result(false, "异常");
+    }
+
+    /**
+     * <p>审核失败。</p>
+     */
+    @RequestMapping(value = "/fail", method = RequestMethod.POST)
+    @ResponseBody
+    public Result fail(PersonalAuthentication record) {
+        boolean num = personalAuthenticationService.fail(record);
+        if (num) {
+            return new Result(true, "成功");
         }
+        return new Result(false, "异常");
     }
 
+}
+

src/main/vue/src/pages/CompanyAuthentication.vue

@@ -37,6 +37,9 @@
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="realName" label="姓名">
                 <el-input v-model="formData.realName" :disabled="'realName'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                         <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
@@ -65,7 +68,7 @@
                 }).then(res => {
                     if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
                         this.formData = res.data;
 
                     if (this.$route.query.column) {
@@ -79,14 +82,14 @@
                 }
             }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
         data() {
             return {
                 saving: false,
                 formData: {},
                 rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
-                                                                                                                                                            subColumn: '',
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
+                                                                                                                                                                    subColumn: '',
             subValue: '',
         }
         },

src/main/vue/src/pages/CompanyAuthentications.vue

@@ -43,7 +43,15 @@
                     min-width="50"
                     align="center">
             </el-table-column>
-                                                                                                                                                                                                    
+                                                                                                                                            
+                                            <el-table-column
+                                v-if="isColumnShow('createTime')"
+                                prop="createTime"
+                                label="创建时间"
+                                :formatter="DateTimeFormatter"
+                                min-width="100">
+                        </el-table-column>
+                                                                                            
                                             <el-table-column
                                 v-if="isColumnShow('userId')"
                                 prop="userId"
@@ -131,6 +139,13 @@
                                 label="姓名"
                                 min-width="100">
                         </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark')"
+                                prop="remark"
+                                label="备注"
+                                min-width="100">
+                        </el-table-column>
                                                             <el-table-column
                     label="操作"
                     align="center"
@@ -273,7 +288,12 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                                                                                                                                                                                                        {
+                                label: '创建时间',
+                                value: 'createTime',
+                                show: true
+                            },
+                                                                                                                                            {
                                 label: '用户ID',
                                 value: 'userId',
                                 show: true
@@ -332,6 +352,11 @@
                                 label: '姓名',
                                 value: 'realName',
                                 show: true
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark',
+                                show: true
                             },
                                                             ],
                 multipleMode: false,
@@ -341,7 +366,11 @@
                 tableSortFields: [],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                                                                                                                                                                                                        {
+                                label: '创建时间',
+                                value: 'create_time'
+                            },
+                                                                                                                                            {
                                 label: '用户ID',
                                 value: 'user_id'
                             },
@@ -388,6 +417,10 @@
                                                                                                 {
                                 label: '姓名',
                                 value: 'real_name'
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark'
                             },
                                                             ],
                 advancedQuerySearchKey: '',

src/main/vue/src/pages/PersonalAuthentication.vue

@@ -20,11 +20,23 @@
                                                                                                                                                                                                                                                                                                                              <el-form-item prop="backImage" label="背面">
                  <single-upload v-model="formData.backImage" :disabled="'backImage'==subColumn"></single-upload>
              </el-form-item>
-                                                                                                                                                                                <el-form-item prop="statusFlag" label="状态">
-                <el-input v-model="formData.statusFlag" :disabled="'statusFlag'==subColumn"></el-input>
+                                                                                                                                                                                                                                                                                    <el-form-item prop="statusFlag" label="状态">
+                <template>
+                    <el-select v-model="formData.statusFlag" clearable  placeholder="请选择" :disabled="'statusFlag'==subColumn">
+                        <el-option
+                                v-for="item in statusFlagOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="telephone" label="电话">
+                                                                                                                                                                                                                        <el-form-item prop="telephone" label="电话">
                 <el-input v-model="formData.telephone" :disabled="'telephone'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                         <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
@@ -53,7 +65,7 @@
                 }).then(res => {
                     if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
                         this.formData = res.data;
 
                     if (this.$route.query.column) {
@@ -67,14 +79,15 @@
                 }
             }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                            },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
         data() {
             return {
                 saving: false,
                 formData: {},
                 rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                            },
-                                                                                                                            subColumn: '',
+                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
+                                                                                                                        statusFlagOptions:[{ label: '审核中', value: 0}, { label: '通过', value: 1 },{ label: '失败', value: 2 }],
+                                                subColumn: '',
             subValue: '',
         }
         },

src/main/vue/src/pages/PersonalAuthentications.vue

@@ -43,7 +43,15 @@
                     min-width="50"
                     align="center">
             </el-table-column>
-                                                                                                                                                                                                    
+                                                                                                                                            
+                                            <el-table-column
+                                v-if="isColumnShow('createTime')"
+                                prop="createTime"
+                                label="创建时间"
+                                :formatter="DateTimeFormatter"
+                                min-width="100">
+                        </el-table-column>
+                                                                                            
                                             <el-table-column
                                 v-if="isColumnShow('userId')"
                                 prop="userId"
@@ -107,6 +115,13 @@
                                 label="电话"
                                 min-width="100">
                         </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark')"
+                                prop="remark"
+                                label="备注"
+                                min-width="100">
+                        </el-table-column>
                                                             <el-table-column
                     label="操作"
                     align="center"
@@ -114,6 +129,8 @@
                     min-width="150"
             >
                 <template slot-scope="scope">
+                    <el-button @click="$router.push({path:'/StoreInfos',query:{column:scope.row.userId+',userId'}})" type="primary" size="small" plain>店铺
+            </el-button>
                             <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
@@ -249,7 +266,12 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                                                                                                                                                                                                        {
+                                label: '创建时间',
+                                value: 'createTime',
+                                show: true
+                            },
+                                                                                                                                            {
                                 label: '用户id',
                                 value: 'userId',
                                 show: true
@@ -288,6 +310,11 @@
                                 label: '电话',
                                 value: 'telephone',
                                 show: true
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark',
+                                show: true
                             },
                                                             ],
                 multipleMode: false,
@@ -297,7 +324,11 @@
                 tableSortFields: [],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                                                                                                                                                                                                        {
+                                label: '创建时间',
+                                value: 'create_time'
+                            },
+                                                                                                                                            {
                                 label: '用户id',
                                 value: 'user_id'
                             },
@@ -328,6 +359,10 @@
                                                                                                 {
                                 label: '电话',
                                 value: 'telephone'
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark'
                             },
                                                             ],
                 advancedQuerySearchKey: '',