Skip to content

D
dc-java
Commit f0cb601c by wutong
Options

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

parent 429fac06
Showing with 18 additions and 16 deletions
data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
...@@ -405,21 +405,23 @@ public class OrderSyncJob extends PointJob { ...@@ -405,21 +405,23 @@ public class OrderSyncJob extends PointJob {
DcBaseOmsPlatformSkuMapper mapper = SessionUtil.getSession().getMapper(DcBaseOmsPlatformSkuMapper.class); DcBaseOmsPlatformSkuMapper mapper = SessionUtil.getSession().getMapper(DcBaseOmsPlatformSkuMapper.class);
if (platformSkuList != null && platformSkuList.size() > 0) { if (platformSkuList != null && platformSkuList.size() > 0) {
for (PlatformSku platformSkuInfo : platformSkuList) { for (PlatformSku platformSkuInfo : platformSkuList) {
BeanUtils.copyProperties(dcBaseOmsPlatformSku, dcBaseOmsOrder); if (StringUtils.isNotBlank(platformSkuInfo.getPlatformSku())) {
dcBaseOmsPlatformSku.setPlatformSku(platformSkuInfo.getPlatformSku()); BeanUtils.copyProperties(dcBaseOmsPlatformSku, dcBaseOmsOrder);
dcBaseOmsPlatformSku.setItemId(platformSkuInfo.getPlatformSkuItemId()); dcBaseOmsPlatformSku.setPlatformSku(platformSkuInfo.getPlatformSku());
dcBaseOmsPlatformSku.setPlatformSkuUnitPrice(platformSkuInfo.getPlatformSkuUnitPrice() != null ? platformSkuInfo.getPlatformSkuUnitPrice().getAmount() : BigDecimal.ZERO); dcBaseOmsPlatformSku.setItemId(platformSkuInfo.getPlatformSkuItemId());
dcBaseOmsPlatformSku.setPlatformSkuQuantityOrdered(platformSkuInfo.getPlatformSkuQuantityOrdered()); dcBaseOmsPlatformSku.setPlatformSkuUnitPrice(platformSkuInfo.getPlatformSkuUnitPrice() != null ? platformSkuInfo.getPlatformSkuUnitPrice().getAmount() : BigDecimal.ZERO);
dcBaseOmsPlatformSku.setPlatformSkuQuantityShipped(platformSkuInfo.getPlatformSkuQuantityShipped()); dcBaseOmsPlatformSku.setPlatformSkuQuantityOrdered(platformSkuInfo.getPlatformSkuQuantityOrdered());
dcBaseOmsPlatformSku.setPlatformSkuTitleCn(platformSkuInfo.getPlatformSkuTitleCn()); dcBaseOmsPlatformSku.setPlatformSkuQuantityShipped(platformSkuInfo.getPlatformSkuQuantityShipped());
dcBaseOmsPlatformSku.setPlatformSkuTitleEn(platformSkuInfo.getPlatformSkuTitleEn()); dcBaseOmsPlatformSku.setPlatformSkuTitleCn(platformSkuInfo.getPlatformSkuTitleCn());
String site = StringUtils.isNotBlank(dcBaseOmsOrder.getWebsite())?dcBaseOmsOrder.getWebsite().toUpperCase().replaceAll(" ", "") : ""; dcBaseOmsPlatformSku.setPlatformSkuTitleEn(platformSkuInfo.getPlatformSkuTitleEn());
dcBaseOmsPlatformSku.setCreateTimeSite(timeZoneChange(site, dcBaseOmsOrder.getCreateTime())); String site = StringUtils.isNotBlank(dcBaseOmsOrder.getWebsite()) ? dcBaseOmsOrder.getWebsite().toUpperCase().replaceAll(" ", "") : "";
dcBaseOmsPlatformSku.setPaidTimeSite(timeZoneChange(site, dcBaseOmsOrder.getPaidTime())); dcBaseOmsPlatformSku.setCreateTimeSite(timeZoneChange(site, dcBaseOmsOrder.getCreateTime()));
dcBaseOmsPlatformSku.setPayTimeSite(timeZoneChange(site, dcBaseOmsOrder.getPayTime())); dcBaseOmsPlatformSku.setPaidTimeSite(timeZoneChange(site, dcBaseOmsOrder.getPaidTime()));
int ii = mapper.updateByExampleSelective(dcBaseOmsPlatformSku,DcBaseOmsPlatformSkuExample.newAndCreateCriteria().andPlatformSkuEqualTo(dcBaseOmsPlatformSku.getPlatformSku()).andOriginOrderIdEqualTo(dcBaseOmsPlatformSku.getOriginOrderId()).andBailunAccountIdEqualTo(dcBaseOmsPlatformSku.getBailunAccountId()).example()); dcBaseOmsPlatformSku.setPayTimeSite(timeZoneChange(site, dcBaseOmsOrder.getPayTime()));
if (ii == 0) { int ii = mapper.updateByExampleSelective(dcBaseOmsPlatformSku, DcBaseOmsPlatformSkuExample.newAndCreateCriteria().andPlatformSkuEqualTo(dcBaseOmsPlatformSku.getPlatformSku()).andOriginOrderIdEqualTo(dcBaseOmsPlatformSku.getOriginOrderId()).andBailunAccountIdEqualTo(dcBaseOmsPlatformSku.getBailunAccountId()).example());
mapper.insertSelective(dcBaseOmsPlatformSku); if (ii == 0) {
mapper.insertSelective(dcBaseOmsPlatformSku);
}
} }
} }
} }
......
data-base/base-sync-oms-order/src/test/java/OmsOrderTest.java
...@@ -78,7 +78,7 @@ public class OmsOrderTest { ...@@ -78,7 +78,7 @@ public class OmsOrderTest {
LinkedHashMap<String, String> map = new LinkedHashMap<>(4); LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
map.put("pageIndex", "1"); map.put("pageIndex", "1");
map.put("pageCount", "100"); map.put("pageCount", "100");
map.put("OriginOrderNo", "703247333729260"); map.put("OriginOrderNo", "323674194737-2025252159011");
Request request = new Request.Builder() Request request = new Request.Builder()
.get() .get()
.url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map)) .url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))
......
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