From 4bfa8875c0fce82200c08d8e16532b16e2e29056 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 二月 2019 11:28:16 +0800
Subject: [PATCH] 券消息+过期+ 退回
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 98 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index ed25d0c..6ede170 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -16,7 +16,6 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.yeshi.utils.BigDecimalUtil;
import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.NumberUtil;
@@ -47,6 +46,7 @@
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.ShamUser;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.common.ImageInfo;
import com.yeshi.fanli.entity.common.JumpDetail;
import com.yeshi.fanli.entity.common.JumpDetailV2;
@@ -69,6 +69,7 @@
import com.yeshi.fanli.exception.goods.ScanHistoryException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
+import com.yeshi.fanli.exception.user.UserCustomSettingsException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -94,12 +95,15 @@
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.monitor.MonitorService;
import com.yeshi.fanli.service.inter.order.OrderService;
+import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.ShareManageService;
import com.yeshi.fanli.service.inter.user.TBPidService;
+import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
@@ -112,6 +116,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.vo.user.UserSettingsVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -224,6 +229,16 @@
@Resource
private JumpDetailV2Service jumpDetailV2Service;
+
+ @Resource
+ private UserCustomSettingsService userCustomSettingsService;
+
+ @Resource
+ private ShareGoodsActivityOrderService shareGoodsActivityOrderService;
+
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
+
@RequestMapping(value = "getrecommendsection")
public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
@@ -1606,7 +1621,8 @@
* @param out
*/
@RequestMapping(value = "getNewRecommendInfo")
- public void getNewRecommendInfo(AcceptData acceptData, String specialCard, String swiperCard, PrintWriter out) {
+ public void getNewRecommendInfo(AcceptData acceptData, Long uid, String specialCard, String swiperCard,
+ PrintWriter out) {
System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
@@ -1717,7 +1733,16 @@
if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 30)
|| ("ios".equalsIgnoreCase(acceptData.getPlatform())
&& Integer.parseInt(acceptData.getVersion()) > 37)) {
- root.put("invite", invite);
+ if (uid != null) {
+ try {
+ UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);
+ if (vo == null || vo.getNoInvitationBonus() == null || vo.getNoInvitationBonus() == 0)// 娌℃湁鍏抽棴閭�璇�
+ root.put("invite", invite);
+ } catch (UserCustomSettingsException e) {
+ e.printStackTrace();
+ }
+ } else
+ root.put("invite", invite);
}
}
@@ -2027,6 +2052,16 @@
data.put("couponUsers", listCouponUser);
data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
+ JSONObject shareActivity = new JSONObject();
+ shareActivity.put("moneyDesc", "鏄ヨ妭鐙傛濂栭噾:楼" + TaoBaoUtil.getGoodsHongBaoMoney(tb,
+ new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));
+ shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");
+
+ if (!StringUtil.isNullOrEmpty(uid)
+ && shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {
+ } else
+ data.put("shareActivity", shareActivity);
+
out.print(JsonUtil.loadTrueResult(data));
final String tempUid = uid;
@@ -2185,4 +2220,64 @@
out.print(JsonUtil.loadTrueResult(data));
}
+ /**
+ * 娲诲姩鍒楄〃
+ *
+ * @param acceptData
+ * @param out
+ */
+ @RequestMapping(value = "getSpecialActivities")
+ public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out) {
+
+ System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ if (system == null) {
+ out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
+ return;
+ }
+
+ try {
+ // 涓撻娲诲姩
+ String specialCard = "special_activities";
+
+ List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,
+ system.getId());
+
+ if (listSpecial != null && listSpecial.size() > 0) {
+ for (Special special : listSpecial) {
+ special.setCreatetime(null);
+ special.setUpdatetime(null);
+ special.setState(null);
+ special.setRemark(null);
+ special.setCard(null);
+ special.setCardId(null);
+
+ JumpDetailV2 jumpDetail = special.getJumpDetail();
+ if (jumpDetail != null) {
+ jumpDetail.setId(null);
+ jumpDetail.setName(null);
+ }
+ // 閭�璇风櫥闄嗛獙璇�
+ if(jumpDetail.getType().equals("invite_web") && jumpDetail.getNeedLogin()
+ && uid != null) {
+
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra != null && userInfoExtra.getInviteCode() != null
+ && userInfoExtra.getInviteCode().trim().length() > 0) {
+
+ JSONObject params = new JSONObject();
+ params.put("url", configService.get("invite_activation_success_url"));
+ special.setParams(params.toString());
+ }
+ }
+ }
+ }
+
+ JSONObject root = new JSONObject();
+ root.put("special", listSpecial);
+
+ out.print(JsonUtil.loadTrueResult(root));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0