update

data-base/base-sync-crm-refund/src/main/java/com/bailuntec/job/CrmRefundSyncJob.java

@@ -73,15 +73,15 @@ public class CrmRefundSyncJob extends PointJob {
                                 DcBaseCrmRefund dcBaseCrmRefund = new DcBaseCrmRefund();
                                 try {
                                     BeanUtils.copyProperties(dcBaseCrmRefund, refundItem);
-                                    if(refundItem.getRefundedTime() != null) {
+                                    if (refundItem.getRefundedTime() != null) {
                                         dcBaseCrmRefund.setRefundTime(LocalDateTime.ofInstant(refundItem.getRefundedTime().toInstant(), ZoneId.systemDefault()));
                                     }
                                     /*BigDecimal exchangeRate = CallBailunSystem.getExchangeRate((dcBaseCrmRefund.getOrderCurrency() == null ? "CNY" : dcBaseCrmRefund.getOrderCurrency()), "CNY", dcBaseCrmRefund.getRefundTime());
                                     dcBaseCrmRefund.setAmountRefundRmb(exchangeRate.multiply(dcBaseCrmRefund.getAmountRefund()));*/
-                                    if(dcBaseCrmRefund.getCompanyId() == null || dcBaseCrmRefund.getCompanyId() == 0) {
+                                    if (dcBaseCrmRefund.getCompanyId() == null || dcBaseCrmRefund.getCompanyId() == 0) {
                                         dcBaseCrmRefund.setCompanyId(1);
                                     }
-                                    log.warn(dcBaseCrmRefund.getOriginOrderId() +"------" + dcBaseCrmRefund.getBailunAccountId() +"------" + dcBaseCrmRefund.getBailunSku());
+                                    log.warn(dcBaseCrmRefund.getOriginOrderId() + "------" + dcBaseCrmRefund.getBailunAccountId() + "------" + dcBaseCrmRefund.getBailunSku());
                                 } catch (Exception e) {
                                     e.printStackTrace();
                                     throw new RuntimeException("CRM退款BeanUtils.copyProperties失败", e);
@@ -89,7 +89,7 @@ public class CrmRefundSyncJob extends PointJob {
                                 DcBaseOmsOrderMapper omsOrderMapper = SessionUtil.getSession().getMapper(DcBaseOmsOrderMapper.class);
                                 DcBaseOmsOrder dcBaseOmsOrder = null;
 
-                                if(dcBaseCrmRefund.getPlatformType() != null) {
+                                if (dcBaseCrmRefund.getPlatformType() != null) {
                                     switch (dcBaseCrmRefund.getPlatformType().toUpperCase()) {
                                         case "EBAY":
                                             dcBaseOmsOrder = omsOrderMapper.selectOneByExample(DcBaseOmsOrderExample.newAndCreateCriteria().andBailunAccountIdEqualTo(dcBaseCrmRefund.getBailunAccountId()).andTransactionIdEqualTo(dcBaseCrmRefund.getOriginOrderId()).example());
@@ -98,14 +98,14 @@ public class CrmRefundSyncJob extends PointJob {
                                             dcBaseOmsOrder = omsOrderMapper.selectOneByExample(DcBaseOmsOrderExample.newAndCreateCriteria().andBailunAccountIdEqualTo(dcBaseCrmRefund.getBailunAccountId()).andOriginOrderIdEqualTo(dcBaseCrmRefund.getOriginOrderId()).example());
                                     }
 
-                                    if(dcBaseOmsOrder != null) {
-                                        if("MERGED".equals(dcBaseOmsOrder.getBailunMergeStatus().toUpperCase())) {
+                                    if (dcBaseOmsOrder != null) {
+                                        if ("MERGED".equals(dcBaseOmsOrder.getBailunMergeStatus().toUpperCase())) {
                                             dcBaseOmsOrder = omsOrderMapper.selectOneByExample(DcBaseOmsOrderExample.newAndCreateCriteria().andBailunAccountIdEqualTo(dcBaseCrmRefund.getBailunAccountId()).andOriginOrderIdEqualTo(dcBaseOmsOrder.getAftermergedBailunOrderNo()).example());
                                         }
-                                        if(dcBaseOmsOrder != null) {
+                                        if (dcBaseOmsOrder != null) {
                                             dcBaseCrmRefund.setOrderStatus(dcBaseOmsOrder.getBailunOrderStatus());
                                             dcBaseCrmRefund.setShippingStatus(dcBaseOmsOrder.getBailunShippingStatus());
-                                            if("FBA".equals(dcBaseCrmRefund.getPlatformType().toUpperCase())) {
+                                            if ("FBA".equals(dcBaseCrmRefund.getPlatformType().toUpperCase())) {
                                                 dcBaseCrmRefund.setShippingStatus("TotalShipping");
                                             }
                                         }
@@ -124,7 +124,7 @@ public class CrmRefundSyncJob extends PointJob {
                         } finally {
                             SessionUtil.closeSession();
                         }
-                    }else {
+                    } else {
                         break;
                     }
                 } else {

data-base/base-sync-finance-ebay/src/test/java/com/bailuntec/job/EbayFinanceAdSyncJobTest.java

@@ -107,8 +107,8 @@ public class EbayFinanceAdSyncJobTest {
     public void testThreadPool2() {
         EbayFinanceAdSyncJob ebayFinanceAdSyncJob = new EbayFinanceAdSyncJob();
 
-        LocalDateTime start = LocalDateTime.of(2020, 12, 17, 0, 0);
-        LocalDateTime end = LocalDateTime.of(2020, 12, 20, 0, 0);
+        LocalDateTime start = LocalDateTime.of(2020, 12, 23, 0, 0);
+        LocalDateTime end = LocalDateTime.of(2020, 12, 25, 0, 0);
 
         List<LocalDateTime> localDateTimeList = Stream.iterate(start,
                 localDateTime -> localDateTime.plusDays(1))