紧急更新aliexpress订单销售额错误的问题

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

@@ -38,6 +38,8 @@ public class OrderSyncJob extends PointJob {
     @Override
     public void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) {
         LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
+        //临时处理速卖通数据
+        map.put("Type", "Aliexpress");
         map.put("pageCount", jobPointLog.getPageSize().toString());
         //时间回退一点, 避免服务器时间不一致而漏单
         map.put("BailunLastUpdateTimeFrom", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getStartTime().minusMinutes(3)));
@@ -217,7 +219,12 @@ public class OrderSyncJob extends PointJob {
                     dcBaseOmsOrder.setAmountProduct(omsResult.getOrderCharge().getAmountTotal().getAmount());
                 }
                 //销售额
-                dcBaseOmsOrder.setAmountSales(totalAmountSale.add(dcBaseOmsOrder.getAmountShipping()).add(dcBaseOmsOrder.getAmountGiftWrap()).subtract(dcBaseOmsOrder.getCostPromotion()));
+                //如果是速卖通,销售额直接取, 其他平台还是算
+                if (omsResult.getPlatformType().toUpperCase().equals(PlatformType.Aliexpress.value())) {
+                    dcBaseOmsOrder.setAmountSales(omsResult.getOrderCharge().getAmountTotal().getAmount());
+                } else {
+                    dcBaseOmsOrder.setAmountSales(totalAmountSale.add(dcBaseOmsOrder.getAmountShipping()).add(dcBaseOmsOrder.getAmountGiftWrap()).subtract(dcBaseOmsOrder.getCostPromotion()));
+                }
                 //平台渠道费
                 dcBaseOmsOrder.setCostPlatformFee((omsResult.getOrderCharge().getCostPlatformFee() != null && omsResult.getOrderCharge().getCostPlatformFee().getAmount() != null) ? omsResult.getOrderCharge().getCostPlatformFee().getAmount() : BigDecimal.ZERO);
                 //平台渠道费人民币 - Ebay的平台费币种不一样

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", "100011829012136");
+        map.put("OriginOrderNo", "100327755466021");
         Request request = new Request.Builder()
                 .get()
                 .url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))