管理台bug和用户端

jiangqs

2023-07-11 25ef12504f10cb066db53541bd7bc7bac4c09ac4

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

@@ -8,6 +8,7 @@
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
@@ -49,15 +50,15 @@
        merVerifyCodeVo.setVerifyType(type);
        switch(type){
            case 1:
                MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrder(verifyCode);
                MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrder(verifyCode,merVerifyCodeDto.getShopId());
                merVerifyCodeVo.setMerVerifyOrderVo(merVerifyOrderVo);
                break;
            case 2:
                MerVerifyCouponVo merVerifyCouponVo = orderService.verifyCoupon(verifyCode);
                MerVerifyCouponVo merVerifyCouponVo = orderService.verifyCoupon(verifyCode,merVerifyCodeDto.getShopId());
                merVerifyCodeVo.setMerVerifyCouponVo(merVerifyCouponVo);
                break;
            case 3:
                MerVerifyAwardVo merVerifyAwardVo = null;
                MerVerifyAwardVo merVerifyAwardVo = orderService.verifyPrize(verifyCode,merVerifyCodeDto.getShopId());
                merVerifyCodeVo.setMerVerifyAwardVo(merVerifyAwardVo);
                break;
            default:
@@ -82,6 +83,15 @@
        merVerifyCouponDto.setUserId(userId);
        MerVerifyCouponVo merVerifyCouponVo = orderService.sureVerifyCoupon(merVerifyCouponDto);
        return R.ok(merVerifyCouponVo);
    }

    @RequestMapping(value = "/sureVerifyPrize", method = RequestMethod.POST)
    @ApiOperation(value = "核销奖品")
    public R<MerVerifyAwardVo> sureVerifyPrize(@RequestBody MerVerifyPrizeDto merVerifyPrizeDto) {
        Long userId = SecurityUtils.getUserId();
        merVerifyPrizeDto.setUserId(userId);
        MerVerifyAwardVo merVerifyAwardVo = orderService.sureVerifyPrize(merVerifyPrizeDto);
        return R.ok(merVerifyAwardVo);
    }


@@ -128,6 +138,15 @@
        return R.ok(page.setRecords(merOrderPageVoList));
    }

    @RequestMapping(value = "/totalMerOrder", method = RequestMethod.POST)
    @ApiOperation(value = "商户端订单管理统计")
    public R<MerTotalOrderVo> totalMerOrder(@RequestBody MerBaseDto merBaseDto) {
        Long userId = SecurityUtils.getUserId();
        merBaseDto.setUserId(userId);
        MerTotalOrderVo totalOrderVo = orderService.totalMerOrder(merBaseDto);
        return R.ok(totalOrderVo);
    }

    @RequestMapping(value = "/pageMerMemberOrder", method = RequestMethod.POST)
    @ApiOperation(value = "分页商户端用户收银记录")
    public R<Page<MerMemberNoClearOrderVo>> pageMerMemberOrder(@RequestBody MerMemberNoClearOrderDto merMemberNoClearOrderDto) {