券相关使用调整

yujian

2019-02-26 f2c91f920851153695d29ab047328801974cd459

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

@@ -46,6 +46,7 @@
import com.yeshi.fanli.entity.bus.user.Order;

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

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

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

import com.yeshi.fanli.entity.common.ImageInfo;

import com.yeshi.fanli.entity.common.JumpDetail;

import com.yeshi.fanli.entity.common.JumpDetailV2;

@@ -102,6 +103,7 @@
import com.yeshi.fanli.service.inter.user.TBPidService;

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -233,6 +235,10 @@


   @Resource

   private ShareGoodsActivityOrderService shareGoodsActivityOrderService;

	
   @Resource

   private UserInfoExtraService userInfoExtraService;

	


   @RequestMapping(value = "getrecommendsection")

   public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {

@@ -2222,7 +2228,7 @@
    * @param out

    */

   @RequestMapping(value = "getSpecialActivities")

   public void getSpecialActivities(AcceptData acceptData, PrintWriter out) {

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



      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

@@ -2251,6 +2257,20 @@
                  jumpDetail.setId(null);

                  jumpDetail.setName(null);

               }

					
               // 邀请登陆验证

               if(jumpDetail.getType().equals("invite_web") && jumpDetail.getNeedLogin()

                     && uid != null) {

						
                  UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

                  if (userInfoExtra != null && userInfoExtra.getInviteCode() != null

                        && userInfoExtra.getInviteCode().trim().length() > 0) {

							
                     JSONObject params = new JSONObject();

                     params.put("url", configService.get("invite_activation_success_url"));

                     special.setParams(params.toString());

                  }

               }

            }

         }