订单处理修复平台SKU为null的问题

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

@@ -405,6 +405,7 @@ public class OrderSyncJob extends PointJob {
                     DcBaseOmsPlatformSkuMapper mapper = SessionUtil.getSession().getMapper(DcBaseOmsPlatformSkuMapper.class);
                     if (platformSkuList != null && platformSkuList.size() > 0) {
                         for (PlatformSku platformSkuInfo : platformSkuList) {
+                            if (StringUtils.isNotBlank(platformSkuInfo.getPlatformSku())) {
                                 BeanUtils.copyProperties(dcBaseOmsPlatformSku, dcBaseOmsOrder);
                                 dcBaseOmsPlatformSku.setPlatformSku(platformSkuInfo.getPlatformSku());
                                 dcBaseOmsPlatformSku.setItemId(platformSkuInfo.getPlatformSkuItemId());
@@ -413,16 +414,17 @@ public class OrderSyncJob extends PointJob {
                                 dcBaseOmsPlatformSku.setPlatformSkuQuantityShipped(platformSkuInfo.getPlatformSkuQuantityShipped());
                                 dcBaseOmsPlatformSku.setPlatformSkuTitleCn(platformSkuInfo.getPlatformSkuTitleCn());
                                 dcBaseOmsPlatformSku.setPlatformSkuTitleEn(platformSkuInfo.getPlatformSkuTitleEn());
-                            String site = StringUtils.isNotBlank(dcBaseOmsOrder.getWebsite())?dcBaseOmsOrder.getWebsite().toUpperCase().replaceAll(" ", "") : "";
+                                String site = StringUtils.isNotBlank(dcBaseOmsOrder.getWebsite()) ? dcBaseOmsOrder.getWebsite().toUpperCase().replaceAll(" ", "") : "";
                                 dcBaseOmsPlatformSku.setCreateTimeSite(timeZoneChange(site, dcBaseOmsOrder.getCreateTime()));
                                 dcBaseOmsPlatformSku.setPaidTimeSite(timeZoneChange(site, dcBaseOmsOrder.getPaidTime()));
                                 dcBaseOmsPlatformSku.setPayTimeSite(timeZoneChange(site, dcBaseOmsOrder.getPayTime()));
-                            int ii = mapper.updateByExampleSelective(dcBaseOmsPlatformSku,DcBaseOmsPlatformSkuExample.newAndCreateCriteria().andPlatformSkuEqualTo(dcBaseOmsPlatformSku.getPlatformSku()).andOriginOrderIdEqualTo(dcBaseOmsPlatformSku.getOriginOrderId()).andBailunAccountIdEqualTo(dcBaseOmsPlatformSku.getBailunAccountId()).example());
+                                int ii = mapper.updateByExampleSelective(dcBaseOmsPlatformSku, DcBaseOmsPlatformSkuExample.newAndCreateCriteria().andPlatformSkuEqualTo(dcBaseOmsPlatformSku.getPlatformSku()).andOriginOrderIdEqualTo(dcBaseOmsPlatformSku.getOriginOrderId()).andBailunAccountIdEqualTo(dcBaseOmsPlatformSku.getBailunAccountId()).example());
                                 if (ii == 0) {
                                     mapper.insertSelective(dcBaseOmsPlatformSku);
                                 }
                             }
                         }
+                    }
                 } catch (Exception e) {
                     throw new RuntimeException("Mybatis操作DB失败", e);
                 } finally {

data-base/base-sync-oms-order/src/test/java/OmsOrderTest.java

@@ -78,7 +78,7 @@ public class OmsOrderTest {
         LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
         map.put("pageIndex", "1");
         map.put("pageCount", "100");
-        map.put("OriginOrderNo", "703247333729260");
+        map.put("OriginOrderNo", "323674194737-2025252159011");
         Request request = new Request.Builder()
                 .get()
                 .url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))