Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang...

huliguo

6 天以前 47f48404865c0d35f86acab79e4a4abbabe6c116

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

@@ -42,8 +42,9 @@
        Long userId = SecurityUtils.getUserId();
        merVerifyCodeDto.setUserId(userId);
        String verifyCode = merVerifyCodeDto.getVerifyCode();
        String[] verifyCodeArr = verifyCode.split("-");
        MerVerifyCodeVo merVerifyCodeVo = new MerVerifyCodeVo();
        if(!verifyCode.contains("https")){
            String[] verifyCodeArr = verifyCode.split("-");
        Integer type = Integer.valueOf(verifyCodeArr[0]);
        verifyCode = verifyCodeArr[1];
        merVerifyCodeVo.setVerifyType(type);
@@ -64,6 +65,21 @@
            default:
                throw new ServiceException(AppErrorConstant.VERIFY_TYPE_MISS);
        }
        }else{
            merVerifyCodeVo.setVerifyType(1);
            //三方订单
            //抖音
            if (verifyCode.contains("douyin")) {
                MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrderDouYin(verifyCode, merVerifyCodeDto.getShopId());
                merVerifyCodeVo.setMerVerifyOrderVo(merVerifyOrderVo);
            }
            //快手
            if (verifyCode.contains("ksurl")) {
                MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrderKuaiShou(verifyCode, merVerifyCodeDto.getShopId());
                merVerifyCodeVo.setMerVerifyOrderVo(merVerifyOrderVo);
            }
        }

        return R.ok(merVerifyCodeVo);
    }

@@ -73,20 +89,7 @@
        Long userId = SecurityUtils.getUserId();
        merVerifyCodeDto.setUserId(userId);
        String verifyCode = merVerifyCodeDto.getVerifyCode();
        MerVerifyOrderVo merVerifyOrderVo = null;
        if (!verifyCode.contains("https")) {
            merVerifyOrderVo = orderService.verifyOrder(verifyCode, merVerifyCodeDto.getShopId());
        } else {
            //三方订单
            //抖音
            if (verifyCode.contains("douyin")) {
                merVerifyOrderVo = orderService.verifyOrderDouYin(verifyCode, merVerifyCodeDto.getShopId());
            }
            //快手
            if (verifyCode.contains("ksurl")) {
                merVerifyOrderVo = orderService.verifyOrderKuaiShou(verifyCode, merVerifyCodeDto.getShopId());
            }
        }
        MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrder(verifyCode, merVerifyCodeDto.getShopId());
        return R.ok(merVerifyOrderVo);
    }