From b3dcf1245149f6c532c5e479cb83ff1cddd1499b Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 二月 2019 18:13:32 +0800
Subject: [PATCH] 免单商品券后价调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 215 insertions(+), 21 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
index 9672395..0f342db 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
@@ -6,9 +6,12 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,31 +27,45 @@
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;
import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
+import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;
import com.yeshi.fanli.entity.bus.msg.UserMsgUnReadNum;
import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.goods.RecommendUserGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
+import com.yeshi.fanli.exception.goods.CommonGoodsException;
+import com.yeshi.fanli.exception.goods.RecommendUserGoodsException;
import com.yeshi.fanli.exception.msg.UserSystemMsgException;
+import com.yeshi.fanli.exception.user.UserCustomSettingsException;
+import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.goods.RecommendUserGoodsService;
+import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
import com.yeshi.fanli.service.inter.msg.MsgAccountDetailService;
import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;
import com.yeshi.fanli.service.inter.msg.MsgMoneyDetailService;
import com.yeshi.fanli.service.inter.msg.MsgOrderDetailService;
+import com.yeshi.fanli.service.inter.msg.MsgOtherDetailService;
import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;
import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;
+import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import com.yeshi.fanli.util.factory.msg.UserMsgVOFactory;
+import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.msg.UserHomeMsgVO;
import com.yeshi.fanli.vo.msg.UserMsgVO;
import com.yeshi.fanli.vo.msg.UserSystemMsgVO;
+import com.yeshi.fanli.vo.user.UserSettingsVO;
import net.sf.json.JSONObject;
@@ -69,6 +86,9 @@
private MsgAccountDetailService msgAccountDetailService;
@Resource
+ private MsgOtherDetailService msgOtherDetailService;
+
+ @Resource
private UserMsgReadStateService userMsgReadStateService;
@Resource
@@ -80,22 +100,36 @@
@Resource
private UserSystemMsgService userSystemMsgService;
+ @Resource
+ private CommonGoodsService commonGoodsService;
+
+ @Resource
+ private QualityFactoryService qualityFactoryService;
+
+ @Resource
+ private UserCustomSettingsService userCustomSettingsService;
+
+ @Resource
+ private RedisManager redisManager;
+
// 娑堟伅鐨勭被鍨�
final static String MSG_TYPE_ORDER = "order";
final static String MSG_TYPE_MONEY = "money";
final static String MSG_TYPE_ACCOUNT = "account";
final static String MSG_TYPE_INVITE = "invite";
+ final static String MSG_TYPE_OTHER = "other";
/**
- * 鑾峰彇璁㈠崟娑堟伅鍒楄〃
+ * 鑾峰彇娑堟伅鍒楄〃
*
* @param acceptData
* @param uid
* @param page
+ * @param type
* @param out
*/
@RequestMapping(value = "getMsgList", method = RequestMethod.POST)
- public void getOrderMsgList(AcceptData acceptData, Long uid, int page, String type, PrintWriter out) {
+ public void getMsgList(AcceptData acceptData, Long uid, int page, String type, PrintWriter out) {
if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
@@ -140,8 +174,26 @@
List<MsgInviteDetail> detailList3 = msgInviteDetailService.listMsgInviteDetail(uid, page);
count = msgInviteDetailService.countMsgInviteDetail(uid);
if (detailList3 != null)
- for (MsgInviteDetail detail : detailList3)
- list.add(UserMsgVOFactory.create(detail));
+ for (MsgInviteDetail detail : detailList3) {
+ UserMsgVO vo = UserMsgVOFactory.create(detail);
+ if (vo != null)
+ list.add(vo);
+ else
+ count--;
+ }
+ break;
+ case MSG_TYPE_OTHER:
+ userMsgReadStateService.readOtherMsg(uid);
+ List<MsgOtherDetail> detailList4 = msgOtherDetailService.listMsgOtherDetail(uid, page);
+ count = msgOtherDetailService.countMsgOtherDetail(uid);
+ if (detailList4 != null)
+ for (MsgOtherDetail detail : detailList4) {
+ UserMsgVO vo = UserMsgVOFactory.create(detail);
+ if (vo != null)
+ list.add(vo);
+ else
+ count--;
+ }
break;
}
@@ -169,7 +221,17 @@
UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
JSONObject data = JSONObject.fromObject(JsonUtil.getApiCommonGson().toJson(num));
data.put("totalCount", num.getTypeAccount() + num.getTypeInvite() + num.getTypeMoney() + num.getTypeOrder()
- + num.getTypeScore() + num.getTypeSystem());
+ + num.getTypeScore() + num.getTypeSystem() + num.getTypeOther());
+
+ try {
+ UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);
+ if (vo != null && vo.getNoNewsRedDot() != null && vo.getNoNewsRedDot() == 1) {
+ data.put("totalCount", 0);
+ }
+ } catch (UserCustomSettingsException e) {
+ e.printStackTrace();
+ }
+
out.print(JsonUtil.loadTrueResult(data));
}
@@ -212,6 +274,84 @@
return builder;
}
+ private void addRecommendGoods(Long uid, String imei, String idfa) {
+ TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(1, 50, imei, idfa);
+ if (result != null && result.getTaoBaoGoodsBriefs() != null) {
+ for (int i = 0; i < result.getTaoBaoGoodsBriefs().size(); i++) {
+ if (result.getTaoBaoGoodsBriefs().get(i).getCouponAmount() == null
+ || result.getTaoBaoGoodsBriefs().get(i).getCouponAmount().compareTo(new BigDecimal(0)) <= 0) {
+ result.getTaoBaoGoodsBriefs().remove(i);
+ i--;
+ }
+ }
+ // 闅忔満鍑犱釜
+ int count = (int) (Math.random() * 3) + 1;
+ Set<Integer> positionList = new HashSet<>();
+ for (int i = 0; i < count; i++)
+ if (result.getTaoBaoGoodsBriefs().size() > 0) {
+ positionList.add((int) (result.getTaoBaoGoodsBriefs().size() * Math.random()));
+ }
+
+ if (positionList != null && positionList.size() > 0) {
+ List<CommonGoods> goodsList = new ArrayList<>();
+ for (Integer p : positionList) {
+ TaoBaoGoodsBrief goodsB = result.getTaoBaoGoodsBriefs().get(p);
+ try {
+ CommonGoods cgoods = commonGoodsService
+ .addOrUpdateCommonGoods(CommonGoodsFactory.create(goodsB));
+ goodsList.add(cgoods);
+ } catch (CommonGoodsException e) {
+ e.printStackTrace();
+ }
+ }
+ try {
+ recommendUserGoodsService.addRecommend(uid, "", goodsList);
+ } catch (RecommendUserGoodsException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
+ private void addRecommendGoods(Long uid) {
+ List<QualityFactory> qfList = qualityFactoryService.listByMinSalesCountOrderByCreateTimeDesc(10000, 1, 20);
+ if (qfList != null && qfList != null) {
+ for (int i = 0; i < qfList.size(); i++) {
+ if (qfList.get(i).getTaoBaoGoodsBrief().getCouponAmount() == null
+ || qfList.get(i).getTaoBaoGoodsBrief().getCouponAmount().compareTo(new BigDecimal(0)) <= 0) {
+ qfList.remove(i);
+ i--;
+ }
+ }
+ // 闅忔満鍑犱釜
+ int count = (int) (Math.random() * 3) + 1;
+ Set<Integer> positionList = new HashSet<>();
+ for (int i = 0; i < count; i++)
+ if (qfList.size() > 0) {
+ positionList.add((int) (qfList.size() * Math.random()));
+ }
+
+ if (positionList != null && positionList.size() > 0) {
+ List<CommonGoods> goodsList = new ArrayList<>();
+ for (Integer p : positionList) {
+ TaoBaoGoodsBrief goodsB = qfList.get(p).getTaoBaoGoodsBrief();
+ try {
+ CommonGoods cgoods = commonGoodsService
+ .addOrUpdateCommonGoods(CommonGoodsFactory.create(goodsB));
+ goodsList.add(cgoods);
+ } catch (CommonGoodsException e) {
+ e.printStackTrace();
+ }
+ }
+ try {
+ recommendUserGoodsService.addRecommend(uid, "", goodsList);
+ } catch (RecommendUserGoodsException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
/**
* 鑾峰彇棣栭〉娑堟伅
*
@@ -221,15 +361,49 @@
* @param out
*/
@RequestMapping(value = "getHomeMsgList", method = RequestMethod.POST)
- public void getHomeMsgList(AcceptData acceptData, Long uid, int page, PrintWriter out) {
+ public void getHomeMsgList(AcceptData acceptData, Long uid, int page, HttpSession session, PrintWriter out) {
if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
+ if (page == 1) {
+ boolean canAdd = false;
+ int hour = Calendar.getInstance().get(Calendar.HOUR);
+ RecommendUserGoods goods = recommendUserGoodsService.getLatestRecommendUserGoods(uid);
+ if (goods == null) {
+ canAdd = true;
+ } else {
+ // 鏄惁鍜屼笂娆￠棿闅旀椂闂磋冻澶�
+ if (System.currentTimeMillis() - goods.getCreateTime().getTime() >= 1000 * 60 * 60 * 4L) {
+ canAdd = true;
+ }
+ }
+
+ String key = "recommend-goods-user-" + uid;
+ if (Constant.IS_OUTNET) {
+ if (canAdd && StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
+ if (Constant.IS_OUTNET)
+ redisManager.cacheCommonString(key, "1", 20);
+ if (hour < 12)
+ addRecommendGoods(uid);
+ else
+ addRecommendGoods(uid, acceptData.getImei(), acceptData.getIdfa());
+ session.removeAttribute("recommendgoods");
+ }
+ } else {
+ if (canAdd) {
+ if (hour < 12)
+ addRecommendGoods(uid);
+ else
+ addRecommendGoods(uid, acceptData.getImei(), acceptData.getIdfa());
+ }
+ }
+ }
+
List<UserHomeMsgVO> volist = new ArrayList<>();
List<RecommendUserGoods> list = recommendUserGoodsService.listRecommend(uid, page, Constant.PAGE_SIZE);
- long count = recommendUserGoodsService.countRecommend(uid) + 1;// 璁＄畻娆㈣繋璇殑鏁伴噺
+ long count = recommendUserGoodsService.countRecommend(uid);//
Date now = new Date();
for (RecommendUserGoods goods : list) {
@@ -245,11 +419,17 @@
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
for (CommonGoods cg : goods.getGoodsList()) {
if (goods.getGoodsList().size() == 1)
- cg.setPicture(TbImgUtil.getTBSizeImg(cg.getPicture(), 400));
+ cg.setPicture(TbImgUtil.getTBSizeImg(
+ StringUtil.isNullOrEmpty(cg.getPictureWhite()) ? cg.getPicture() : cg.getPictureWhite(),
+ 400));
else if (goods.getGoodsList().size() == 2)
- cg.setPicture(TbImgUtil.getTBSizeImg(cg.getPicture(), 320));
+ cg.setPicture(TbImgUtil.getTBSizeImg(
+ StringUtil.isNullOrEmpty(cg.getPictureWhite()) ? cg.getPicture() : cg.getPictureWhite(),
+ 320));
else if (goods.getGoodsList().size() == 3)
- cg.setPicture(TbImgUtil.getTBSizeImg(cg.getPicture(), 220));
+ cg.setPicture(TbImgUtil.getTBSizeImg(
+ StringUtil.isNullOrEmpty(cg.getPictureWhite()) ? cg.getPicture() : cg.getPictureWhite(),
+ 220));
TaoBaoGoodsBrief tbGoods = new TaoBaoGoodsBrief();
if (cg.getCouponAmount() == null)
tbGoods.setCouponAmount(new BigDecimal(0));
@@ -266,14 +446,21 @@
volist.add(vo);
}
+ Long time = userInfoService.selectByPKey(uid).getCreatetime();
+ if (time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd"))
+ count++;// 璁＄畻娆㈣繋璇殑鏁伴噺
+
if (volist.size() > 0 && volist.size() < Constant.PAGE_SIZE) {
// 娣诲姞娆㈣繋璇�
- UserHomeMsgVO vo = new UserHomeMsgVO();
- vo.setContent("鎭枩浣狅紝鎴愪负杩斿埄鍒哥殑鐢ㄦ埛\n鐙浼樻儬鍒稿府浣犵渷閽憋紱\n鍙備笌濂栭噾娲诲姩甯綘璧氶挶锛沑n璁╄繑鍒╁埜鎴愪负浣犵殑鐪侀挶鍔╂墜鍚э紒");
- vo.setTitle("鏂颁汉娆㈣繋");
- vo.setCreateTime(getTimeDesc(now, new Date(userInfoService.getUserById(uid).getCreatetime())));
- vo.setType(UserHomeMsgVO.TYPE_WELCOME);
- volist.add(vo);
+ // 鍒涘缓鏃堕棿鍦�28鍙峰悗鐨勬墠鏈夋柊浜烘杩�
+ if (time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd")) {
+ UserHomeMsgVO vo = new UserHomeMsgVO();
+ vo.setContent("鎭枩浣狅紝鎴愪负杩斿埄鍒哥殑鐢ㄦ埛\n鐙浼樻儬鍒稿府浣犵渷閽憋紱\n鍙備笌濂栭噾娲诲姩甯綘璧氶挶锛沑n璁╄繑鍒╁埜鎴愪负浣犵殑鐪侀挶鍔╂墜鍚э紒");
+ vo.setTitle("鏂颁汉娆㈣繋");
+ vo.setCreateTime(getTimeDesc(now, new Date(time)));
+ vo.setType(UserHomeMsgVO.TYPE_WELCOME);
+ volist.add(vo);
+ }
}
JSONObject root = new JSONObject();
@@ -283,11 +470,10 @@
UserSystemMsg usm = userSystemMsgService.getLatestUserSystemMsg(uid);
if (usm != null)
root.put("systemMsg",
- new UserSystemMsgVO(usm.getId(), usm.getType().name(), usm.getSolved(), usm.getTitle(),
- usm.getContent(),
+ new UserSystemMsgVO(usm.getId(), usm.getType().name(), usm.getSolved(), "绯荤粺娑堟伅", usm.getTitle(),
usm.getTimeTag() == 1 ? "http://img.flqapp.com/resource/msg/icon_emergent.png" : "",
- Constant.systemCommonConfig.getDefaultPortrait(), getTimeDesc(now, usm.getCreateTime()),
- num.getTypeSystem()));
+ "http://img.flqapp.com/resource/msg/icon_msg_system.png",
+ getTimeDesc(now, usm.getCreateTime()), num.getTypeSystem()));
}
root.put("count", count);
out.print(JsonUtil.loadTrueResult(root));
@@ -361,7 +547,15 @@
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
- userMsgReadStateService.setAllMsgRead(uid);
+
+ UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
+ int totalNum = num.getTypeAccount() + num.getTypeInvite() + num.getTypeMoney() + num.getTypeOrder()
+ + num.getTypeScore() + num.getTypeSystem() + num.getTypeOther();
+ if (totalNum == 0) {
+ out.print(JsonUtil.loadFalseResult(1, "娌℃湁鏈娑堟伅"));
+ return;
+ } else
+ userMsgReadStateService.setAllMsgRead(uid);
out.print(JsonUtil.loadTrueResult(""));
}
--
Gitblit v1.8.0