Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/QrcodeController.java

@@ -10,6 +10,7 @@ import com.gic.commons.util.PropertiesVal;
 import com.gic.commons.util.ToolUtil;
 import com.gic.commons.util.ZipFileUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.ano.IgnoreLogin;
 import com.gic.enterprise.context.RequestContext;
 import com.gic.enterprise.dto.*;
 import com.gic.enterprise.error.ErrorCode;
@@ -240,6 +241,20 @@ public class QrcodeController {
         return RestResponse.success(pic);
     }
 
+    @RequestMapping("take-store-qrcode")
+    @IgnoreLogin
+    public RestResponse takeStoreQrcode(String appkey, Integer id, Integer qrcodeType){
+        String path = "pages/index/index?qrcodeParam="+id+"&qrcodeType="+qrcodeType;
+        byte[] appletQrcode = this.createAppletQrcode(appkey, path);
+        UploadResult uploadResult = QQCloudPicUtils.uploadLocalPicStream("pic01", "", appletQrcode);
+        Map<String, Object> pic = new HashMap<>();
+        pic.put("fileId", uploadResult.getFileId());
+        pic.put("url", uploadResult.getUrl());
+        pic.put("downloadUrl", uploadResult.getDownloadUrl());
+        pic.put("path", path);
+        return RestResponse.success(pic);
+    }
+
     private void createQrcode(QrcodeQO qrcodeQO, Integer enterpriseId, final String filePath, String fileId,
                               Integer downLoadId, UserDetail userDetail, String fileName) throws Exception{
         new Thread(new Runnable() {