From 020d940ae4e16f55f69cef3dd4c8dc0b9764af07 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 26 六月 2019 10:59:48 +0800
Subject: [PATCH] 邀请对应奖励红包加入版本区分
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 164 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 144 insertions(+), 20 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
index 018b8c7..c35440f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -12,15 +12,25 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
+import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;
+import com.yeshi.fanli.entity.bus.tlj.DeviceTaoLiJinRecord;
+import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin;
+import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin.TaoLiJinOriginEnum;
import com.yeshi.fanli.entity.config.AppHomeFloatImg;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
+import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.homemodule.FloatADService;
+import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
+import com.yeshi.fanli.service.inter.tlj.DeviceTaoLiJinRecordService;
+import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.fanli.util.VersionUtil;
import net.sf.json.JSONObject;
@@ -49,6 +59,20 @@
@Resource
private FloatADService floatADService;
+ @Resource
+ private JumpDetailV2Service jumpDetailV2Service;
+
+ @Resource
+ private MsgDeviceReadStateService msgDeviceReadStateService;
+
+ @Resource
+ private UserTaoLiJinOriginService uerTaoLiJinOriginService;
+
+ @Resource
+ private DeviceTaoLiJinRecordService deviceTaoLiJinRecordService;
+
+
+
/**
* 棣栭〉閰嶇疆淇℃伅
*
@@ -72,8 +96,27 @@
data.put("floatNotifyImg", notifyImg);
}
- // 鎮诞澶у浘 1.5.2 -2019.3.20
- FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX);
+ FloatAD floatAD = null;
+
+ if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (uid == null) {
+ DeviceTaoLiJinRecord deviceRecord = deviceTaoLiJinRecordService.getByDevice(acceptData.getDevice());
+ if (deviceRecord == null) {
+ floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 1);
+ }
+ } else {
+ UserTaoLiJinOrigin userTaoLiJin = uerTaoLiJinOriginService.getByUidAndOrigin(uid, TaoLiJinOriginEnum.newbiesWin.name());
+ if (userTaoLiJin == null) {
+ floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 1);
+ }
+ }
+ }
+
+ // 鏃犳柊浜哄脊妗� 鍒欐煡璇㈤粯璁�
+ if (floatAD == null) {
+ floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 0);
+ }
+
if (floatAD != null) {
JSONObject detail = new JSONObject();
detail.put("img", floatAD.getPicture());
@@ -81,13 +124,7 @@
detail.put("params", floatAD.getParams());
detail.put("showTime", floatAD.getShowMode());
detail.put("accountLogin", floatAD.isJumpNeedLogin());
-
- if (uid != null && userInfoExtraService.isNewUser(uid)) {
- // 鏂扮敤鎴�
- data.put("floatImgDetail", detail);
- } else {
- data.put("floatImgDetail", detail);
- }
+ data.put("floatImgDetail", detail);
}
// 棰嗗埜甯姪閾炬帴,1.5.2鍚庣敓鏁�
@@ -103,10 +140,49 @@
out.print(JsonUtil.loadTrueResult(data));
}
+
+ /**
+ * 娑堟伅涓績寮规
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "getMSGConfig", method = RequestMethod.POST)
+ public void getMSGConfig(AcceptData acceptData, Long uid, PrintWriter out) {
+ JSONObject data = new JSONObject();
+ boolean show = false;
+ if (uid != null ) {
+ show = uerTaoLiJinOriginService.hasRankHongBao(uid);
+ }
+
+ if (show) {
+ FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_MSGCENTER, null);
+ if (floatAD != null) {
+ JSONObject detail = new JSONObject();
+ detail.put("img", floatAD.getPicture());
+ detail.put("jumpDetail", floatAD.getJumpDetail());
+ detail.put("params", floatAD.getParams());
+ detail.put("showTime", floatAD.getShowMode());
+ detail.put("accountLogin", floatAD.isJumpNeedLogin());
+ data.put("floatImgDetail", detail);
+ }
+ }
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
+
@RequestMapping(value = "getTaoBaoCartConfig", method = RequestMethod.POST)
- public void getTaoBaoCartConfig(AcceptData acceptData, Long uid, PrintWriter out) {
+ public void getTaoBaoCartConfig(AcceptData acceptData, String position, Long uid, PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛灏氭湭鐧诲綍"));
+ return;
+ }
+
+ // 鏄惁闇�瑕佽喘鐗╁煄杞摼
+ boolean convert = "0".equalsIgnoreCase(configService.get("show_taobao_cart_convert")) ? false : true;
+
+ if (!"cart".equalsIgnoreCase(position) && !convert) {
+ out.print(JsonUtil.loadFalseResult(""));
return;
}
@@ -119,6 +195,11 @@
String cartJS = configService.get("taobao_cart_js");
String cartUrl = configService.get("taobao_cart_link");
+ if (!convert)// 涓嶈浆閾�
+ {
+ cartUrl = "http://";
+ cartJS = "-";
+ }
String js = null;
String link = null;
try {
@@ -144,7 +225,8 @@
@RequestMapping(value = "getWebConfig", method = RequestMethod.POST)
public void getWebConfig(AcceptData acceptData, String url, PrintWriter out) {
JSONObject data = new JSONObject();
- if (url != null && (url.contains("s.click") || url.contains("taobao.com") || url.contains("tmall.com"))) {
+ if (url != null && (url.contains("s.click") || url.contains("taobao.com") || url.contains("tmall.com")
+ || url.contains("m.tb.cn"))) {
data.put("baichuan", true);// 閲囩敤闃块噷鐧惧窛鐨勬柟寮忓姞杞絯ebview
data.put("goodsDetail", true);// 闇�瑕佹嫤鎴晢鍝佽鎯�
} else {
@@ -182,6 +264,9 @@
JSONObject data = new JSONObject();
data.put("serviceProtocolLink", serviceProtocol);
data.put("privacyProtocolLink", privacyProtocol);
+ // 璐墿杞﹁烦杞柟寮�(鍖呭惈jumpDetail涓巔arams)
+ JSONObject source = JSONObject.fromObject(configService.get("taobao_cart_jump_detail"));
+ data.put("taoBaoCart", source);
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
@@ -198,16 +283,55 @@
*/
@RequestMapping(value = "getOrderParseConfig", method = RequestMethod.POST)
public void getOrderParseConfig(AcceptData acceptData, PrintWriter out) {
- String orderJS = configService.get("taobao_order_parse_js");
- JSONObject data = new JSONObject();
- try {
- data.put("orderJS", DESUtil.encode(orderJS, StringUtil.getBase64String("YeShiFANLI889*+"),
- StringUtil.getBase64String("*M#34f?,")));
- data.put("orderUrl", DESUtil.encode("https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm",
- StringUtil.getBase64String("YeShiFANLI889*+"), StringUtil.getBase64String("*M#34f?,")));
- } catch (Exception e) {
- e.printStackTrace();
+
+ if ("0".equalsIgnoreCase(configService.get("auto_find_taobao_order")))
+ out.print(JsonUtil.loadFalseResult(1, "鏆備笉鏀寔"));
+ else {
+ String orderJS = configService.get("taobao_order_parse_js");
+ JSONObject data = new JSONObject();
+ try {
+ data.put("orderJS", DESUtil.encode(orderJS, StringUtil.getBase64String("YeShiFANLI889*+"),
+ StringUtil.getBase64String("*M#34f?,")));
+ data.put("orderUrl",
+ DESUtil.encode("https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm",
+ StringUtil.getBase64String("YeShiFANLI889*+"), StringUtil.getBase64String("*M#34f?,")));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ out.print(JsonUtil.loadTrueResult(data));
}
+ }
+
+ /**
+ * 鑾峰彇璁㈠崟閰嶇疆
+ *
+ * @param acceptData
+ * @param out
+ */
+
+ @RequestMapping(value = "getOrderConfig", method = RequestMethod.POST)
+ public void getOrderConfig(AcceptData acceptData, PrintWriter out) {
+ JSONObject data = new JSONObject();
+ // 娴嬭瘯
+ data.put("showTaoBaoOrder", "0".equalsIgnoreCase(configService.get("show_taobao_order").trim()) ? false : true);
+ data.put("taoBaoOrderUrl", "https://main.m.taobao.com/olist/index.html");
out.print(JsonUtil.loadTrueResult(data));
}
+
+ @RequestMapping(value = "getKeFuConfig", method = RequestMethod.POST)
+ public void getKeFuConfig(AcceptData acceptData, PrintWriter out) {
+ JSONObject data = new JSONObject();
+ data.put("meiqia", "1".equalsIgnoreCase(configService.get("kefu_meiqia")) ? true : false);// 鏄惁璺宠浆缇庢唇锛屼笉璺宠浆缇庢唇灏辩敤鍘熸潵鐨�
+ out.print(JsonUtil.loadTrueResult(data));
+ // 璁剧疆娑堟伅宸茶
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ msgDeviceReadStateService.setDeviceMsgRead(MsgDeviceReadState.TYPE_KEFU, acceptData.getDevice(),
+ "android".equalsIgnoreCase(acceptData.getPlatform()) ? 1 : 2);
+ }
+ });
+
+ }
+
}
--
Gitblit v1.8.0