From fe879975a3e8a0a1aa280fb839e02d159bfbcff8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 18:04:38 +0800
Subject: [PATCH] 金币任务多次获取bug修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
index 57cd286..9fdcf5f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
@@ -15,10 +15,15 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import com.yeshi.fanli.dto.push.PushContentDTO;
 import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;
+import com.yeshi.fanli.entity.config.push.PushMsgFactory;
+import com.yeshi.fanli.exception.PushException;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService;
+import com.yeshi.fanli.service.inter.push.PushService;
+import com.yeshi.fanli.util.StringUtil;
 
 import net.sf.json.JSONObject;
 
@@ -33,6 +38,9 @@
 public class CallBackController {
 	@Resource
 	private ConfigService configService;
+
+	@Resource
+	private PushService pushService;
 
 	@Resource
 	private MsgDeviceReadStateService msgDeviceReadStateService;
@@ -71,7 +79,7 @@
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		
+
 		LogHelper.test("缇庢唇:body----" + sb.toString());
 
 		String sign = "";
@@ -97,11 +105,22 @@
 			else if (contentType.equalsIgnoreCase("audio"))
 				msg = "[璇煶]";
 			String customizedId = json.optJSONObject("customizedData").optString("璁惧鏍囪瘑");
+			String uid = json.optJSONObject("customizedData").optString("鐢ㄦ埛ID");
 			msgDeviceReadStateService.addUnreadDeviceMsg(MsgDeviceReadState.TYPE_KEFU, customizedId,
 					"android".equalsIgnoreCase(deviceOS) ? 1 : 2, 1, msg, new Date());
+			if (!StringUtil.isNullOrEmpty(uid))// 鎺ㄩ�佸鏈嶆秷鎭�
+			{
+				PushContentDTO dto = PushMsgFactory.createMsgKefu();
+				try {
+					pushService.pushZNX(Long.parseLong(uid), dto.getTitle(), dto.getContent(), null, null);
+				} catch (NumberFormatException e) {
+					e.printStackTrace();
+				} catch (PushException e) {
+					e.printStackTrace();
+				}
+			}
 		}
 
-		
 	}
 
 	public String sign(String raw_body) throws java.security.SignatureException {
@@ -126,4 +145,9 @@
 		out.print("success");
 	}
 
+	@RequestMapping(value = "vip")
+	public void VIP(PrintWriter out) {
+		out.print("success");
+	}
+
 }

--
Gitblit v1.8.0