Skip to content

D
dc-java
Commit 63f04f72 by huluobin
Options

update

parent 8fe52778
Showing with 15 additions and 15 deletions
data-base/base-sync-crm-refund/src/main/java/com/bailuntec/job/CrmRefundSyncJob.java
...@@ -73,15 +73,15 @@ public class CrmRefundSyncJob extends PointJob { ...@@ -73,15 +73,15 @@ public class CrmRefundSyncJob extends PointJob {
DcBaseCrmRefund dcBaseCrmRefund = new DcBaseCrmRefund(); DcBaseCrmRefund dcBaseCrmRefund = new DcBaseCrmRefund();
try { try {
BeanUtils.copyProperties(dcBaseCrmRefund, refundItem); BeanUtils.copyProperties(dcBaseCrmRefund, refundItem);
if(refundItem.getRefundedTime() != null) { if (refundItem.getRefundedTime() != null) {
dcBaseCrmRefund.setRefundTime(LocalDateTime.ofInstant(refundItem.getRefundedTime().toInstant(), ZoneId.systemDefault())); dcBaseCrmRefund.setRefundTime(LocalDateTime.ofInstant(refundItem.getRefundedTime().toInstant(), ZoneId.systemDefault()));
} }
/*BigDecimal exchangeRate = CallBailunSystem.getExchangeRate((dcBaseCrmRefund.getOrderCurrency() == null ? "CNY" : dcBaseCrmRefund.getOrderCurrency()), "CNY", dcBaseCrmRefund.getRefundTime()); /*BigDecimal exchangeRate = CallBailunSystem.getExchangeRate((dcBaseCrmRefund.getOrderCurrency() == null ? "CNY" : dcBaseCrmRefund.getOrderCurrency()), "CNY", dcBaseCrmRefund.getRefundTime());
dcBaseCrmRefund.setAmountRefundRmb(exchangeRate.multiply(dcBaseCrmRefund.getAmountRefund()));*/ dcBaseCrmRefund.setAmountRefundRmb(exchangeRate.multiply(dcBaseCrmRefund.getAmountRefund()));*/
if(dcBaseCrmRefund.getCompanyId() == null || dcBaseCrmRefund.getCompanyId() == 0) { if (dcBaseCrmRefund.getCompanyId() == null || dcBaseCrmRefund.getCompanyId() == 0) {
dcBaseCrmRefund.setCompanyId(1); dcBaseCrmRefund.setCompanyId(1);
} }
log.warn(dcBaseCrmRefund.getOriginOrderId() +"------" + dcBaseCrmRefund.getBailunAccountId() +"------" + dcBaseCrmRefund.getBailunSku()); log.warn(dcBaseCrmRefund.getOriginOrderId() + "------" + dcBaseCrmRefund.getBailunAccountId() + "------" + dcBaseCrmRefund.getBailunSku());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
throw new RuntimeException("CRM退款BeanUtils.copyProperties失败", e); throw new RuntimeException("CRM退款BeanUtils.copyProperties失败", e);
...@@ -89,7 +89,7 @@ public class CrmRefundSyncJob extends PointJob { ...@@ -89,7 +89,7 @@ public class CrmRefundSyncJob extends PointJob {
DcBaseOmsOrderMapper omsOrderMapper = SessionUtil.getSession().getMapper(DcBaseOmsOrderMapper.class); DcBaseOmsOrderMapper omsOrderMapper = SessionUtil.getSession().getMapper(DcBaseOmsOrderMapper.class);
DcBaseOmsOrder dcBaseOmsOrder = null; DcBaseOmsOrder dcBaseOmsOrder = null;
if(dcBaseCrmRefund.getPlatformType() != null) { if (dcBaseCrmRefund.getPlatformType() != null) {
switch (dcBaseCrmRefund.getPlatformType().toUpperCase()) { switch (dcBaseCrmRefund.getPlatformType().toUpperCase()) {
case "EBAY": case "EBAY":
dcBaseOmsOrder = omsOrderMapper.selectOneByExample(DcBaseOmsOrderExample.newAndCreateCriteria().andBailunAccountIdEqualTo(dcBaseCrmRefund.getBailunAccountId()).andTransactionIdEqualTo(dcBaseCrmRefund.getOriginOrderId()).example()); dcBaseOmsOrder = omsOrderMapper.selectOneByExample(DcBaseOmsOrderExample.newAndCreateCriteria().andBailunAccountIdEqualTo(dcBaseCrmRefund.getBailunAccountId()).andTransactionIdEqualTo(dcBaseCrmRefund.getOriginOrderId()).example());
...@@ -98,14 +98,14 @@ public class CrmRefundSyncJob extends PointJob { ...@@ -98,14 +98,14 @@ public class CrmRefundSyncJob extends PointJob {
dcBaseOmsOrder = omsOrderMapper.selectOneByExample(DcBaseOmsOrderExample.newAndCreateCriteria().andBailunAccountIdEqualTo(dcBaseCrmRefund.getBailunAccountId()).andOriginOrderIdEqualTo(dcBaseCrmRefund.getOriginOrderId()).example()); dcBaseOmsOrder = omsOrderMapper.selectOneByExample(DcBaseOmsOrderExample.newAndCreateCriteria().andBailunAccountIdEqualTo(dcBaseCrmRefund.getBailunAccountId()).andOriginOrderIdEqualTo(dcBaseCrmRefund.getOriginOrderId()).example());
} }
if(dcBaseOmsOrder != null) { if (dcBaseOmsOrder != null) {
if("MERGED".equals(dcBaseOmsOrder.getBailunMergeStatus().toUpperCase())) { if ("MERGED".equals(dcBaseOmsOrder.getBailunMergeStatus().toUpperCase())) {
dcBaseOmsOrder = omsOrderMapper.selectOneByExample(DcBaseOmsOrderExample.newAndCreateCriteria().andBailunAccountIdEqualTo(dcBaseCrmRefund.getBailunAccountId()).andOriginOrderIdEqualTo(dcBaseOmsOrder.getAftermergedBailunOrderNo()).example()); dcBaseOmsOrder = omsOrderMapper.selectOneByExample(DcBaseOmsOrderExample.newAndCreateCriteria().andBailunAccountIdEqualTo(dcBaseCrmRefund.getBailunAccountId()).andOriginOrderIdEqualTo(dcBaseOmsOrder.getAftermergedBailunOrderNo()).example());
} }
if(dcBaseOmsOrder != null) { if (dcBaseOmsOrder != null) {
dcBaseCrmRefund.setOrderStatus(dcBaseOmsOrder.getBailunOrderStatus()); dcBaseCrmRefund.setOrderStatus(dcBaseOmsOrder.getBailunOrderStatus());
dcBaseCrmRefund.setShippingStatus(dcBaseOmsOrder.getBailunShippingStatus()); dcBaseCrmRefund.setShippingStatus(dcBaseOmsOrder.getBailunShippingStatus());
if("FBA".equals(dcBaseCrmRefund.getPlatformType().toUpperCase())) { if ("FBA".equals(dcBaseCrmRefund.getPlatformType().toUpperCase())) {
dcBaseCrmRefund.setShippingStatus("TotalShipping"); dcBaseCrmRefund.setShippingStatus("TotalShipping");
} }
} }
...@@ -117,14 +117,14 @@ public class CrmRefundSyncJob extends PointJob { ...@@ -117,14 +117,14 @@ public class CrmRefundSyncJob extends PointJob {
if (i == 0) { if (i == 0) {
mapper.insertSelective(dcBaseCrmRefund); mapper.insertSelective(dcBaseCrmRefund);
} }
// SessionUtil.getSession().commit(); // SessionUtil.getSession().commit();
} }
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("MYBATIS操作DB异常", e); throw new RuntimeException("MYBATIS操作DB异常", e);
} finally { } finally {
SessionUtil.closeSession(); SessionUtil.closeSession();
} }
}else { } else {
break; break;
} }
} else { } else {
...@@ -136,8 +136,8 @@ public class CrmRefundSyncJob extends PointJob { ...@@ -136,8 +136,8 @@ public class CrmRefundSyncJob extends PointJob {
} }
} }
while (true); while (true);
jobPointLog.setPageIndex(1); jobPointLog.setPageIndex(1);
jobPointLog.setStartTime(jobPointLog.getEndTime()); jobPointLog.setStartTime(jobPointLog.getEndTime());
jobPointLog.setEndTime(jobPointLog.getEndTime().plusDays(jobPointLog.getIntervalTime()).isAfter(LocalDateTime.now()) ? LocalDateTime.now() : jobPointLog.getEndTime().plusDays(jobPointLog.getIntervalTime())); jobPointLog.setEndTime(jobPointLog.getEndTime().plusDays(jobPointLog.getIntervalTime()).isAfter(LocalDateTime.now()) ? LocalDateTime.now() : jobPointLog.getEndTime().plusDays(jobPointLog.getIntervalTime()));
} }
} }
data-base/base-sync-finance-ebay/src/test/java/com/bailuntec/job/EbayFinanceAdSyncJobTest.java
...@@ -107,8 +107,8 @@ public class EbayFinanceAdSyncJobTest { ...@@ -107,8 +107,8 @@ public class EbayFinanceAdSyncJobTest {
public void testThreadPool2() { public void testThreadPool2() {
EbayFinanceAdSyncJob ebayFinanceAdSyncJob = new EbayFinanceAdSyncJob(); EbayFinanceAdSyncJob ebayFinanceAdSyncJob = new EbayFinanceAdSyncJob();
LocalDateTime start = LocalDateTime.of(2020, 12, 17, 0, 0); LocalDateTime start = LocalDateTime.of(2020, 12, 23, 0, 0);
LocalDateTime end = LocalDateTime.of(2020, 12, 20, 0, 0); LocalDateTime end = LocalDateTime.of(2020, 12, 25, 0, 0);
List<LocalDateTime> localDateTimeList = Stream.iterate(start, List<LocalDateTime> localDateTimeList = Stream.iterate(start,
localDateTime -> localDateTime.plusDays(1)) localDateTime -> localDateTime.plusDays(1))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment