From 2d743d23bfcd9df3412403caa84b1dea8662ad79 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 6 Feb 2020 11:48:53 +0800 Subject: [PATCH] =?UTF-8?q?yshop1.9.4,=E6=96=B0=E5=A2=9E=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=99=AE=E9=80=9A=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=8F=8A=E5=85=B6=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E5=85=B6=E4=BB=96=E9=97=AE=E9=A2=98,=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E7=99=BB=E9=99=86=E6=BC=94=E7=A4=BA=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/StoreBargainController.java | 12 ++++++++++-- .../user/web/controller/UserBillController.java | 5 ++++- .../exception/handler/GlobalExceptionHandler.java | 1 - .../co/yixiang/mp/controller/YxCacheController.java | 3 ++- .../shop/service/dto/YxUserQueryCriteria.java | 3 +++ 5 files changed, 19 insertions(+), 5 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 bf6f304f..6c232dae 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 @@ -290,9 +290,17 @@ public class StoreBargainController extends BaseController { String qrcodeUrl = ""; if(ObjectUtil.isNull(attachment)){ //生成二维码 + //判断用户是否小程序,注意小程序二维码生成路径要与H5不一样 不然会导致都跳转到小程序问题 File file = FileUtil.mkdir(new File(fileDir)); - QrCodeUtil.generate(siteUrl+"/activity/dargain_detail/"+bargainId+"/"+uid+"?spread="+uid, 180, 180, - FileUtil.file(fileDir+name)); + if(userInfo.getUserType().equals("routine")){ + siteUrl = siteUrl+"/bargain/"; + QrCodeUtil.generate(siteUrl+"?bargainId="+bargainId+"&uid="+uid+"&spread="+uid, 180, 180, + FileUtil.file(fileDir+name)); + }else{ + QrCodeUtil.generate(siteUrl+"/activity/dargain_detail/"+bargainId+"/"+uid+"?spread="+uid, 180, 180, + FileUtil.file(fileDir+name)); + } + systemAttachmentService.attachmentAdd(name,String.valueOf(FileUtil.size(file)), fileDir+name,"qrcode/"+name); diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java index 05964cd8..ed423d59 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java @@ -132,7 +132,10 @@ public class UserBillController extends BaseController { String qrcodeUrl = ""; if(ObjectUtil.isNull(attachment)){ //生成二维码 - //String fileDir = path+"qrcode"+File.separator; + //判断用户是否小程序,注意小程序二维码生成路径要与H5不一样 不然会导致都跳转到小程序问题 + if(userInfo.getUserType().equals("routine")){ + siteUrl = siteUrl+"/distribution/"; + } File file = FileUtil.mkdir(new File(fileDir)); QrCodeUtil.generate(siteUrl+"?spread="+uid, 180, 180, FileUtil.file(fileDir+name)); diff --git a/yshop-common/src/main/java/co/yixiang/exception/handler/GlobalExceptionHandler.java b/yshop-common/src/main/java/co/yixiang/exception/handler/GlobalExceptionHandler.java index 4d36efaf..76249507 100644 --- a/yshop-common/src/main/java/co/yixiang/exception/handler/GlobalExceptionHandler.java +++ b/yshop-common/src/main/java/co/yixiang/exception/handler/GlobalExceptionHandler.java @@ -28,7 +28,6 @@ public class GlobalExceptionHandler { */ @ExceptionHandler(Throwable.class) public ResponseEntity handleException(Throwable e){ - System.out.println("99999"); // 打印堆栈信息 log.error(ThrowableUtil.getStackTrace(e)); return buildResponseEntity(ApiError.error(e.getMessage())); diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java index e3f3363d..c9a9aa0f 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java @@ -76,7 +76,8 @@ public class YxCacheController { wxService.getMenuService().menuDelete(); wxService.getMenuService().menuCreate(menu); } catch (WxErrorException e) { - e.printStackTrace(); + throw new BadRequestException(e.getMessage()); + // e.printStackTrace(); } return new ResponseEntity(HttpStatus.OK); diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java index a8f90758..5d7411f4 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java @@ -20,4 +20,7 @@ public class YxUserQueryCriteria{ @Query private Integer isPromoter; + + @Query + private String userType; } \ No newline at end of file