master：代发认证调整；
liujiang
parent
78f633d1f4
commit
7a4819fa64
|
|
@ -41,7 +41,7 @@ public class StoreProductStockController extends XktBaseController {
|
|||
|
||||
final IStoreProductStockService storeProdStockService;
|
||||
|
||||
@PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()")
|
||||
@PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store,seller,agent')||@ss.hasSupplierSubRole()")
|
||||
@ApiOperation(value = "查询档口库存列表", httpMethod = "POST", response = R.class)
|
||||
@PostMapping("/page")
|
||||
public R<Page<StoreProdStockPageResDTO>> selectPage(@Validated @RequestBody StoreProdStockPageVO pageVO) {
|
||||
|
|
|
|||
|
|
@ -30,6 +30,10 @@ public class UserAuthenticationController extends XktBaseController {
|
|||
|
||||
final IUserAuthenticationService userAuthService;
|
||||
|
||||
// APP 代发联系功能
|
||||
// APP 代发联系功能
|
||||
// APP 代发联系功能
|
||||
|
||||
@PreAuthorize("@ss.hasAnyRoles('admin,general_admin')")
|
||||
@ApiOperation(value = "新增代发 ", httpMethod = "POST", response = R.class)
|
||||
@PostMapping()
|
||||
|
|
@ -37,6 +41,13 @@ public class UserAuthenticationController extends XktBaseController {
|
|||
return R.ok(userAuthService.create(BeanUtil.toBean(createVO, UserAuthCreateDTO.class)));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasAnyRoles('admin,general_admin')")
|
||||
@ApiOperation(value = "APP 代发列表 ", httpMethod = "POST", response = R.class)
|
||||
@PostMapping("/app/page")
|
||||
public R<Page<UserAuthAppPageResDTO>> appPage(@Validated @RequestBody UserAuthPageVO pageVO) {
|
||||
return R.ok(userAuthService.appPage(BeanUtil.toBean(pageVO, UserAuthPageDTO.class)));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasAnyRoles('admin,general_admin')")
|
||||
@ApiOperation(value = "查询代发列表 ", httpMethod = "POST", response = R.class)
|
||||
@PostMapping("/page")
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
package com.ruoyi.xkt.dto.userAuthentication;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author liujiang
|
||||
* @version v1.0
|
||||
* @date 2025/3/27 15:12
|
||||
*/
|
||||
@Data
|
||||
public class UserAuthAppPageResDTO {
|
||||
|
||||
@ApiModelProperty(value = "代发ID")
|
||||
private Long userAuthId;
|
||||
@ApiModelProperty(value = "真实名称")
|
||||
private String realName;
|
||||
@ApiModelProperty(value = "联系电话")
|
||||
private String phonenumber;
|
||||
@ApiModelProperty(value = "头像")
|
||||
private String avatar;
|
||||
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@ package com.ruoyi.xkt.mapper;
|
|||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.ruoyi.xkt.domain.UserAuthentication;
|
||||
import com.ruoyi.xkt.dto.userAuthentication.UserAuthAppPageResDTO;
|
||||
import com.ruoyi.xkt.dto.userAuthentication.UserAuthPageDTO;
|
||||
import com.ruoyi.xkt.dto.userAuthentication.UserAuthPageResDTO;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
|
@ -24,4 +25,13 @@ public interface UserAuthenticationMapper extends BaseMapper<UserAuthentication>
|
|||
* @return List<UserAuthPageResDTO>
|
||||
*/
|
||||
List<UserAuthPageResDTO> selectUserAuthPage(UserAuthPageDTO pageDTO);
|
||||
|
||||
/**
|
||||
* 筛选APP代发分页
|
||||
*
|
||||
* @param pageDTO 分页入参
|
||||
* @return List<UserAuthAppPageResDTO>
|
||||
*/
|
||||
List<UserAuthAppPageResDTO> selectUserAuthAppPage(UserAuthPageDTO pageDTO);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package com.ruoyi.xkt.service;
|
||||
|
||||
import com.ruoyi.common.core.page.Page;
|
||||
import com.ruoyi.xkt.dto.store.StoreAuditDTO;
|
||||
import com.ruoyi.xkt.dto.userAuthentication.*;
|
||||
|
||||
/**
|
||||
|
|
@ -14,8 +13,9 @@ public interface IUserAuthenticationService {
|
|||
|
||||
/**
|
||||
* 新增代发
|
||||
*
|
||||
* @param createDTO 新增代发入参
|
||||
* @return Integer
|
||||
* @return Integer
|
||||
*/
|
||||
Integer create(UserAuthCreateDTO createDTO);
|
||||
|
||||
|
|
@ -51,4 +51,12 @@ public interface IUserAuthenticationService {
|
|||
*/
|
||||
Integer approve(UserAuthAuditDTO auditDTO);
|
||||
|
||||
/**
|
||||
* APP代发分页
|
||||
*
|
||||
* @param pageDTO 分页入参
|
||||
* @return Page<UserAuthAppPageResDTO>
|
||||
*/
|
||||
Page<UserAuthAppPageResDTO> appPage(UserAuthPageDTO pageDTO);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,6 +50,21 @@ public class UserAuthenticationServiceImpl implements IUserAuthenticationService
|
|||
return userAuthMapper.insert(userAuth);
|
||||
}
|
||||
|
||||
/**
|
||||
* APP代发分页
|
||||
*
|
||||
* @param pageDTO 分页入参
|
||||
* @return Page<UserAuthAppPageResDTO>
|
||||
*/
|
||||
@Override
|
||||
@Transactional(readOnly = true)
|
||||
public Page<UserAuthAppPageResDTO> appPage(UserAuthPageDTO pageDTO) {
|
||||
PageHelper.startPage(pageDTO.getPageNum(), pageDTO.getPageSize());
|
||||
List<UserAuthAppPageResDTO> list = this.userAuthMapper.selectUserAuthAppPage(pageDTO);
|
||||
return Page.convert(new PageInfo<>(list));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 代发分页
|
||||
*
|
||||
|
|
@ -125,5 +140,4 @@ public class UserAuthenticationServiceImpl implements IUserAuthenticationService
|
|||
return this.userAuthMapper.updateById(userAuth);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
AND sps.store_id = #{storeId}
|
||||
<if test="prodArtNum != null and prodArtNum != ''"> and sps.prod_art_num like concat('%', #{prodArtNum}, '%')</if>
|
||||
ORDER BY
|
||||
sps.create_time DESC
|
||||
sps.store_prod_id,
|
||||
sps.store_color_id
|
||||
</select>
|
||||
|
||||
<select id="selectTop10List" resultType="com.ruoyi.xkt.dto.dailyStoreTag.DailyStoreTagDTO">
|
||||
|
|
|
|||
|
|
@ -25,4 +25,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectUserAuthAppPage" resultType="com.ruoyi.xkt.dto.userAuthentication.UserAuthAppPageResDTO">
|
||||
SELECT
|
||||
ua.id AS userAuthId,
|
||||
ua.real_name,
|
||||
u.phonenumber,
|
||||
u.avatar
|
||||
FROM
|
||||
user_authentication ua
|
||||
LEFT JOIN sys_user u ON ua.user_id = u.user_id
|
||||
<where>
|
||||
<if test="realName != null and realName != ''">
|
||||
AND ua.real_name LIKE concat('%', #{realName}, '%')
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue