admin
2020-06-30 e40d1c22c7202aac843c66f9ee9cc000744f9e10
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -480,15 +480,15 @@
         goodsDetail.setShopInfo(ShopInfoVOFactory.convertTaoBaoShop(shop));
      }
      // 有券处理
      if (goodsDetail.isHasCoupon()) {
         if (!StringUtil.isNullOrEmpty(from)) {
            if ("miandan".equals(from)) { // 免单商品
               MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();
               moneyInfo.setFanliMoney("¥" + goodsDetail.getCouponPrice());
               goodsDetail.setMoneyInfo(moneyInfo);
            }
      // 免单商品
      if (!StringUtil.isNullOrEmpty(from) && "miandan".equals(from)) {
         MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();
         if (goodsDetail.isHasCoupon()) {
            moneyInfo.setFanliMoney("¥" + goodsDetail.getCouponPrice());
         } else {
            moneyInfo.setFanliMoney("¥" + goodsDetail.getZkPrice());
         }
         goodsDetail.setMoneyInfo(moneyInfo);
      }
      extraVO.setTbPidInfo(clientTBPid);
@@ -1074,6 +1074,17 @@
      if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
         getCloudInfo(acceptData, uid, goodsDetail, extraVO); // 云发单文案信息
      }
      // 免单商品
      if (!StringUtil.isNullOrEmpty(from) && "miandan".equals(from)) {
         MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();
         if (goodsDetail.isHasCoupon()) {
            moneyInfo.setFanliMoney("¥" + goodsDetail.getCouponPrice());
         } else {
            moneyInfo.setFanliMoney("¥" + goodsDetail.getZkPrice());
         }
         goodsDetail.setMoneyInfo(moneyInfo);
      }
      JSONObject object = new JSONObject();
      object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));
@@ -1376,7 +1387,7 @@
    */
   private void getCloudInfo(AcceptData acceptData,Long uid, GoodsDetailVO goodsDetail, GoodsDetailExtraVO extraVO) {
      // 云发单是否开启
      boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpenGoodsDetail.getKey());
      boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpenGoodsDetail.getKey(),acceptData.getPlatform(),acceptData.getVersion());
      if (!cloudOpen && uid != null) {
         List<String> testUsers = configService.getTestUsers();
         if (testUsers != null && testUsers.contains(uid+"")) {