邀请对应奖励红包加入版本区分

yujian

2019-06-26 020d940ae4e16f55f69cef3dd4c8dc0b9764af07

 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java

@@ -8,9 +8,9 @@
import java.util.UUID;



import javax.annotation.Resource;

import javax.transaction.Transactional;



import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.springframework.web.multipart.MultipartFile;

import org.yeshi.utils.tencentcloud.COSManager;



@@ -46,8 +46,10 @@
      }

      

      String params = record.getParams();

      if ((params != null && params.trim().length() == 0) || "null".equalsIgnoreCase(params) ) {

      if (params == null || params.trim().length() == 0 || "null".equalsIgnoreCase(params) ) {

         record.setParams(null);

      } else if (!StringUtil.isJson(params)) {

         throw new FloatADException(1, "跳转参数非JSON格式");

      }

      

      if (!StringUtil.isNullOrEmpty(jumpType)) {

@@ -91,6 +93,10 @@
            record.setState(0);

         }

         

         Integer type = record.getType();

         if (type == null) {

            record.setType(0);

         }

         record.setOrder(maxOrder + 1);

         record.setCreateTime(new Date());

         record.setUpdateTime(new Date());

@@ -111,6 +117,7 @@
            record.setPicture(resultObj.getPicture());

         }

         

         record.setType(resultObj.getType());

         record.setOrder(resultObj.getOrder());

         record.setCreateTime(resultObj.getCreateTime());

         record.setUpdateTime(new Date());

@@ -256,8 +263,8 @@
   }



   @Override

   public FloatAD getEffectiveFloatAD(String position) {

      FloatAD floatAD = floatADMapper.getEffectiveFloatAD(position);

   public FloatAD getEffectiveFloatAD(String position, Integer type) {

      FloatAD floatAD = floatADMapper.getEffectiveFloatAD(position, type);

      if (floatAD != null) {

         JumpDetailV2 jumpDetail = floatAD.getJumpDetail();