admin
2024-04-26 5e7b0ed4a154ad067cbcf4aa1a1c7cce32f9864c
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
@@ -13,7 +13,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.GoodsMoneyConfigParamsDTO;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.brand.BrandGoodsCahe;
@@ -261,10 +261,10 @@
            if (listGoodsBrief.size() > 0) {
               for (int i = 0; i < listGoods.size(); i++) {
                  long id = listGoods.get(i).getAuctionId();
                  String id = listGoods.get(i).getAuctionId();
                  boolean isRepeat = false;
                  for (TaoBaoGoodsBrief goodsBrief : listGoodsBrief) {
                     long auctionId = goodsBrief.getAuctionId();
                     String auctionId = goodsBrief.getAuctionId();
                     if (auctionId == id) {
                        isRepeat = true;
                        break;
@@ -283,7 +283,7 @@
      JSONArray array = new JSONArray();
      if (listGoodsBrief.size() > 0) {
         List<Long> listGid = new ArrayList<Long>();
         List<String> listGid = new ArrayList<>();
         for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
            listGid.add(taoBaoGoodsBrief.getAuctionId());
         }
@@ -302,7 +302,7 @@
         Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
               .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
         ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
         GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
               acceptData.getVersion(),acceptData.getSystem());
         // 商品信息过滤
         listGoodsBrief = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(listGoodsBrief);
@@ -310,9 +310,9 @@
         for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
            if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {
               boolean stateSale = false; // 默认停售
               Long goodsId = taoBaoGoodsBrief.getAuctionId();
               String goodsId = taoBaoGoodsBrief.getAuctionId();
               for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {
                  Long auctionId = taoKeGoods.getAuctionId();
                  String auctionId = taoKeGoods.getAuctionId();
                  if (goodsId == auctionId || goodsId.equals(auctionId)) {
                     stateSale = true; // 在售
                     break;
@@ -485,11 +485,11 @@
            if (listGoodsBrief.size() > 0) {
               for (int i = 0; i < listGoods.size(); i++) {
                  long aid = listGoods.get(i).getAuctionId();
                  String aid = listGoods.get(i).getAuctionId();
                  boolean isRepeat = false;
                  for (TaoBaoGoodsBrief goodsBrief : listGoodsBrief) {
                     long auctionId = goodsBrief.getAuctionId();
                     if (auctionId == aid) {
                     String auctionId = goodsBrief.getAuctionId();
                     if (auctionId == aid||auctionId.equals(aid)) {
                        isRepeat = true;
                        break;
                     }
@@ -507,7 +507,7 @@
      JSONArray array = new JSONArray();
      if (listGoodsBrief.size() > 0) {
         List<Long> listGid = new ArrayList<Long>();
         List<String> listGid = new ArrayList<>();
         for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
            listGid.add(taoBaoGoodsBrief.getAuctionId());
         }
@@ -526,7 +526,7 @@
         Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
               .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
         ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
         GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
               acceptData.getVersion(),acceptData.getSystem());
         // 商品信息过滤
         listGoodsBrief = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(listGoodsBrief);
@@ -534,9 +534,9 @@
         for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
            if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {
               boolean stateSale = false; // 默认停售
               Long goodsId = taoBaoGoodsBrief.getAuctionId();
               String goodsId = taoBaoGoodsBrief.getAuctionId();
               for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {
                  Long auctionId = taoKeGoods.getAuctionId();
                  String auctionId = taoKeGoods.getAuctionId();
                  if (goodsId == auctionId || goodsId.equals(auctionId)) {
                     stateSale = true; // 在售
                     break;
@@ -716,7 +716,7 @@
      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
            .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
      
      ConfigParamsDTO paramsDTO =  orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
      GoodsMoneyConfigParamsDTO paramsDTO =  orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
            acceptData.getVersion(),acceptData.getSystem());
      JSONArray array = new JSONArray();