Commit 19787365 by zhiwj

导购bug

parent ef7b4b7c
...@@ -12,6 +12,10 @@ public class QrcodeContent implements Serializable { ...@@ -12,6 +12,10 @@ public class QrcodeContent implements Serializable {
private String customParams; private String customParams;
private String content; private String content;
private String title; private String title;
/**
* 如果是门店 这个值和title一致 如果是导购 这个值是导购所在的门店的名称
*/
private String titleTmp;
public String getCustomParams() { public String getCustomParams() {
return customParams; return customParams;
...@@ -36,4 +40,12 @@ public class QrcodeContent implements Serializable { ...@@ -36,4 +40,12 @@ public class QrcodeContent implements Serializable {
public void setTitle(String title) { public void setTitle(String title) {
this.title = title; this.title = title;
} }
public String getTitleTmp() {
return titleTmp;
}
public void setTitleTmp(String titleTmp) {
this.titleTmp = titleTmp;
}
} }
...@@ -117,7 +117,7 @@ public abstract class QrcodeDownload { ...@@ -117,7 +117,7 @@ public abstract class QrcodeDownload {
Integer qrcodeId = response.getResult(); Integer qrcodeId = response.getResult();
if (qrcodeQO.getH5() == 1) { if (qrcodeQO.getH5() == 1) {
byte[] h5Qrcode = createH5Qrcode(content.getContent(), content.getTitle(), userDetail); byte[] h5Qrcode = createH5Qrcode(content.getContent(), content.getTitle(), userDetail);
ZipEntry e = new ZipEntry(content.getTitle() + File.separator + content.getTitle() + ".jpg"); ZipEntry e = new ZipEntry(content.getTitleTmp() + File.separator + content.getTitle() + ".jpg");
zipOutputStream.putNextEntry(e); zipOutputStream.putNextEntry(e);
zipOutputStream.write(h5Qrcode); zipOutputStream.write(h5Qrcode);
zipOutputStream.flush(); zipOutputStream.flush();
...@@ -127,7 +127,7 @@ public abstract class QrcodeDownload { ...@@ -127,7 +127,7 @@ public abstract class QrcodeDownload {
for (String s : fwhArr) { for (String s : fwhArr) {
byte[] fwhQrcode = createFwhQrcode(qrcodeId, dto.getType(), s, dto.getEndTime(), content.getTitle(), userDetail); byte[] fwhQrcode = createFwhQrcode(qrcodeId, dto.getType(), s, dto.getEndTime(), content.getTitle(), userDetail);
if(fwhQrcode != null){ if(fwhQrcode != null){
ZipEntry e = new ZipEntry(content.getTitle() + File.separator + s + File.separator + content.getTitle() + ".jpg"); ZipEntry e = new ZipEntry(content.getTitleTmp() + File.separator + s + File.separator + content.getTitle() + ".jpg");
zipOutputStream.putNextEntry(e); zipOutputStream.putNextEntry(e);
zipOutputStream.write(fwhQrcode); zipOutputStream.write(fwhQrcode);
zipOutputStream.flush(); zipOutputStream.flush();
...@@ -144,7 +144,7 @@ public abstract class QrcodeDownload { ...@@ -144,7 +144,7 @@ public abstract class QrcodeDownload {
for (String s : appletArr) { for (String s : appletArr) {
byte[] appletQrcode = createAppletQrcode(s, appletPath); byte[] appletQrcode = createAppletQrcode(s, appletPath);
if(appletQrcode != null){ if(appletQrcode != null){
ZipEntry e = new ZipEntry(content.getTitle() + File.separator + s + File.separator + content.getTitle() + ".jpg"); ZipEntry e = new ZipEntry(content.getTitleTmp() + File.separator + s + File.separator + content.getTitle() + ".jpg");
zipOutputStream.putNextEntry(e); zipOutputStream.putNextEntry(e);
zipOutputStream.write(appletQrcode); zipOutputStream.write(appletQrcode);
zipOutputStream.flush(); zipOutputStream.flush();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment