数据中心--sku映射关系同步请求方式改为post

data-base/base-sync-sku/src/main/java/com/bailuntec/job/SkuMappingSyncJob.java

@@ -3,18 +3,10 @@ package com.bailuntec.job;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bailuntec.domain.constant.CommonConstant;
-import com.bailuntec.domain.entity.DcBaseSku;
 import com.bailuntec.domain.entity.DcBaseSkuMapping;
-import com.bailuntec.domain.entity.DcBaseSkuWarehouse;
 import com.bailuntec.domain.entity.JobPointLog;
-import com.bailuntec.domain.example.DcBaseSkuExample;
-import com.bailuntec.domain.example.DcBaseSkuWarehouseExample;
 import com.bailuntec.domain.pojo.*;
-import com.bailuntec.domain.request.SkuCondition;
-import com.bailuntec.domain.request.SkumsRequest;
-import com.bailuntec.mapper.DcBaseSkuMapper;
 import com.bailuntec.mapper.DcBaseSkuMappingMapper;
-import com.bailuntec.mapper.DcBaseSkuWarehouseMapper;
 import com.bailuntec.mapper.JobPointLogMapper;
 import com.bailuntec.support.PointJob;
 import com.bailuntec.utils.OkHttpUtil;
@@ -23,11 +15,9 @@ import com.bailuntec.utils.SessionUtil;
 import com.dangdang.ddframe.job.api.ShardingContext;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.LinkedHashMap;
@@ -44,14 +34,16 @@ public class SkuMappingSyncJob extends PointJob {
         map.put("PageNumber", jobPointLog.getPageSize().toString());
         map.put("StartTime", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getStartTime()));
         map.put("EndTime", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getEndTime()));
+        MediaType mediaType = MediaType.parse("application/json");
         do {
             map.put("PageIndex", jobPointLog.getPageIndex().equals(0) ? "1" : jobPointLog.getPageIndex().toString());
+            RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(map));
             Response response = null;
             String resultStr = null;
             try {
                 Request request = new Request.Builder()
-                        .get()
-                        .url(OkHttpUtil.attachHttpGetParams(propertiesUtil.getPropertyAsString("SKU_MAPPING_URL"), map))
+                        .post(body)
+                        .url(propertiesUtil.getPropertyAsString("SKU_MAPPING_URL"))
                         .addHeader("Content-Type", "application/json")
                         .build();
                 response = client.newCall(request).execute();

data-mid/mid-calculate-item/src/main/java/com/bailuntec/job/CalculateEbayItemJob.java

@@ -48,7 +48,12 @@ public class CalculateEbayItemJob extends PointJob {
                             DcBaseFinanceEbayItem dcBaseFinanceEbayItem = new DcBaseFinanceEbayItem();
                             BeanUtils.copyProperties(dcBaseFinanceEbayItem, dcBaseSkuMappingItemDto);
                             BigDecimal unitPrice = dcBaseSkuMappingItemDto.getUnitPrice() == null ? BigDecimal.ZERO : dcBaseSkuMappingItemDto.getUnitPrice();
-                            BigDecimal unitPriceRadio = unitPrice.multiply(BigDecimal.valueOf(dcBaseSkuMappingItemDto.getCount())).divide(totalUnitPrice, 3, RoundingMode.HALF_EVEN);
+                            BigDecimal unitPriceRadio;
+                            if(totalUnitPrice.compareTo(BigDecimal.ZERO) == 0) {
+                                unitPriceRadio = BigDecimal.ONE.divide(BigDecimal.valueOf(dcBaseFinanceEbayItemDto.getDcBaseSkuMappingList().size()), 3, RoundingMode.HALF_EVEN);
+                            }else {
+                                unitPriceRadio = unitPrice.multiply(BigDecimal.valueOf(dcBaseSkuMappingItemDto.getCount())).divide(totalUnitPrice, 3, RoundingMode.HALF_EVEN);
+                            }
                             dcBaseFinanceEbayItem.setSkuRatio(unitPriceRadio);
                             dcBaseFinanceEbayItem.setSkuAmount(dcBaseFinanceEbayItemDto.getGrossAmount().multiply(unitPriceRadio));
                             dcBaseFinanceEbayItem.setAccountId(dcBaseFinanceEbayItemDto.getAccountId());
@@ -92,7 +97,7 @@ public class CalculateEbayItemJob extends PointJob {
                 SessionUtil.closeSession();
             }
             jobPointLog.setPageIndex(jobPointLog.getPageIndex()+1);
-        }while (jobPointLog.getPageSize() <= totalPage);
+        }while (jobPointLog.getPageIndex() <= totalPage);
         jobPointLog.setPageIndex(0);
         jobPointLog.setStartTime(jobPointLog.getEndTime());
         jobPointLog.setEndTime(jobPointLog.getStartTime().plusDays(jobPointLog.getIntervalTime().longValue()).isAfter(LocalDateTime.now()) ? LocalDateTime.now() : jobPointLog.getStartTime().plusDays(jobPointLog.getIntervalTime().longValue()));