云发单 后台管理

yujian

2020-06-03 80e39e3a40283521fc732c930aa51d9bece7c146

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

@@ -55,6 +55,7 @@
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;
@@ -71,6 +72,7 @@
import com.yeshi.fanli.service.inter.user.QrCodeService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.cloud.UserCloudService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;
import com.yeshi.fanli.util.Constant;
@@ -158,6 +160,9 @@

   @Resource
   private CommonShareInfoService commonShareInfoService;

   @Resource
   private UserCloudService userCloudService;

   @Resource(name = "taskExecutor")
   private TaskExecutor executor;
@@ -638,7 +643,14 @@
            listNew.addAll(list);
         } else if (list.size() > 0) { // 活动图片不允许跳转
            for (GoodsEvaluate goodsEvaluate : list) {
               if (goodsEvaluate.getType() != EvaluateEnum.activity) {
               EvaluateEnum evaluateEnum = goodsEvaluate.getType();
               // 单品 活动可以一键云发单
               if (evaluateEnum == EvaluateEnum.activity || evaluateEnum == EvaluateEnum.single ) {
                  goodsEvaluate.setCloud(true);
               }
					
					
               if (evaluateEnum != EvaluateEnum.activity) {
                  listNew.add(goodsEvaluate);
                  continue;
               }
@@ -1103,7 +1115,7 @@
         } else {
            newText = newText.replace("[券后价]", MoneyBigDecimalUtil.getWithNoZera(goods.getCouponPrice()) + "");
         }
         newText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
         newText = newText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
      }

      JSONObject data = new JSONObject();
@@ -1612,4 +1624,5 @@
         }
      });
   }
	
}