cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

yshop1.9.4,新增小程序普通二维码功能及其修复小程序其他问题,详情登陆演示后台查看明细

Browse Source
This commit is contained in:
hupeng
2020-02-06 11:48:53 +08:00
parent 2de7be905b
commit 2d743d23bf
5 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java
View File

@ -290,9 +290,17 @@ public class StoreBargainController extends BaseController {
String qrcodeUrl = ""; String qrcodeUrl = "";
if(ObjectUtil.isNull(attachment)){ if(ObjectUtil.isNull(attachment)){
//生成二维码 //生成二维码
//判断用户是否小程序,注意小程序二维码生成路径要与H5不一样 不然会导致都跳转到小程序问题
File file = FileUtil.mkdir(new File(fileDir)); File file = FileUtil.mkdir(new File(fileDir));
QrCodeUtil.generate(siteUrl+"/activity/dargain_detail/"+bargainId+"/"+uid+"?spread="+uid, 180, 180, if(userInfo.getUserType().equals("routine")){
FileUtil.file(fileDir+name)); 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)), systemAttachmentService.attachmentAdd(name,String.valueOf(FileUtil.size(file)),
fileDir+name,"qrcode/"+name); fileDir+name,"qrcode/"+name);

5
yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java
View File

@ -132,7 +132,10 @@ public class UserBillController extends BaseController {
String qrcodeUrl = ""; String qrcodeUrl = "";
if(ObjectUtil.isNull(attachment)){ 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)); File file = FileUtil.mkdir(new File(fileDir));
QrCodeUtil.generate(siteUrl+"?spread="+uid, 180, 180, QrCodeUtil.generate(siteUrl+"?spread="+uid, 180, 180,
FileUtil.file(fileDir+name)); FileUtil.file(fileDir+name));

1
yshop-common/src/main/java/co/yixiang/exception/handler/GlobalExceptionHandler.java
View File

@ -28,7 +28,6 @@ public class GlobalExceptionHandler {
*/ */
@ExceptionHandler(Throwable.class) @ExceptionHandler(Throwable.class)
public ResponseEntity<ApiError> handleException(Throwable e){ public ResponseEntity<ApiError> handleException(Throwable e){
System.out.println("99999");
// 打印堆栈信息 // 打印堆栈信息
log.error(ThrowableUtil.getStackTrace(e)); log.error(ThrowableUtil.getStackTrace(e));
return buildResponseEntity(ApiError.error(e.getMessage())); return buildResponseEntity(ApiError.error(e.getMessage()));

3
yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java
View File

@ -76,7 +76,8 @@ public class YxCacheController {
wxService.getMenuService().menuDelete(); wxService.getMenuService().menuDelete();
wxService.getMenuService().menuCreate(menu); wxService.getMenuService().menuCreate(menu);
} catch (WxErrorException e) { } catch (WxErrorException e) {
e.printStackTrace(); throw new BadRequestException(e.getMessage());
// e.printStackTrace();
} }
return new ResponseEntity(HttpStatus.OK); return new ResponseEntity(HttpStatus.OK);

3
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java
View File

@ -20,4 +20,7 @@ public class YxUserQueryCriteria{
@Query @Query
private Integer isPromoter; private Integer isPromoter;
@Query
private String userType;
} }