admin
2020-05-12 2ec42a5aacea35d2918f0e17f07685cf5b4d25c8
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/RecommendController.java
@@ -23,6 +23,7 @@
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -36,6 +37,7 @@
import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.monitor.MonitorService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.pdd.PDDGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
@@ -58,6 +60,9 @@
   @Resource
   private HongBaoManageService hongBaoManageService;
   @Resource
   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
   @Resource
   private QualityGoodsService qualityGoodsService;
@@ -136,7 +141,6 @@
               params = JSONObject.fromObject(swiper.getParams());
            }
            swiper.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(swiper.getJumpDetail()));
            swiper.setParams(null);
         }
         // 圆形专题
@@ -156,7 +160,6 @@
            }
            
            special.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(jumpDetail));
            special.setParams(null);
         }
         // 活动
@@ -171,7 +174,6 @@
               params = JSONObject.fromObject(swiper.getParams());
            }
            swiper.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(swiper.getJumpDetail()));
            swiper.setParams(null);
         }
         JSONObject data = new JSONObject();
@@ -220,6 +222,7 @@
         JSONObject data = new JSONObject();
         data.put("list", new JSONArray());
         data.put("count", 0);
         data.put("page", page);
         out.print(JsonUtil.loadTrueResult(data));
      }
   }
@@ -245,7 +248,7 @@
         List<JDGoods> goodsList = result.getGoodsList();
         if (goodsList != null && goodsList.size() > 0) {
            ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
                  acceptData.getVersion());
            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
@@ -259,6 +262,7 @@
      data.put("list", array);
      data.put("count", count);
      data.put("page", page);
      out.print(JsonUtil.loadTrueResult(data));
   }
@@ -278,7 +282,7 @@
         Gson gson = JsonUtil.getApiCommonGson();
         List<PDDGoodsDetail> goodsList = result.getGoodsList();
         if (goodsList != null && goodsList.size() > 0) {
            ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
                  acceptData.getVersion());
            for (PDDGoodsDetail goods : goodsList) {
@@ -291,6 +295,7 @@
      JSONObject data = new JSONObject();
      data.put("list", array);
      data.put("count", count);
      data.put("page", page);
      out.print(JsonUtil.loadTrueResult(data));
   }
@@ -307,7 +312,7 @@
   public void getGuide(AcceptData acceptData, Long uid, PrintWriter out) {
      String tips = null;
      if (uid == null || uid <= 0) {
         tips = configService.get("tip_guide_new_user");
         tips = configService.get(ConfigKeyEnum.tipGuideNewUser.getKey());
      } else {
         long rebateOrder = hongBaoV2CountService.countRebateOrder(uid);
         long shareOrInviteOrder = hongBaoV2CountService.countShareOrInviteOrder(uid);
@@ -315,13 +320,13 @@
            // 熟客版
         } else if (rebateOrder <= 0 && shareOrInviteOrder <= 0) {
            // 新人版
            tips = configService.get("tip_guide_new_user");
            tips = configService.get(ConfigKeyEnum.tipGuideNewUser.getKey());
         } else if (rebateOrder > 0 && shareOrInviteOrder <= 0) {
            // 省钱版
            tips = configService.get("tip_guide_save_money");
            tips = configService.get(ConfigKeyEnum.tipGuideSaveMoney.getKey());
         } else {
            // 赚钱版
            tips = configService.get("tip_guide_share_invite");
            tips = configService.get(ConfigKeyEnum.tipGuideShareInvite.getKey());
         }
      }