分享活动的bug修改

admin

2019-01-28 5bad6c0de1285e581eb8a995e6c2d7c89414f89e

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java

@@ -11,6 +11,7 @@
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;

@@ -331,7 +332,7 @@
    * @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;

@@ -345,16 +346,18 @@
            canAdd = true;

         } else {

            // 是否和上次间隔时间足够

            if (System.currentTimeMillis() - goods.getCreateTime().getTime() >= 1000 * 60 * 60 * 8L) {

            if (System.currentTimeMillis() - goods.getCreateTime().getTime() >= 1000 * 60 * 60 * 4L) {

               canAdd = true;

            }

         }



         if (canAdd) {

         if (canAdd && session.getAttribute("recommendgoods") == null) {

            session.setAttribute("recommendgoods", 1);

            if (hour < 12)

               addRecommendGoods(uid);

            else

               addRecommendGoods(uid, acceptData.getImei(), acceptData.getIdfa());

            session.removeAttribute("recommendgoods");

         }

      }



@@ -376,11 +379,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));