jiangqs
2023-07-07 5627daeb1ac1a29947e902f9a7efb6730ed98611
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
@@ -50,11 +50,11 @@
        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: