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

D:/Program Files/Git/YxStoreBargainUserQueryParam新增bargainId参数,移除CreatShareProductService多余注释

Browse Source
This commit is contained in:
hupeng
2020-07-15 18:13:32 +08:00
parent 6abdb799cd
commit d3bb6f5771
2 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yshop-app/src/main/java/co/yixiang/modules/activity/param/YxStoreBargainUserQueryParam.java
View File

@ -24,4 +24,6 @@ public class YxStoreBargainUserQueryParam extends QueryParam {
@NotBlank(message = "参数错误")
private String bargainUserUid;
private String bargainId;
}

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

@ -149,17 +149,6 @@ public class CreatShareProductService {
String spreadPicPath = fileDir+spreadPicName;
YxSystemAttachment attachmentT = systemAttachmentService.getInfo(spreadPicName);
// InputStream stream = getClass().getClassLoader().getResourceAsStream("fx.jpg");
// InputStream streamT = getClass().getClassLoader()
// .getResourceAsStream("simsunb.ttf");
// File newFile = new File("fx.jpg");
// File newFileT = new File("simsunb.ttf");
// try {
// FileUtils.copyInputStreamToFile(stream, newFile);
// FileUtils.copyInputStreamToFile(streamT, newFileT);
// } catch (IOException e) {
// e.printStackTrace();
// }
if(ObjectUtil.isNull(attachmentT)){
try {
Font font = Font.createFont(Font.TRUETYPE_FONT, newFileT);
@ -232,17 +221,6 @@ public class CreatShareProductService {
String spreadPicPath = fileDir+spreadPicName;
YxSystemAttachment attachmentT = systemAttachmentService.getInfo(spreadPicName);
// InputStream stream = getClass().getClassLoader().getResourceAsStream("fx.jpg");
// InputStream streamT = getClass().getClassLoader()
// .getResourceAsStream("simsunb.ttf");
// File newFile = new File("fx.jpg");
// File newFileT = new File("simsunb.ttf");
// try {
// FileUtils.copyInputStreamToFile(stream, newFile);
// FileUtils.copyInputStreamToFile(streamT, newFileT);
// } catch (IOException e) {
// e.printStackTrace();
// }
if(ObjectUtil.isNull(attachmentT)){
try {
@ -464,8 +442,9 @@ public class CreatShareProductService {
spreadUrl = apiUrl + "/api/file/qrcode/"+spreadPicName;
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage());
throw new YshopException(e.getMessage());
throw new YshopException("生成失败");
}
}else{
spreadUrl = apiUrl + "/api/file/" + attachmentT.getSattDir();