20220505

xiaoyong931011

2022-05-06 9dfaf53ea5e70c839a157fd6cc0abfc0da804fb1

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

@@ -89,12 +89,39 @@
        pageVo.setOffset(offset);
        pageVo.setLimit(limit);

        //默认排序
        if (StringUtils.isBlank(pageVo.getSort())) {
            pageVo.setSort("order_time");
        }
        if (StringUtils.isBlank(pageVo.getOrder())) {
            pageVo.setOrder("desc");
        }
        if (!DataAuthUtil.hasAllShopAuth()) {
            orderListDto.setShopId(user.getShopId());
            orderListDto.setShopId(getMe().getShopId());
        }
        QueryUtil.setQueryLimitCom(orderListDto);
        return AjaxResult.buildSuccessInstance(sysOrderService.findPadApiOrderListInPage(orderListDto, pageVo),
                sysOrderService.findPadApiOrderListTotal(orderListDto));

        SysOrder sysOrder = new SysOrder();
        sysOrder.setShopId(orderListDto.getShopId());
        if(ObjectUtil.isNotEmpty(orderListDto.getOrderStatus())){
            sysOrder.setStatu(orderListDto.getStatus());
        }

        if(ObjectUtil.isNotEmpty(orderListDto.getBeginTimeVo())){
            sysOrder.setBeginTimeVo(orderListDto.getBeginTimeVo());
        }
        if(ObjectUtil.isNotEmpty(orderListDto.getEndTimeVo())){
            sysOrder.setEndTimeVo(orderListDto.getEndTimeVo());
        }

        if(ObjectUtil.isNotEmpty(orderListDto.getVipId())){
            sysOrder.setVipId(orderListDto.getVipId());
        }
        if(StrUtil.isNotEmpty(orderListDto.getQueryKey())){
            sysOrder.setKeyWordVo(orderListDto.getQueryKey());
        }
        return new AjaxResult(AjaxResult.STATUS_SUCCESS, orderService.findInPage(sysOrder, pageVo),
                orderService.findTotal(sysOrder));
    }

    @ApiOperation(value = "获取订单详情", notes = "获取订单详情")
@@ -112,7 +139,7 @@
    @ApiOperation(value = "取消订单", notes = "取消订单")
    @GetMapping(value = "/cancelOrder/{id}")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult cancelOrder(Long id) {
    public AjaxResult cancelOrder(@PathVariable Long id) {

        SysOrder order = orderService.findById(id);
        if (ObjectUtil.isEmpty(order)) {
@@ -187,7 +214,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);
@@ -221,7 +248,7 @@
        if(StrUtil.isNotEmpty(padShowListDto.getGoodType())){
            shoppingGoods.setGoodType(padShowListDto.getGoodType());
        }
        QueryUtil.setQueryLimit(shoppingGoods);
//        QueryUtil.setQueryLimit(shoppingGoods);
        if(StringUtils.isBlank(pageVo.getSort())){
            pageVo.setOrder("desc");
            pageVo.setSort("createTime");