From b6cfc585d1a31d71ad2f393b09076304f65589a1 Mon Sep 17 00:00:00 2001
From: johnswang <johnswang@localhost>
Date: 星期一, 19 四月 2021 18:08:00 +0800
Subject: [PATCH] 完善自动作业任务;完善分享名片的二维码

---
 src/com/yc/sdk/shopping/action/api/Poster.java |   41 +++++++++++++++++++++++++++++++----------
 1 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/com/yc/sdk/shopping/action/api/Poster.java b/src/com/yc/sdk/shopping/action/api/Poster.java
index 0aa52b3..0fe48a6 100644
--- a/src/com/yc/sdk/shopping/action/api/Poster.java
+++ b/src/com/yc/sdk/shopping/action/api/Poster.java
@@ -8,6 +8,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import com.yc.utils.SessionKey;
 import org.apache.commons.io.FileUtils;
@@ -73,22 +74,24 @@
      */
     @GetMapping("/getQrCodeForPoster.do")
     public void getQrCodeForPoster(HttpServletRequest request, HttpServletResponse response) {
+    	HttpSession session = request.getSession();
     	JsonObject json = new JsonObject();
 		JsonObject errJson = new JsonObject();
     	//CallBackMessage callBackMessage=new CallBackMessage();
+		String openId = (session.getAttribute(SessionKey.WEIXIN_OPENID) == null ? "": (String) session.getAttribute(SessionKey.WEIXIN_OPENID));
 		
-		String fromUserId = request.getParameter(SettingKey.FROMUSERID) ;
-    	if (fromUserId == null||"".equals(fromUserId)) {
-    		errJson.addProperty("warning","璇蜂紶閫� FromUserId 鍙傛暟銆�/getQrCodeForPoster.do銆�");
+		//QrCodeType : 10 鍟嗗煄棣栭〉 锛� 20 鎴戠殑鍚嶇墖锛�30 鍟嗗搧鏄庣粏锛�40 鐩存挱闂达紝50 浼樻儬鍔碉紝60 鍏充簬鎴戜滑, 70 鎶㈣喘鍟嗗搧鏄庣粏, 80 娲诲姩鏄庣粏
+		String qrCodeType = request.getParameter("QrCodeType") ;
+		if (qrCodeType == null||"".equals(qrCodeType)) {
+			errJson.addProperty("warning","璇蜂紶閫� QrCodeType 鍙傛暟銆�/getQrCodeForPoster.do銆�");
 			json.add("error", errJson);
 			this.printJson(response, json.toString());
 			return ;
 		}
-    	
-    	//QrCodeType : 10 鍟嗗煄棣栭〉 锛� 20 鎴戠殑鍚嶇墖锛�30 鍟嗗搧鏄庣粏锛�40 鐩存挱闂达紝50 浼樻儬鍔碉紝60 鍏充簬鎴戜滑
-    	String qrCodeType = request.getParameter("QrCodeType") ;
-    	if (qrCodeType == null||"".equals(qrCodeType)) {
-    		errJson.addProperty("warning","璇蜂紶閫� QrCodeType 鍙傛暟銆�/getQrCodeForPoster.do銆�");
+		
+		String fromUserId = request.getParameter(SettingKey.FROMUSERID) ;
+    	if (!qrCodeType.equals("80")&& (fromUserId == null||"".equals(fromUserId))) {
+    		errJson.addProperty("warning","璇蜂紶閫� FromUserId 鍙傛暟銆�/getQrCodeForPoster.do銆�");
 			json.add("error", errJson);
 			this.printJson(response, json.toString());
 			return ;
@@ -138,7 +141,15 @@
 			this.printJson(response, json.toString());
 			return ;
     	}
-
+    	
+    	String docCode = request.getParameter(SettingKey.DOCCODE) ;
+    	if (qrCodeType.equals("80") && (docCode == null||"".equals(docCode))) {
+    		errJson.addProperty("warning","鑾峰彇銆愭椿鍔ㄣ�戜簩缁寸爜鏃跺繀椤讳紶閫� doccode 鍙傛暟銆�/getQrCodeForPoster.do銆�");
+			json.add("error", errJson);
+			this.printJson(response, json.toString());
+			return ;
+    	}
+    	String referralsOpenId = request.getParameter(SettingKey.ReferralsOpenId);   //瀵艰喘鐨� openid 
     	
     	String qrCodeParameter = "" ;
     	switch(qrCodeType) {
@@ -153,6 +164,13 @@
     			break;
     		case "70":
     			qrCodeParameter = depositDocCode+";"+ depositRowId ;
+    			break;
+    		case "80":
+    			if (referralsOpenId!=null&&!"".equals(referralsOpenId)) {
+    				fromUserId = referralsOpenId;
+    			}else {
+    				fromUserId = openId;
+    			}
     			break;
     		default:
     			qrCodeParameter = "" ;
@@ -217,6 +235,9 @@
 				case "70":
 					pathUrl = "pages/detailEvents/detailEvents?"+ SettingKey.MATCODE + "=" + matCode+"&DepositDocCode="+depositDocCode +"&DepositRowId="+depositRowId+"&"+SettingKey.FROMUSERID+"="+fromUserId;
 					break;	
+				case "80":  //娲诲姩
+					pathUrl = "pages/detail/detail?"+SettingKey.DOCCODE+"=" + docCode + "&" + SettingKey.ReferralsOpenId + "=" + referralsOpenId ;
+					break;
 				default:
 					pathUrl = "pages/index/index?"+SettingKey.FROMUSERID+"="+fromUserId ;
 					break ;
@@ -273,7 +294,7 @@
 	    			this.printJson(response, json.toString());
 					return ;
 			}else {
-					errJson.addProperty("warning","淇濆瓨鐩存挱闂翠簩缁寸爜澶辫触銆�/getQrCodeForPoster.do銆�");
+					errJson.addProperty("warning","淇濆瓨浜岀淮鐮佸け璐ャ��/getQrCodeForPoster.do銆�");
 					json.add("error", errJson);
 					this.printJson(response, json.toString());
 					return ;

--
Gitblit v1.8.0