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

新增uniapp-h5URL与独立h5兼容

Browse Source
This commit is contained in:
hupeng
2020-09-28 14:14:59 +08:00
parent cd18272bf7
commit cc272cd411
4 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java
View File

@ -16,6 +16,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.qrcode.QrCodeUtil; import cn.hutool.extra.qrcode.QrCodeUtil;
import co.yixiang.api.ApiResult; import co.yixiang.api.ApiResult;
import co.yixiang.api.YshopException; import co.yixiang.api.YshopException;
import co.yixiang.constant.ShopConstants;
import co.yixiang.logging.aop.log.AppLog; import co.yixiang.logging.aop.log.AppLog;
import co.yixiang.common.aop.NoRepeatSubmit; import co.yixiang.common.aop.NoRepeatSubmit;
import co.yixiang.common.bean.LocalUser; import co.yixiang.common.bean.LocalUser;
@ -178,6 +179,8 @@ public class StoreProductController {
FileUtil.file(fileDir+name)); FileUtil.file(fileDir+name));
}else { }else {
//生成二维码 //生成二维码
String uniUrl = systemConfigService.getData(SystemConfigConstants.UNI_SITE_URL);
siteUrl = StrUtil.isNotBlank(uniUrl) ? uniUrl : ShopConstants.DEFAULT_UNI_H5_URL;
QrCodeUtil.generate(siteUrl+"/pages/shop/GoodsCon/index?id="+id+"&spread="+uid, 180, 180, QrCodeUtil.generate(siteUrl+"/pages/shop/GoodsCon/index?id="+id+"&spread="+uid, 180, 180,
FileUtil.file(fileDir+name)); FileUtil.file(fileDir+name));
} }

7
yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java
View File

@ -16,6 +16,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.qrcode.QrCodeUtil; import cn.hutool.extra.qrcode.QrCodeUtil;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import co.yixiang.api.YshopException; import co.yixiang.api.YshopException;
import co.yixiang.constant.ShopConstants;
import co.yixiang.constant.SystemConfigConstants; import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.enums.AppFromEnum; import co.yixiang.enums.AppFromEnum;
import co.yixiang.enums.OrderInfoEnum; import co.yixiang.enums.OrderInfoEnum;
@ -200,6 +201,8 @@ public class CreatShareProductService {
if(from.equals(AppFromEnum.ROUNTINE.getValue())){ if(from.equals(AppFromEnum.ROUNTINE.getValue())){
siteUrl = siteUrl+"/distribution/"; siteUrl = siteUrl+"/distribution/";
}else if(AppFromEnum.UNIAPPH5.getValue().equals(from)){ }else if(AppFromEnum.UNIAPPH5.getValue().equals(from)){
String uniUrl = systemConfigService.getData(SystemConfigConstants.UNI_SITE_URL);
siteUrl = StrUtil.isNotBlank(uniUrl) ? uniUrl : ShopConstants.DEFAULT_UNI_H5_URL;
siteUrl = siteUrl+"/pages/Loading/index"; siteUrl = siteUrl+"/pages/Loading/index";
} }
File file = FileUtil.mkdir(new File(fileDir)); File file = FileUtil.mkdir(new File(fileDir));
@ -316,6 +319,8 @@ public class CreatShareProductService {
QrCodeUtil.generate(siteUrl+"/activity/dargain_detail/"+bargainId+"/"+uid+"?spread="+uid, 180, 180, QrCodeUtil.generate(siteUrl+"/activity/dargain_detail/"+bargainId+"/"+uid+"?spread="+uid, 180, 180,
FileUtil.file(fileDir+name)); FileUtil.file(fileDir+name));
}else { }else {
String uniUrl = systemConfigService.getData(SystemConfigConstants.UNI_SITE_URL);
siteUrl = StrUtil.isNotBlank(uniUrl) ? uniUrl : ShopConstants.DEFAULT_UNI_H5_URL;
QrCodeUtil.generate(siteUrl+"/pages/activity/DargainDetails/index?id="+bargainId+"&uid="+uid+"&partake="+uid, 180, 180, QrCodeUtil.generate(siteUrl+"/pages/activity/DargainDetails/index?id="+bargainId+"&uid="+uid+"&partake="+uid, 180, 180,
FileUtil.file(fileDir+name)); FileUtil.file(fileDir+name));
} }
@ -503,6 +508,8 @@ public class CreatShareProductService {
QrCodeUtil.generate(siteUrl+"/activity/group_rule/"+pinkId+"?spread="+uid, 180, 180, QrCodeUtil.generate(siteUrl+"/activity/group_rule/"+pinkId+"?spread="+uid, 180, 180,
FileUtil.file(fileDir+name)); FileUtil.file(fileDir+name));
}else { }else {
String uniUrl = systemConfigService.getData(SystemConfigConstants.UNI_SITE_URL);
siteUrl = StrUtil.isNotBlank(uniUrl) ? uniUrl : ShopConstants.DEFAULT_UNI_H5_URL;
QrCodeUtil.generate(siteUrl+"/pages/activity/GroupRule/index?id="+pinkId+"&spread="+uid, 180, 180, QrCodeUtil.generate(siteUrl+"/pages/activity/GroupRule/index?id="+pinkId+"&spread="+uid, 180, 180,
FileUtil.file(fileDir+name)); FileUtil.file(fileDir+name));
} }

2
yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java
View File

@ -171,5 +171,7 @@ public interface ShopConstants {
String YSHOP_WECHAT_PUSH_REMARK = "yshop为您服务！"; String YSHOP_WECHAT_PUSH_REMARK = "yshop为您服务！";
String DEFAULT_UNI_H5_URL = "https://h5.yixiang.co";
} }

1
yshop-common/src/main/java/co/yixiang/constant/SystemConfigConstants.java
View File

@ -5,6 +5,7 @@ public class SystemConfigConstants {
public final static String API="api"; public final static String API="api";
public final static String API_URL="api_url"; public final static String API_URL="api_url";
public final static String SITE_URL="site_url"; public final static String SITE_URL="site_url";
public final static String UNI_SITE_URL="uni_site_url";
public final static String TENGXUN_MAP_KEY="tengxun_map_key"; public final static String TENGXUN_MAP_KEY="tengxun_map_key";
//业务相关配置 //业务相关配置