首页悬浮图mapperbug修改，增加商品详情中的比例展示

admin

2020-01-01 c8f11c229b87d1652b6da0b15576c166cd51eb8b

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java

@@ -7,11 +7,11 @@
import java.util.List;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.dto.money.InviteGetMoney;

@@ -19,7 +19,6 @@
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.bus.user.ThreeSale;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.entity.system.SystemClientParams;

import com.yeshi.fanli.exception.NotExistObjectException;

@@ -27,17 +26,17 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemClientParamsService;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.SpreadUserImgService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserRankingsService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.annotation.integral.IntegralGetFrequencyLimit;

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -127,7 +126,7 @@
      data.put("activityRules", valueBr);

      data.put("inviteList", String.format("http://%s/%s/client/share/friends_new.html",

            Constant.systemCommonConfig.getProjectHost(), Constant.systemCommonConfig.getProjectName()));

      List<SwiperPicture> pictureList = swiperPictureService.getByBannerCard("invite_top_banner");

      List<SwiperPicture> pictureList = swiperPictureService.getByBannerCardAndVersion("invite_top_banner",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));

      if (pictureList != null && pictureList.size() > 0) {

         SwiperPicture picture = pictureList.get(0);

         com.alibaba.fastjson.JSONObject pictureJson = new com.alibaba.fastjson.JSONObject();

@@ -137,12 +136,11 @@
         data.put("topBanner", pictureJson);

      }





      data.put("desc", configService.get("invite_desc"));



      boolean hasCode = false;

      if (uid != null && uid.trim().length() > 0) {

         String inviteCode = userInfoExtraService.getUserInviteCode(Long.parseLong(uid));

         String inviteCode = userInfoExtraService.getInviteCodeByUid(Long.parseLong(uid));

         if (inviteCode != null && inviteCode.trim().length() > 0) {

            hasCode = true; // 已有邀请码

         }

@@ -172,25 +170,26 @@
    * @throws NotExistObjectException

    * @throws IOException

    */

   @RequestSerializableByKey(key = "'listInviteFriendImg-'+#uid")

   @RequestMapping(value = "/listInviteFriendImg", method = RequestMethod.POST)

   public void listInviteFriendImg(AcceptData acceptData,  Long uid, PrintWriter out)

   public void listInviteFriendImg(AcceptData acceptData, Long uid, PrintWriter out, HttpServletRequest request)

         throws NotExistObjectException, IOException {

      JSONObject data = new JSONObject();

      if (uid != null && !uid.equals("0")) {

         List<String> imgList = spreadUserImgService.getUserSpreadImg(uid);

         List<String> imgList = spreadUserImgService.getUserSpreadImg(uid, request);

         data.put("imgUrlList", JsonUtil.getSimpleGsonWithDate().toJson(imgList));

      }



      // 邀请链接

      String shortLink = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/" 
             + Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);

      data.put("inviteLink", shortLink);

		
      UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

      if (userInfoExtra != null) {

         data.put("inviteCode", userInfoExtra.getInviteCode());

//      String shortLink = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/"

//            + Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);

      data.put("inviteLink", "http://a.app.qq.com/o/simple.jsp?pkgname=com.yeshi.ec.rebate");



      String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);

      if (!StringUtil.isNullOrEmpty(inviteCode)) {

         data.put("inviteCode", inviteCode);

      }

		


      // 邀请规则

      String key = "inviteRules"; // key值

      BusinessSystem system = new BusinessSystem();

@@ -203,7 +202,7 @@
      String valueBr = valueN.replace("\n", "<br><br>");



      data.put("helpLink", configService.get("invite_help_link"));

		  


      data.put("inviteRules", valueBr);

      out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "成功"));

   }

@@ -244,11 +243,10 @@
    *            邀请嘛

    * @param out

    */

   @IntegralGetFrequencyLimit(key = "'activationInvite-'+#uid+'-'+#inviteCode", time = 30)

   @RequestSerializableByKey(key = "'activationInvite-'+#uid")

   @RequestMapping(value = "activationInvite")

   public void activationInvite(AcceptData acceptData, String callback, Long uid, String inviteCode, PrintWriter out) {

      try {



         if (uid == null || inviteCode == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("传递参数不正确"));

            return;

@@ -270,7 +268,6 @@
      }

   }



	
   /**

    * 激活邀请

    * 

@@ -281,11 +278,12 @@
    *            邀请嘛

    * @param out

    */

   @RequestSerializableByKey(key = "'activationInviteWX-'+#uid")

   @RequestMapping(value = "activationInviteWX")

   @IntegralGetFrequencyLimit(key = "'activationInviteWX-'+#uid+'-'+#code", time = 30)

   public void activationInviteWX(AcceptData acceptData, Long uid, String  code, PrintWriter out) {

   public void activationInviteWX(AcceptData acceptData, Long uid, String code, PrintWriter out) {

      try {

         userInfoExtraService.activationInviteWX(uid, code);

         userInfoExtraService.activationInviteWX(

               Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion()), uid, code);

         out.print(JsonUtil.loadTrueResult("邀请码激活成功"));

      } catch (UserInfoExtraException e) {

         out.print(JsonUtil.loadFalseResult(e.getMsg()));

@@ -295,7 +293,6 @@
      }

   }



	
   /**

    * 获取邀请码

    * 

@@ -313,15 +310,15 @@
            return;

         }



         UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

         if (userInfoExtra == null || userInfoExtra.getInviteCode() == null) {

         String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);

         if (StringUtil.isNullOrEmpty(inviteCode)) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("邀请码不存在"));

            return;

         }

         String tip = configService.get("invite_activation_success_tip");



         JSONObject data = new JSONObject();

         data.put("inviteCode", userInfoExtra.getInviteCode());

         data.put("inviteCode", inviteCode);

         data.put("tip", tip);



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));