主分类 + 子分类 DAO改造

yujian

2019-03-27 cdcbed9af813b2a02cdc01eefa24db8bec6b51a9

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

@@ -11,12 +11,14 @@
import org.yeshi.utils.encrypt.DESUtil;



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

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

import com.yeshi.fanli.entity.config.AppHomeFloatImg;

import com.yeshi.fanli.entity.taobao.ClientTBPid;

import com.yeshi.fanli.entity.taobao.PidUser;

import com.yeshi.fanli.entity.taobao.TBPid;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

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

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

import com.yeshi.fanli.service.inter.order.CommonOrderCountService;

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

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

@@ -46,7 +48,11 @@


   @Resource

   private CommonOrderCountService commonOrderCountService;



	
   @Resource

   private FloatADService floatADService;

	
	
   /**

    * 首页配置信息

    * 

@@ -56,24 +62,37 @@
   @RequestMapping(value = "getHomeConfig", method = RequestMethod.POST)

   public void getHomeConfig(AcceptData acceptData, Long uid, PrintWriter out) {

      AppHomeFloatImg appHomeFloatImg = configService.getAppHomeFloatImg();

      if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && !Constant.IS_TEST)

      if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && !Constant.IS_TEST) {

         appHomeFloatImg = null;

      }

		
      JSONObject data = new JSONObject();

      if (appHomeFloatImg != null)

      if (appHomeFloatImg != null) {

         data.put("floatImg", appHomeFloatImg);

      }

		
      String notifyImg = configService.getAppHomeFloatNotifyImg();

      if (!StringUtil.isNullOrEmpty(notifyImg)) {

         data.put("floatNotifyImg", notifyImg);

      }

      //

      String config = configService.get("home_float_img_new");

      if (!StringUtil.isNullOrEmpty(config)) {

         if (uid != null) {

            if (!commonOrderCountService.hasRebateAndShareOrder(uid))

               data.put("floatImgDetail", config);

         } else

            data.put("floatImgDetail", config);

		
      // 悬浮大图 1.5.2  -2019.3.20

      FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX);

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

			
         if (uid != null && !commonOrderCountService.hasRebateAndShareOrder(uid)) {

            data.put("floatImgDetail", detail);

         } else {

            data.put("floatImgDetail", detail);

         }

      }

		
      // 领券帮助链接,1.5.2后生效

      String couponHelp = configService.get("taobao_coupon_help");

      data.put("couponHelpUrl", couponHelp);