开发商户端相关接口

Pu Zhibing

1 天以前 6f5e0af7b4e3c4e6d2bcd33bafb6649727e98b37

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java

@@ -5,6 +5,7 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.order.Order;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.constant.AppErrorConstant;
@@ -16,6 +17,7 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;

/**
@@ -71,7 +73,12 @@
        Long userId = SecurityUtils.getUserId();
        merVerifyCodeDto.setUserId(userId);
        String verifyCode = merVerifyCodeDto.getVerifyCode();
        MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrder(verifyCode,merVerifyCodeDto.getShopId());
        MerVerifyOrderVo merVerifyOrderVo = null;
        if (!verifyCode.contains("http")) {
            merVerifyOrderVo = orderService.verifyOrder(verifyCode, merVerifyCodeDto.getShopId());
        } else {
            //三方订单
        }
        return R.ok(merVerifyOrderVo);
    }

@@ -80,7 +87,12 @@
    public R<MerVerifyOrderVo> sureVerifyOrder(@RequestBody MerVerifyOrderDto merVerifyOrderDto) {
        Long userId = SecurityUtils.getUserId();
        merVerifyOrderDto.setUserId(userId);
        MerVerifyOrderVo merVerifyOrderVo = orderService.sureVerifyOrder(merVerifyOrderDto);
        MerVerifyOrderVo merVerifyOrderVo = null;
        if (!merVerifyOrderDto.getOrderId().contains("http")) {
            merVerifyOrderVo = orderService.sureVerifyOrder(merVerifyOrderDto);
        } else {
            //三方订单
        }
        return R.ok(merVerifyOrderVo);
    }

@@ -133,19 +145,43 @@
        orderService.createNewOrder(merNewOrderDto);
        return R.ok();
    }

    
    @RequestMapping(value = "/pageMerOrder", method = RequestMethod.POST)
    @ApiOperation(value = "获取商户端订单列表")
    @ApiOperation(value = "获取商户端订单列表【2.0】")
    public R<Page<MerOrderPageVo>> pageMerOrder(@RequestBody MerOrderPageDto merOrderPageDto) {
        Long userId = SecurityUtils.getUserId();
        merOrderPageDto.setUserId(userId);
        Page<MerOrderPageVo> page = new Page<>();
        page.setSize(merOrderPageDto.getPageSize());
        page.setCurrent(merOrderPageDto.getPageNum());
        List<MerOrderPageVo> merOrderPageVoList = orderService.pageMerOrder(page,merOrderPageDto);
        List<MerOrderPageVo> merOrderPageVoList = orderService.pageMerOrder(page, merOrderPageDto);
        return R.ok(page.setRecords(merOrderPageVoList));
    }

    
    
    @RequestMapping(value = "/cancelMerOrder", method = RequestMethod.POST)
    @ApiOperation(value = "商户端取消线下订单【2.0】")
    public R cancelMerOrder(@RequestBody CancelMerOrderDto dto) {
        Order order = orderService.getById(dto.getOrderId());
        if (null == order) {
            return R.fail("订单不存在");
        }
        if (order.getOrderStatus() == 0) {
            return R.fail("订单已取消");
        }
        if (!order.getShopId().equals(dto.getShopId())) {
            return R.fail("取消失败");
        }
        if (3 != order.getOrderFrom()) {
            return R.fail("取消失败");
        }
        order.setOrderStatus(0);
        order.setCancelTime(new Date());
        orderService.updateById(order);
        return R.ok();
    }
    
    
    @RequestMapping(value = "/totalMerOrder", method = RequestMethod.POST)
    @ApiOperation(value = "商户端订单管理统计")
    public R<MerTotalOrderVo> totalMerOrder(@RequestBody MerOrderPageDto merOrderPageDto) {
@@ -154,9 +190,9 @@
        MerTotalOrderVo totalOrderVo = orderService.totalMerOrder(merOrderPageDto);
        return R.ok(totalOrderVo);
    }

    
    @RequestMapping(value = "/pageMerMemberOrder", method = RequestMethod.POST)
    @ApiOperation(value = "分页商户端用户收银记录")
    @ApiOperation(value = "分页商户端用户收银记录【2.0】")
    public R<Page<MerMemberOrderVo>> pageMerMemberOrder(@RequestBody MerMemberNoClearOrderDto merMemberNoClearOrderDto) {
        Long userId = SecurityUtils.getUserId();
        merMemberNoClearOrderDto.setUserId(userId);