20220505

xiaoyong931011

2022-05-05 f83b62252df79afbfa19f4cf1be0487d9e37a123

 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;
@@ -185,7 +187,7 @@

    @ApiOperation(value = "获取用户的可用充值卡", notes = "获取用户的可用充值卡")
    @GetMapping(value = "getUseMoneyCard/{vipId}")
    public AjaxResult getUseMoneyCard(Long vipId) {
    public AjaxResult getUseMoneyCard(@PathVariable Long vipId) {
        MoneyCardUse moneyCardUse = new MoneyCardUse();
        moneyCardUse.setVipId(vipId);
        moneyCardUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
@@ -204,11 +206,22 @@

    @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);
        QueryUtil.setQueryLimit(shoppingGoods);
        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");
            pageVo.setSort("createTime");