唯品会订单bug修复，APP端佣金比例展示错误bug修复

admin

2020-06-10 271ae63c20fcbe28d29c47f1881138ff6551a2a1

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

@@ -71,6 +71,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 +159,9 @@

   @Resource
   private CommonShareInfoService commonShareInfoService;

   @Resource
   private UserCloudService userCloudService;

   @Resource(name = "taskExecutor")
   private TaskExecutor executor;
@@ -637,8 +641,23 @@
         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) {
               if (goodsEvaluate.getType() != EvaluateEnum.activity) {
               EvaluateEnum evaluateEnum = goodsEvaluate.getType();
               // 单品 活动可以一键云发单
               if (cloudOpen && evaluateEnum == EvaluateEnum.activity || evaluateEnum == EvaluateEnum.single ) {
                  goodsEvaluate.setCloud(true);
               }
					
               if (evaluateEnum != EvaluateEnum.activity) {
                  listNew.add(goodsEvaluate);
                  continue;
               }
@@ -1103,7 +1122,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 +1631,5 @@
         }
      });
   }
	
}