From becb1e4bad7990d79293e8f1018b3b8c3fc3566f Mon Sep 17 00:00:00 2001 From: xwb <717567226@qq.com> Date: Thu, 30 Apr 2020 16:26:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E3=80=81?= =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E3=80=81=E7=A0=8D=E4=BB=B7=E6=B5=B7=E6=8A=A5?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/web/controller/StoreBargainController.java | 6 +++--- .../web/controller/StoreCombinationController.java | 8 ++++---- .../shop/web/controller/StoreProductController.java | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java index 1778230c..be086eab 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java @@ -310,12 +310,12 @@ public class StoreBargainController extends BaseController { File file = FileUtil.mkdir(new File(fileDir)); if(userType.equals(AppFromEnum.ROUNTINE.getValue())){ siteUrl = siteUrl+"/bargain/"; - QrCodeUtil.generate(siteUrl+"?bargainId="+bargainId+"&uid="+uid+"&spread="+uid+"&codeType="+AppFromEnum.ROUNTINE.getValue(), 180, 180, + QrCodeUtil.generate(siteUrl+"?bargainId="+bargainId+"&uid="+uid+"&spread="+uid+"&pageType=dargain&codeType="+AppFromEnum.ROUNTINE.getValue(), 180, 180, FileUtil.file(fileDir+name)); } - if(userType.equals(AppFromEnum.APP.getValue())){ + else if(userType.equals(AppFromEnum.APP.getValue())){ siteUrl = siteUrl+"/bargain/"; - QrCodeUtil.generate(siteUrl+"?bargainId="+bargainId+"&uid="+uid+"&spread="+uid+"&codeType="+AppFromEnum.APP.getValue(), 180, 180, + QrCodeUtil.generate(siteUrl+"?bargainId="+bargainId+"&uid="+uid+"&spread="+uid+"&pageType=dargain&codeType="+AppFromEnum.APP.getValue(), 180, 180, FileUtil.file(fileDir+name)); }else{ QrCodeUtil.generate(siteUrl+"/activity/dargain_detail/"+bargainId+"/"+uid+"?spread="+uid, 180, 180, diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java index 786be154..afdb09d3 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java @@ -151,15 +151,15 @@ public class StoreCombinationController extends BaseController { File file = FileUtil.mkdir(new File(fileDir)); if(userType.equals(AppFromEnum.ROUNTINE.getValue())){ siteUrl = siteUrl+"/pink/"; - QrCodeUtil.generate(siteUrl+"?pinkId="+pinkId+"&spread="+uid+"&codeType="+AppFromEnum.ROUNTINE.getValue(), 180, 180, + QrCodeUtil.generate(siteUrl+"?pinkId="+pinkId+"&spread="+uid+"&pageType=group&codeType="+AppFromEnum.ROUNTINE.getValue(), 180, 180, FileUtil.file(fileDir+name)); } - if(userType.equals(AppFromEnum.APP.getValue())){ + else if(userType.equals(AppFromEnum.APP.getValue())){ siteUrl = siteUrl+"/pink/"; - QrCodeUtil.generate(siteUrl+"?pinkId="+pinkId+"&spread="+uid+"&codeType="+AppFromEnum.ROUNTINE.getValue(), 180, 180, + QrCodeUtil.generate(siteUrl+"?pinkId="+pinkId+"&spread="+uid+"&pageType=group&codeType="+AppFromEnum.ROUNTINE.getValue(), 180, 180, FileUtil.file(fileDir+name)); } - else{ + else { QrCodeUtil.generate(siteUrl+"/activity/group_rule/"+pinkId+"?spread="+uid, 180, 180, FileUtil.file(fileDir+name)); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java index d1a2955b..65f9e800 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java @@ -148,18 +148,18 @@ public class StoreProductController extends BaseController { //h5地址 siteUrl = siteUrl+"/product/"; //生成二维码 - QrCodeUtil.generate(siteUrl+"?productId="+id+"&spread="+uid+"&codeType="+AppFromEnum.ROUNTINE.getValue(), 180, 180, + QrCodeUtil.generate(siteUrl+"?productId="+id+"&spread="+uid+"&pageType=good&codeType="+AppFromEnum.ROUNTINE.getValue(), 180, 180, FileUtil.file(fileDir+name)); } - if(userType.equals(AppFromEnum.APP.getValue())){ + else if(userType.equals(AppFromEnum.APP.getValue())){ //h5地址 siteUrl = siteUrl+"/product/"; //生成二维码 - QrCodeUtil.generate(siteUrl+"?productId="+id+"&spread="+uid+"&codeType="+AppFromEnum.APP.getValue(), 180, 180, + QrCodeUtil.generate(siteUrl+"?productId="+id+"&spread="+uid+"&pageType=good&codeType="+AppFromEnum.APP.getValue(), 180, 180, FileUtil.file(fileDir+name)); }else{//如果类型是h5 //生成二维码 - QrCodeUtil.generate(siteUrl+"/detail/"+id+"?spread="+uid, 180, 180, + QrCodeUtil.generate(siteUrl+"detail/"+id+"?spread="+uid, 180, 180, FileUtil.file(fileDir+name)); } systemAttachmentService.attachmentAdd(name,String.valueOf(FileUtil.size(file)),