用户注册信息

yujian

2020-01-18 f4a0f2acc63d7785eab108419a4e16f5f688cb95

 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java

@@ -32,7 +32,6 @@
import com.yeshi.fanli.dto.pdd.PDDGoodsResult;

import com.yeshi.fanli.dto.pdd.PDDPromotionUrl;

import com.yeshi.fanli.dto.pdd.PDDSearchFilter;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;

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

@@ -40,47 +39,33 @@
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.jd.JDGoods;

import com.yeshi.fanli.entity.jd.JDGoodsClass;

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

import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;

import com.yeshi.fanli.exception.user.UserInfoExtraException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

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

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

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

import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;

import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

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

import com.yeshi.fanli.service.inter.jd.JDGoodsClassService;

import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.redpack.UserTaoLiJinNewbiesService;

import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;

import com.yeshi.fanli.service.inter.taobao.TLJFreeBuyGoodsService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.JumpDetailUtil;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;

import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;

import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;

import com.yeshi.fanli.util.factory.CommonGoodsFactory;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

import com.yeshi.fanli.util.jd.JDApiUtil;

@@ -165,7 +150,7 @@
   @RequestMapping(value = "getTopCategory", method = RequestMethod.POST)

   public void getTopCategory(WXMPAcceptData acceptData, PrintWriter out) {

      JSONObject data = new JSONObject();

      data.put("list", configService.get("jd_wxmp_class"));

      data.put("list", configService.get(ConfigKeyEnum.jdWXMPClass.getKey()));

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

   }



@@ -199,7 +184,7 @@
            if (StringUtil.isNullOrEmpty(swiper.getParams())) {

               params = JSONObject.fromObject(swiper.getParams());

            }

            swiper.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(swiper.getJumpDetail(), params));

            swiper.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(swiper.getJumpDetail()));

            swiper.setParams(null);

         }

         data.put("bannerList", JsonUtil.getApiCommonGson().toJson(picList));

@@ -381,7 +366,7 @@
      List<ShamUser> listShareUser = new ArrayList<ShamUser>();



      // 京东开启分享

      String open = configService.get("share_jd_open");

      String open = configService.get(ConfigKeyEnum.shareOpenJD.getKey());

      if ("1".equals(open.trim())) {

         extraVO.setShareValid(true);

         MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();

@@ -425,7 +410,7 @@
      extraVO.setFanliValid(true);



      if (StringUtil.isNullOrEmpty(helpLink)) {

         helpLink = configService.get("no_rebate_help_link");

         helpLink = configService.get(ConfigKeyEnum.noRebateHelpLink.getKey());

      }



      ShareVO shareInfoVO = new ShareVO();

@@ -492,7 +477,7 @@
      }

      

      GoodsDetailExtraVO extraVO = new GoodsDetailExtraVO();

      extraVO.setDetailUrl("http://apph5.yeshitv.com/apppage/goods_img_pdd.html?id=" + id);

      extraVO.setDetailUrl("http://apph5.banliapp.com/apppage/goods_img_pdd.html?id=" + id);

      

      String salesTip = pddGoods.getSalesTip();

      if (!StringUtil.isNullOrEmpty(salesTip)) {

@@ -548,7 +533,7 @@
      extraVO.setShareValid(true);



      if (StringUtil.isNullOrEmpty(helpLink)) {

         helpLink = configService.get("no_rebate_help_link");

         helpLink = configService.get(ConfigKeyEnum.noRebateHelpLink.getKey());

      }



      ShareVO shareInfoVO = new ShareVO();

@@ -584,7 +569,7 @@
    * @param out

    */

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

   public void getRecommendGoods(AcceptData acceptData, long id, Integer goodsType, PrintWriter out) {

   public void getRecommendGoods(WXMPAcceptData acceptData, long id, Integer goodsType, PrintWriter out) {

      if (goodsType == null || goodsType < 2 || goodsType > 3) {

         out.print(JsonUtil.loadFalseResult(1, "请传递正确平台参数"));

         return;

@@ -838,7 +823,7 @@
      String scene = goodsType+"#"+goodsId+"#" + inviteCode;

      FileUploadResult uploadResult = null;

      if (type == 1) {

         String erCodeUrl = "https://wxmp.banliapp.com/goods?info="+ scene;

         String erCodeUrl = "https://wxmp.banliapp.com/goods?i="+ scene;

         uploadResult = qrCodeService.drawGoodsPoster(erCodeUrl, user.getPortrait(), goods);

      } else {

         String acessToken = WXUtil.getAcessToken(Constant.WXMP_APP_INFO.getAppId(), Constant.WXMP_APP_INFO.getAppSecret());