20220505

xiaoyong931011

2022-05-05 e5dffd242a47abd5c5df2248de5b5e015139ad21

20220505

 zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java

@@ -1,6 +1,7 @@
package com.matrix.system.padApi.action;

import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.matrix.component.asyncmessage.AsyncMessageManager;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
@@ -29,6 +30,7 @@
import com.matrix.system.hive.service.SysOrderService;
import com.matrix.system.hive.service.SysShopInfoService;
import com.matrix.system.padApi.dto.PadOrderListDto;
import com.matrix.system.padApi.dto.PadShowListDto;
import com.matrix.system.padApi.vo.PadOrderDetailVo;
import com.matrix.system.shopXcx.mqTask.AsyncMessageRouting;
import com.matrix.system.wechart.templateMsg.UniformMsgParam;
@@ -204,10 +206,21 @@

    @ApiOperation(value = "列表显示搜索项目绑定的产品信息", notes = "列表显示搜索项目绑定的产品信息")
    @PostMapping(value = "/showList")
    public AjaxResult showList(@RequestBody ShoppingGoods shoppingGoods,@RequestBody PaginationVO pageVo) {
    public AjaxResult showList(@RequestBody PadShowListDto padShowListDto) {

        int offset = (pageVo.getOffset() - 1) * pageVo.getLimit();
        int offset = (padShowListDto.getPageNum() - 1) * padShowListDto.getPageSize();
        int limit = padShowListDto.getPageSize();
        PaginationVO pageVo = new PaginationVO();
        pageVo.setOffset(offset);
        pageVo.setLimit(limit);

        ShoppingGoods shoppingGoods = new ShoppingGoods();
        if(StrUtil.isNotEmpty(padShowListDto.getName())){
            shoppingGoods.setName(padShowListDto.getName());
        }
        if(StrUtil.isNotEmpty(padShowListDto.getGoodType())){
            shoppingGoods.setGoodType(padShowListDto.getGoodType());
        }
        QueryUtil.setQueryLimit(shoppingGoods);
        if(StringUtils.isBlank(pageVo.getSort())){
            pageVo.setOrder("desc");

 zq-erp/src/main/java/com/matrix/system/padApi/dto/PadShowListDto.java

New file
@@ -0,0 +1,30 @@
package com.matrix.system.padApi.dto;

import com.matrix.system.app.dto.BasePageDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@ApiModel(value = "PadShowListDto", description = "列表接收参数类")
@Data
public class PadShowListDto extends BasePageDto {
    /**
     * 产品名称
     */
    private String name;

    /**
     * 商品分类 组合商品/家居产品/项目/充值卡/综合卡
     *
     * @return
     */
    private String goodType;



    @ApiModelProperty(hidden = true)
    private Long shopId;

    @ApiModelProperty(hidden = true)
    private Long companyId;
}