取自己SKUMS表的销售员, 不拿OMS接口的

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

@@ -126,8 +126,6 @@ public class OrderSyncJob extends PointJob {
                 deleteSku(dcBaseOmsOrder);//因为OMS可能改订单, 部分SKU有可能会被删除, 所以先删除, 再插入, 并且更新退款为未予订单关联
                 //判断是否刷单订单
                 listOrderExceptions(omsResult,dcBaseOmsOrder);
-                // 百伦sku信息, 有销售员和采购价, bailun_sku_order根据sku找对应销售员和采购价
-                HashMap<String, String> saleItemHashMap = putSellerNameInMap(omsResult.getSaleItem());
                 //获取汇率
                 getExchangeRate(omsResult, dcBaseOmsOrder);
                 //遍历平台SKU拿销售额
@@ -173,7 +171,7 @@ public class OrderSyncJob extends PointJob {
                         /*
                          * 赋值, 初始值避免null
                          */
-                        assignmentSkuInfo(omsResult, dcBaseOmsOrder, dcBaseOmsSku, bailunSku, dcBaseWarehouse, saleItemHashMap,logisticsHashMap);
+                        assignmentSkuInfo(omsResult, dcBaseOmsOrder, dcBaseOmsSku, bailunSku, dcBaseWarehouse, logisticsHashMap);
                         if (PlatformType.FBA.value().equals(omsResult.getPlatformType().toUpperCase())) {
                             //FBA费用
                             BigDecimal skuCostFbaFee = bailunSkuStructure.getSkuWeightRatio().multiply(dcBaseOmsOrder.getCostFbaFee()).setScale(3, RoundingMode.HALF_EVEN);
@@ -814,11 +812,10 @@ public class OrderSyncJob extends PointJob {
      * 把OMS订单中的一部分值赋值到百伦订单对象上
      *
      * @param dcBaseOmsSku
-     * @param saleItemHashMap
      * @param logisticsHashMap
      * @return
      */
-    public void assignmentSkuInfo(OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder, DcBaseOmsSku dcBaseOmsSku, BailunSku bailunSku, DcBaseWarehouse dcBaseWarehouse, HashMap<String, String> saleItemHashMap, HashMap<String, Logistics> logisticsHashMap) {
+    public void assignmentSkuInfo(OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder, DcBaseOmsSku dcBaseOmsSku, BailunSku bailunSku, DcBaseWarehouse dcBaseWarehouse,  HashMap<String, Logistics> logisticsHashMap) {
         dcBaseOmsSku.setBailunInterceptionStatus(dcBaseOmsOrder.getBailunInterceptionStatus());
         dcBaseOmsSku.setBailunSku(bailunSku.getBailunSku());
         if (dcBaseWarehouse != null) {
@@ -832,12 +829,13 @@ public class OrderSyncJob extends PointJob {
         }
         dcBaseOmsSku.setAreaId(omsResult.getAreaId());
         dcBaseOmsSku.setHasCancle(omsResult.getHasCancle());
-        dcBaseOmsSku.setSellerName(saleItemHashMap.get(bailunSku.getBailunSku()));
+
         // --begin 调用产品库信息 skuProductInfo, 获取分类信息
         DcBaseSku skuProductInfo = getDcBaseSku(bailunSku);
         if (skuProductInfo != null) {
             dcBaseOmsSku.setBailunCategoryId(skuProductInfo.getBailunCategoryId());
             dcBaseOmsSku.setBailunCategoryName(skuProductInfo.getBailunCategoryName());
+            dcBaseOmsSku.setSellerName(skuProductInfo.getSellerName());
         }
         //根据国家找物流规则
         if (omsResult.getReceiptAddress() != null) {