用户列表增加搜索条件

KKSU

2023-11-07 10ad2e710d2bd52aac31d5d63a7bb6beae76b6a8

 src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java

@@ -12,6 +12,7 @@
import cc.mrbird.febs.common.utils.excl.ResponseHeadUtil;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.MallExpressInfoMapper;
import cc.mrbird.febs.mall.mapper.MallOrderRefundOperationMapper;
import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
@@ -20,9 +21,11 @@
import cc.mrbird.febs.system.entity.Dept;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -45,6 +48,7 @@
public class AdminMallOrderController extends BaseController {

    private final IAdminMallOrderService adminMallOrderService;
    private final MallExpressInfoMapper mallExpressInfoMapper;

    /**
     * 订单列表
@@ -78,6 +82,30 @@
    @ControllerEndpoint(operation = "订单列表-取消订单", exceptionMessage = "操作失败")
    public FebsResponse cancelOrder(@NotNull(message = "{required}") @PathVariable Long id) {
        return adminMallOrderService.cancelOrder(id);
    }

    /**
     * 订单列表-自提订单
     *
     * @param id
     * @return
     */
    @GetMapping("takeGoods/{id}")
    @ControllerEndpoint(operation = "订单列表-自提订单", exceptionMessage = "操作失败")
    public FebsResponse takeGoods(@NotNull(message = "{required}") @PathVariable Long id) {
        return adminMallOrderService.takeGoods(id);
    }

    /**
     * 订单列表-删除订单
     *
     * @param id
     * @return
     */
    @GetMapping("delOrder/{id}")
    @ControllerEndpoint(operation = "订单列表-删除订单", exceptionMessage = "操作失败")
    public FebsResponse delOrder(@NotNull(message = "{required}") @PathVariable Long id) {
        return adminMallOrderService.delOrder(id);
    }

    /**
@@ -266,8 +294,22 @@
                } else {
                    temp.add("");
                }

                temp.add(item.getStatus());
                switch (item.getStatus()) {
                    case 2:
                        temp.add("待发货");
                        break;
                    case 3:
                        temp.add("已发货");
                        break;
                    default:
                }
                Long id = item.getId();
                MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectByOrderId(id);
                if(ObjectUtil.isNotNull(mallExpressInfo)){
                    temp.add(mallExpressInfo.getExpressNo());
                    temp.add(mallExpressInfo.getExpressCom());
                    temp.add(mallExpressInfo.getExpressCode());
                }
                list.add(temp);
            }
        }
@@ -360,4 +402,43 @@
        return new FebsResponse().success();
    }

    /**
     * 评论列表
     */
    @GetMapping("commentList")
    public FebsResponse getCommentList(AdminMallGoodsCommentDto adminMallGoodsCommentDto, QueryRequest request) {
        Map<String, Object> data = getDataTable(adminMallOrderService.getCommentListInPage(adminMallGoodsCommentDto, request));
        return new FebsResponse().success().data(data);
    }

    /**
     * 评论列表-显示评论
     */
    @GetMapping("showStateSwitchOn/{id}")
    @ControllerEndpoint(operation = "评论列表-显示评论", exceptionMessage = "设置失败")
    public FebsResponse showStateSwitchOn(@NotNull(message = "{required}") @PathVariable Long id) {
        return adminMallOrderService.showStateSwitchOn(id);
    }

    /**
     * 评论列表-不显示评论
     */
    @GetMapping("showStateSwitchOff/{id}")
    @ControllerEndpoint(operation = "评论列表-显示评论", exceptionMessage = "设置失败")
    public FebsResponse showStateSwitchOff(@NotNull(message = "{required}") @PathVariable Long id) {
        return adminMallOrderService.showStateSwitchOff(id);
    }
    /**
     * 订单列表-资金流水
     */
    @GetMapping("/orderMoneyFlow")
    public FebsResponse orderMoneyFlow(QueryRequest request, MallOrderInfo mallOrderInfo, Integer parentId) {
        if (parentId == null) {
            ViewMallOrderController.idOrderMoneyFlow = 0;
        }
        mallOrderInfo.setId(ViewMallOrderController.idOrderMoneyFlow);
        Map<String, Object> dataTable = getDataTable(adminMallOrderService.orderMoneyFlow(request, mallOrderInfo));
        return new FebsResponse().success().data(dataTable);
    }

}