admin
2019-11-03 788deca1b4a24f8a24e49c24f7d89975a1d74bbe
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
@@ -10,13 +10,9 @@
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.encrypt.DESUtil;
import com.taobao.api.TaobaoClient;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;
import com.yeshi.fanli.entity.bus.tlj.DeviceTaoLiJinRecord;
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin;
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin.TaoLiJinOriginEnum;
import com.yeshi.fanli.entity.bus.user.UserActiveLog;
import com.yeshi.fanli.entity.config.AppHomeFloatImg;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
@@ -25,11 +21,11 @@
import com.yeshi.fanli.service.inter.homemodule.FloatADService;
import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.tlj.DeviceTaoLiJinRecordService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
@@ -74,9 +70,6 @@
   private UserTaoLiJinOriginService uerTaoLiJinOriginService;
   @Resource
   private DeviceTaoLiJinRecordService deviceTaoLiJinRecordService;
   @Resource
   private UserActiveLogService userActiveLogService;
   /**
@@ -105,27 +98,8 @@
         data.put("floatNotifyImg", notifyImg);
      }
      FloatAD floatAD = null;
      if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
         if (uid == null) {
            DeviceTaoLiJinRecord deviceRecord = deviceTaoLiJinRecordService.getByDevice(acceptData.getDevice());
            if (deviceRecord == null) {
               floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 1);
            }
         } else {
            UserTaoLiJinOrigin userTaoLiJin = uerTaoLiJinOriginService.getByUidAndOrigin(uid,
                  TaoLiJinOriginEnum.newbiesWin.name());
            if (userTaoLiJin == null) {
               floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 1);
            }
         }
      }
      // 无新人弹框 则查询默认
      if (floatAD == null) {
         floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 0);
      }
      FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 0);
      if (floatAD != null) {
         JSONObject detail = new JSONObject();
@@ -171,25 +145,7 @@
    */
   @RequestMapping(value = "getMSGConfig", method = RequestMethod.POST)
   public void getMSGConfig(AcceptData acceptData, Long uid, PrintWriter out) {
      JSONObject data = new JSONObject();
      boolean show = false;
      if (uid != null) {
         show = uerTaoLiJinOriginService.hasRankHongBao(uid);
      }
      if (show) {
         FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_MSGCENTER, null);
         if (floatAD != null) {
            JSONObject detail = new JSONObject();
            detail.put("img", floatAD.getPicture());
            detail.put("jumpDetail", floatAD.getJumpDetail());
            detail.put("params", floatAD.getParams());
            detail.put("showTime", floatAD.getShowMode());
            detail.put("accountLogin", floatAD.isJumpNeedLogin());
            data.put("floatImgDetail", detail);
         }
      }
      out.print(JsonUtil.loadTrueResult(data));
      out.print(JsonUtil.loadFalseResult("推广红包相关功能已下线!"));
   }
   @RequestMapping(value = "getTaoBaoCartConfig", method = RequestMethod.POST)
@@ -282,10 +238,27 @@
         data.put("baichuan", false);// 不需要采用阿里百川的方式加载webview
         data.put("goodsDetail", false);// 不需要拦截商品详情
      }
//TODO 前端需要处理
//      if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
//         JSONObject js = new JSONObject();
//         String jsStr = configService.get("url_extract_id");
//         String md5 = StringUtil.Md5(jsStr);
//         js.put("md5", md5);
//         data.put("js", js);
//      }
      out.print(JsonUtil.loadTrueResult(data));
   }
   @RequestMapping(value = "getWebJS", method = RequestMethod.POST)
   public void getWebJS(AcceptData acceptData, PrintWriter out) {
      JSONObject data = new JSONObject();
      String urlIdJS = configService.get("url_extract_id");
      data.put("urlIdJSMD5", StringUtil.Md5(urlIdJS));
      data.put("urlIdJS", AESUtil.encrypt(urlIdJS, Constant.UIDAESKEY));
      out.print(JsonUtil.loadTrueResult(data));
   }
   /**
    * 获取账号绑定中的配置信息
    *