This commit is contained in:
parent
ed78691326
commit
637a0cf315
|
|
@ -26,10 +26,11 @@ public class MemberController {
|
|||
@RequestHeader("clientType") String clientType,
|
||||
@RequestParam("shopId") String shopId,
|
||||
@RequestParam("phone") String phone,
|
||||
@RequestParam("isFlag") String isFlag,
|
||||
@RequestParam("page") int page,
|
||||
@RequestParam("pageSize") int pageSize
|
||||
) {
|
||||
return memberService.queryMember(shopId, phone, page, pageSize);
|
||||
return memberService.queryMember(shopId, phone, isFlag,page, pageSize);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ public interface TbShopUserMapper {
|
|||
|
||||
int updateByPrimaryKey(TbShopUser record);
|
||||
|
||||
List<TbShopUser> selectByShopId(@Param("shopId") String shopId,@Param("phone") String phone);
|
||||
List<TbShopUser> selectByShopId(@Param("shopId") String shopId,@Param("phone") String phone,@Param("isFlag") String isFlag);
|
||||
|
||||
|
||||
List<TbShopUser> selectByShopIdAndPhone(@Param("shopId") String shopId,@Param("phone") String phone);
|
||||
|
|
|
|||
|
|
@ -85,10 +85,10 @@ public class MemberService {
|
|||
private TbOrderInfoMapper tbOrderInfoMapper;
|
||||
private MpShopTableMapper mpShopTableMapper;
|
||||
|
||||
public Result queryMember(String shopId, String phone, int page, int pageSize) {
|
||||
public Result queryMember(String shopId, String phone,String isFlag, int page, int pageSize) {
|
||||
|
||||
PageHelperUtil.startPage(page, pageSize);
|
||||
List<TbShopUser> tbShopUsers = tbShopUserMapper.selectByShopId(shopId, phone);
|
||||
List<TbShopUser> tbShopUsers = tbShopUserMapper.selectByShopId(shopId, phone,isFlag);
|
||||
PageInfo pageInfo = new PageInfo(tbShopUsers);
|
||||
return Result.success(CodeEnum.SUCCESS, pageInfo);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@ public class DateUtils {
|
|||
|
||||
private final static SimpleDateFormat sdfTimesSs = new SimpleDateFormat("yyyyMMddHHmmssSSS");
|
||||
|
||||
|
||||
|
||||
private final static SimpleDateFormat sdfday = new SimpleDateFormat("MM-dd HH:mm");
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -371,6 +371,11 @@
|
|||
<if test="phone != null and phone !='' ">
|
||||
and telephone like concat("%",#{phone},"%")
|
||||
</if>
|
||||
|
||||
<if test="isFlag != null and isFlag ='1' ">
|
||||
and amount > 0
|
||||
</if>
|
||||
|
||||
order by id desc
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue