zq-erp/src/main/java/com/matrix/core/pojo/BasePageQueryDto.java | ●●●●● patch | view | raw | blame | history | |
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java | ●●●●● patch | view | raw | blame | history | |
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java | ●●●●● patch | view | raw | blame | history | |
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | ●●●●● patch | view | raw | blame | history |
zq-erp/src/main/java/com/matrix/core/pojo/BasePageQueryDto.java
New file @@ -0,0 +1,44 @@ package com.matrix.core.pojo; import com.fasterxml.jackson.annotation.JsonFormat; import com.matrix.core.tools.DateUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; import java.util.Date; @Data @ApiModel(value = "BaseQueryDto", description = "通用分页查询参数接收类") public class BasePageQueryDto { @NotNull(message = "参数不能为空") @ApiModelProperty(value = "第几页", example = "1") private Integer pageNum; @NotNull(message = "参数不能为空") @ApiModelProperty(value ="数量", example = "10") private Integer pageSize; @ApiModelProperty(value ="排序方式", example = "desc") private String order; @ApiModelProperty(value ="排序字段", example = "create_time") private String sortField; @ApiModelProperty(value ="关键字") private String keywords; @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8") @ApiModelProperty(value = "开始时间") private Date beginTime; @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8") @ApiModelProperty(value = "结束时间") private Date endTime; } zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
@@ -14,6 +14,6 @@ */ public interface ShopSalesmanApplyDao extends BaseMapper<ShopSalesmanApply> { IPage<SalesmanVo> selectInvitationuserInPage(Page<SalesmanVo> page, @Param("openId") String openId); IPage<SalesmanVo> selectInvitationuserInPage(Page<SalesmanVo> page, @Param("openId") String openId, @Param("isSales")String isSales); } zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
@@ -9,11 +9,11 @@ import com.matrix.component.tools.ImageUtil; import com.matrix.component.tools.WxacodeUtil; import com.matrix.core.pojo.AjaxResult; import com.matrix.core.pojo.BasePageQueryDto; import com.matrix.core.tools.LogUtil; import com.matrix.core.tools.MD5Util; import com.matrix.core.tools.PropertiesUtil; import com.matrix.core.tools.StringUtils; import com.matrix.system.app.dto.BasePageDto; import com.matrix.system.common.bean.BusParameterSettings; import com.matrix.system.common.constance.AppConstance; import com.matrix.system.common.dao.BusParameterSettingsDao; @@ -198,19 +198,17 @@ } @ApiOperation(value = "获取下级列表", notes = "") @ApiOperation(value = "获取下级列表", notes = "keywords=1 表示下级,keywords=2表示顾客") @PostMapping(value = "/getInvitationuserList") @ApiResponses({ @ApiResponse(code = 200, message = "ok", response = BasePageDto.class) @ApiResponse(code = 200, message = "ok", response = SalesmanVo.class) }) AjaxResult getInvitationuserList(@RequestBody BasePageDto pageDto) { AjaxResult getInvitationuserList(@RequestBody BasePageQueryDto pageDto) { BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class); Page<SalesmanVo> page=new Page<>(pageDto.getPageNum(),pageDto.getPageSize()); IPage<SalesmanVo> shopSalesmanApplyIPage = salesmanApplyDao.selectInvitationuserInPage(page, loginUser.getOpenId()); IPage<SalesmanVo> shopSalesmanApplyIPage = salesmanApplyDao.selectInvitationuserInPage(page, loginUser.getOpenId(),pageDto.getKeywords()); AjaxResult result=AjaxResult.buildSuccessInstance(shopSalesmanApplyIPage.getRecords()); return result; } zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -53,7 +53,7 @@ biz_user a WHERE a.parent_open_id = #{openId} AND a.is_sales = 1 AND a.is_sales = #{isSales} </select>