分享活动的bug修改

admin

2019-01-28 5bad6c0de1285e581eb8a995e6c2d7c89414f89e

分享活动的bug修改

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

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

@@ -229,6 +230,9 @@


    @Resource

    private UserCustomSettingsService userCustomSettingsService;



    @Resource

    private ShareGoodsActivityOrderService shareGoodsActivityOrderService;



    @RequestMapping(value = "getrecommendsection")

    public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {

@@ -2047,7 +2051,10 @@
                new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));

        shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");



        data.put("shareActivity", shareActivity);

        if (!StringUtil.isNullOrEmpty(uid)

                && shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {

        } else

            data.put("shareActivity", shareActivity);



        out.print(JsonUtil.loadTrueResult(data));




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

@@ -100,6 +100,6 @@
        if (first)

            out.print(JsonUtil.loadTrueResult(data));

        else

            out.print(JsonUtil.loadTrue(0, data, "绑定淘宝失败"));

            out.print(JsonUtil.loadTrue(0, data, "淘宝授权未成功，请稍后再试"));

    }

}


 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;

@@ -350,11 +351,13 @@
                }

            }



            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");

            }

        }