券统计

yujian

2020-06-12 8a54915d3c39d9d8d7e90c0971d1e19d0eb76622

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java

@@ -55,7 +55,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
import com.yeshi.fanli.exception.goods.ConvertLinkExceptionException;
import com.yeshi.fanli.exception.share.ShareGoodsException;
import com.yeshi.fanli.exception.user.cloud.UserCloudException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -642,19 +641,16 @@
         if (!VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {
            listNew.addAll(list);
         } else if (list.size() > 0) { // 活动图片不允许跳转
				
            // 云发单是否开启
            String cloudState = configService.getByVersion(ConfigKeyEnum.robotCloudOpen.getKey(), acceptData.getPlatform(),
                  Integer.parseInt(acceptData.getVersion()));
            boolean cloudOpen = false;
            if (!StringUtil.isNullOrEmpty(cloudState) && "1".equals(cloudState)) {
               cloudOpen = true;
            }
				
            for (GoodsEvaluate goodsEvaluate : list) {
               EvaluateEnum evaluateEnum = goodsEvaluate.getType();
               // 单品 活动可以一键云发单
               if (evaluateEnum == EvaluateEnum.activity || evaluateEnum == EvaluateEnum.single ) {
                  goodsEvaluate.setCloud(true);
               }
					
					
               if (evaluateEnum != EvaluateEnum.activity) {
                  listNew.add(goodsEvaluate);
                  continue;
               }

               GoodsEvaluate evaluateNew = new GoodsEvaluate();
               try {
                  PropertyUtils.copyProperties(evaluateNew, goodsEvaluate);
@@ -662,6 +658,19 @@
                  e.printStackTrace();
                  continue;
               }
					
               EvaluateEnum evaluateEnum = evaluateNew.getType();
               // 单品 活动可以一键云发单
               if (evaluateEnum == EvaluateEnum.activity || evaluateEnum == EvaluateEnum.single) {
                  evaluateNew.setCloud(cloudOpen);
               }
					
               if (evaluateEnum != EvaluateEnum.activity) {
                  listNew.add(evaluateNew);
                  continue;
               }

					
               // 跳转过渡页
               // String jumpLink =
               // configService.get(ConfigKeyEnum.activityDetailLink.getKey())