Aslee 3 éve
szülő
commit
855a67f0fb

+ 3 - 3
src/main/java/com/caimei/controller/AuthApi.java

@@ -40,18 +40,18 @@ public class AuthApi {
             @ApiImplicitParam(name = "listType", required = false, value = "列表类型:1授权列表,2授权审核列表"),
             @ApiImplicitParam(name = "listType", required = false, value = "列表类型:1授权列表,2授权审核列表"),
             @ApiImplicitParam(name = "authUserId", required = true, value = "供应商用户id"),
             @ApiImplicitParam(name = "authUserId", required = true, value = "供应商用户id"),
             @ApiImplicitParam(name = "authParty", required = false, value = "授权机构"),
             @ApiImplicitParam(name = "authParty", required = false, value = "授权机构"),
+            @ApiImplicitParam(name = "status", required = false, value = "上线状态:0已下线,1已上线,2待上线"),
             @ApiImplicitParam(name = "auditStatus", required = false, value = "审核状态:0审核未通过,1审核通过,2待审核"),
             @ApiImplicitParam(name = "auditStatus", required = false, value = "审核状态:0审核未通过,1审核通过,2待审核"),
             @ApiImplicitParam(name = "lowerAuditStatus", required = false, value = "商品信息审核状态:0未完成审核,1已完成审核"),
             @ApiImplicitParam(name = "lowerAuditStatus", required = false, value = "商品信息审核状态:0未完成审核,1已完成审核"),
             @ApiImplicitParam(name = "pageNum", required = false, value = "第几页"),
             @ApiImplicitParam(name = "pageNum", required = false, value = "第几页"),
             @ApiImplicitParam(name = "pageSize", required = false, value = "一页多少条")
             @ApiImplicitParam(name = "pageSize", required = false, value = "一页多少条")
     })
     })
     @GetMapping("/list")
     @GetMapping("/list")
-    public ResponseJson<PageInfo<AuthVo>> getAuthList(Integer listType, Integer authUserId, String authParty, Integer auditStatus, Integer lowerAuditStatus,
+    public ResponseJson<PageInfo<AuthVo>> getAuthList(Integer listType, Integer authUserId, String authParty, Integer status, Integer auditStatus, Integer lowerAuditStatus,
                                                       @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                       @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
                                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
-        return authService.getAuthList(listType, authUserId, authParty, auditStatus, lowerAuditStatus, pageNum, pageSize);
+        return authService.getAuthList(listType, authUserId, authParty, status, auditStatus, lowerAuditStatus, pageNum, pageSize);
     }
     }
-
     /**
     /**
      * 更新授权状态
      * 更新授权状态
      */
      */

+ 1 - 1
src/main/java/com/caimei/mapper/AuthMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
 @Mapper
 @Mapper
 public interface AuthMapper {
 public interface AuthMapper {
 
 
-    List<AuthVo> getAuthList(@Param("listType") Integer listType, @Param("authUserId") Integer authUserId, @Param("authParty") String authParty, @Param("auditStatus") Integer auditStatus);
+    List<AuthVo> getAuthList(@Param("listType") Integer listType, @Param("authUserId") Integer authUserId, @Param("authParty") String authParty, @Param("status") Integer status, @Param("auditStatus") Integer auditStatus);
 
 
     void updateAuthStatusByAuthId(@Param("authId") Integer authId, @Param("status") Integer status);
     void updateAuthStatusByAuthId(@Param("authId") Integer authId, @Param("status") Integer status);
 
 

+ 2 - 1
src/main/java/com/caimei/service/AuthService.java

@@ -18,13 +18,14 @@ public interface AuthService {
      * @param listType   列表类型:1授权列表,2授权审核列表
      * @param listType   列表类型:1授权列表,2授权审核列表
      * @param authUserId 供应商用户id
      * @param authUserId 供应商用户id
      * @param authParty  授权机构
      * @param authParty  授权机构
+     * @param status    上线状态:0已下线,1已上线,2待上线
      * @param auditStatus  审核状态:0审核未通过,1审核通过,2待审核
      * @param auditStatus  审核状态:0审核未通过,1审核通过,2待审核
      * @param lowerAuditStatus  商品信息审核状态:0未完成审核,1已完成审核
      * @param lowerAuditStatus  商品信息审核状态:0未完成审核,1已完成审核
      * @param pageNum    第几页
      * @param pageNum    第几页
      * @param pageSize   一页多少条
      * @param pageSize   一页多少条
      * @return AuthVo
      * @return AuthVo
      */
      */
-    ResponseJson<PageInfo<AuthVo>> getAuthList(Integer listType, Integer authUserId, String authParty, Integer auditStatus, Integer lowerAuditStatus, Integer pageNum, Integer pageSize);
+    ResponseJson<PageInfo<AuthVo>> getAuthList(Integer listType, Integer authUserId, String authParty, Integer status, Integer auditStatus, Integer lowerAuditStatus, Integer pageNum, Integer pageSize);
 
 
     /**
     /**
      * 更新授权状态
      * 更新授权状态

+ 2 - 2
src/main/java/com/caimei/service/impl/AuthServiceImpl.java

@@ -39,13 +39,13 @@ public class AuthServiceImpl implements AuthService {
     }
     }
 
 
     @Override
     @Override
-    public ResponseJson<PageInfo<AuthVo>> getAuthList(Integer listType, Integer authUserId, String authParty, Integer auditStatus, Integer lowerAuditStatus, Integer pageNum, Integer pageSize) {
+    public ResponseJson<PageInfo<AuthVo>> getAuthList(Integer listType, Integer authUserId, String authParty, Integer status, Integer auditStatus, Integer lowerAuditStatus, Integer pageNum, Integer pageSize) {
         if (null == authUserId) {
         if (null == authUserId) {
             return ResponseJson.error("参数异常,请输入供应商用户id", null);
             return ResponseJson.error("参数异常,请输入供应商用户id", null);
         }
         }
         listType = null == listType ? 1 : listType;
         listType = null == listType ? 1 : listType;
         PageHelper.startPage(pageNum, pageSize);
         PageHelper.startPage(pageNum, pageSize);
-        List<AuthVo> authList = authMapper.getAuthList(listType, authUserId, authParty, auditStatus);
+        List<AuthVo> authList = authMapper.getAuthList(listType, authUserId, authParty, status, auditStatus);
         ListIterator<AuthVo> iterator = authList.listIterator();
         ListIterator<AuthVo> iterator = authList.listIterator();
         while (iterator.hasNext()) {
         while (iterator.hasNext()) {
             AuthVo auth = iterator.next();
             AuthVo auth = iterator.next();

+ 3 - 0
src/main/resources/mapper/AuthMapper.xml

@@ -40,6 +40,9 @@
         <if test="authParty != null and authParty != ''">
         <if test="authParty != null and authParty != ''">
             and a.authParty like CONCAT('%',#{authParty},'%')
             and a.authParty like CONCAT('%',#{authParty},'%')
         </if>
         </if>
+        <if test="status != null">
+            and a.status = #{status}
+        </if>
         <if test="auditStatus != null">
         <if test="auditStatus != null">
             and a.auditStatus = #{auditStatus}
             and a.auditStatus = #{auditStatus}
         </if>
         </if>