1.fba的 每单1.2， 2，海外仓的不要，3. 国内仓 美容类，张莹霞，张莹霞1的sku 处理费是第一件1元续件0.3 10件封顶，4.国内仓非…

1.fba的 每单1.2， 2，海外仓的不要，3. 国内仓 美容类，张莹霞，张莹霞1的sku 处理费是第一件1元续件0.3 10件封顶，4.国内仓非 张莹霞，张莹霞1的sku - 就是普货 就是一个订单1元

data-base/base-sync-oms-order/src/main/java/com/bailuntec/domain/pojo/BailunSkuCumulative.java

@@ -15,5 +15,7 @@ public class BailunSkuCumulative {
     private BigDecimal maxSkuHight;//最大SKU高
     private Integer totalQuantity;//累计销售数量
     private Boolean domesticOrOverseas;//国内仓或海外仓, true是国内仓
+    private Boolean cosmetologyOrGeneralCargo;//美容货普货，true是美容类
+    private Boolean fbaWarehouse;//是否fba仓库，true是fba
 
 }

data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java

@@ -152,9 +152,15 @@ public class OrderSyncJob extends PointJob {
                         DcBaseWarehouse dcBaseWarehouse = getDcBaseWarehouse(bailunSkuObj, omsResult);
                         bailunSkuStructure.setDcBaseWarehouse(dcBaseWarehouse);
                         if (dcBaseWarehouse != null && dcBaseWarehouse.getHqType().equals(Constant.DOMESTIC_WAREHOUSE)) {
+                            DcBaseSkuMapper dcBaseSkuMapper = SessionUtil.getSession().getMapper(DcBaseSkuMapper.class);
+                            DcBaseSku dcBaseSku = dcBaseSkuMapper.selectOneByExample(DcBaseSkuExample.newAndCreateCriteria().andBailunSkuEqualTo(bailunSkuObj.getBailunSku()).example());
+                            if(dcBaseSku != null && (CommonConstant.BUYER_JIT_1.equals(dcBaseSku.getBuyerName()) || CommonConstant.BUYER_JIT_2.equals(dcBaseSku.getBuyerName()))) {
+                                bailunSkuCumulative.setCosmetologyOrGeneralCargo(Boolean.TRUE);
+                            }
                             bailunSkuCumulative.setDomesticOrOverseas(true);
                         }
                         if (PlatformType.FBA.value().equals(omsResult.getPlatformType()) && dcBaseWarehouse != null) {
+                            bailunSkuCumulative.setFbaWarehouse(Boolean.TRUE);
                             switch (dcBaseWarehouse.getAreaId()) {
                                 case 6:
                                 case 8:
@@ -678,8 +684,9 @@ public class OrderSyncJob extends PointJob {
      * @param dcBaseOmsOrder
      */
     private void caculateBailunHandleFee(DcBaseOmsOrder dcBaseOmsOrder,  BailunSkuCumulative bailunSkuCumulative) {
-        BigDecimal costBailunHandle = BigDecimal.ONE;//海外仓和FBA 的，都是直接1元一个单
+        BigDecimal costBailunHandle = BigDecimal.ZERO;//海外仓和FBA 的，都是直接1元一个单 改为 海外仓0元一个单、FBA直接1.2元一个单
         if(bailunSkuCumulative.getDomesticOrOverseas()) {
+            if(bailunSkuCumulative.getCosmetologyOrGeneralCargo()) {  //美容类
             switch (bailunSkuCumulative.getTotalQuantity()) {
                 case 0:
                     costBailunHandle = BigDecimal.ZERO;
@@ -699,6 +706,11 @@ public class OrderSyncJob extends PointJob {
                 default:
                     costBailunHandle = BigDecimal.valueOf(3.7);//超过10个只取10个的费用
             }
+            }else{
+                costBailunHandle = BigDecimal.ONE;  //普货1元一个单
+            }
+        }else if(bailunSkuCumulative.getFbaWarehouse()) {
+            costBailunHandle = BigDecimal.valueOf(1.2);  //FBA的1.2元一个单
         }
         dcBaseOmsOrder.setCostHandleBailun(costBailunHandle);
     }
@@ -706,6 +718,8 @@ public class OrderSyncJob extends PointJob {
     private BailunSkuCumulative getBailunSkuCumulative(OmsResult omsResult) {
         BailunSkuCumulative bailunSkuCumulative = new BailunSkuCumulative();
         bailunSkuCumulative.setDomesticOrOverseas(Boolean.FALSE);
+        bailunSkuCumulative.setCosmetologyOrGeneralCargo(Boolean.FALSE);
+        bailunSkuCumulative.setFbaWarehouse(Boolean.FALSE);
         bailunSkuCumulative.setMaxSkuLong(BigDecimal.ZERO);
         bailunSkuCumulative.setMaxSkuWidth(BigDecimal.ZERO);
         bailunSkuCumulative.setMaxSkuHight(BigDecimal.ZERO);

data-common/src/main/java/com/bailuntec/domain/constant/CommonConstant.java

@@ -25,4 +25,6 @@ public interface CommonConstant {
     String SKU_URL = "http://10.0.6.13:8001/api/ApiCenter/SetData";
     BigDecimal BIGDECIMAL_TWO = BigDecimal.valueOf(2);
     String COMMON_SKU_WAREHOUSE_COST_FIRST = "";
+    String BUYER_JIT_1 = "张莹霞";
+    String BUYER_JIT_2 = "张莹霞1";
 }