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