订单打印错误日志

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

@@ -118,6 +118,7 @@ public class OrderSyncJob extends PointJob {
      */
     public void analyseOmsOrder(List<OmsResult> bailunOrderList) {
         for (OmsResult omsResult : bailunOrderList)
+            log.warn(omsResult.getOriginOrderId());
             if (omsResult != null && omsResult.getBailunPaymentStatus() != null && omsResult.getBailunPaymentStatus().equals(Constant.PAYMENT_STATUS)) {
                 DcBaseOmsOrder dcBaseOmsOrder = new DcBaseOmsOrder();
                 assignmentOrderInfo(omsResult, dcBaseOmsOrder);
@@ -571,8 +572,7 @@ public class OrderSyncJob extends PointJob {
         BigDecimal totalCostPackaging = BigDecimal.ZERO;
         BigDecimal totalCostShipping = BigDecimal.ZERO;
         if (pickingOrderList != null && pickingOrderList.size() > 0) {
-            try {
-                DcBaseOmsPickMapper mapper = SessionUtil.getSession().getMapper(DcBaseOmsPickMapper.class);
+
                 for (PickingOrder pickingOrder : pickingOrderList) {
                     BigDecimal skuCostShipping = pickingOrder.getCostShipping() != null ? pickingOrder.getCostShipping() : BigDecimal.ZERO;
                     BigDecimal skuCostPackaging = pickingOrder.getCostPackaging() != null ? pickingOrder.getCostPackaging() : BigDecimal.ZERO;
@@ -619,9 +619,12 @@ public class OrderSyncJob extends PointJob {
 
                             dcBaseOmsSku.setCostHandlePlatform(dcBaseOmsSku.getCostHandlePlatform() != null ? dcBaseOmsSku.getCostHandlePlatform().add(dcBaseOmsPick.getBailunSkuCostPackaging()) : dcBaseOmsPick.getBailunSkuCostPackaging());
                             dcBaseOmsSku.setCostTail(dcBaseOmsSku.getCostTail() != null ? dcBaseOmsSku.getCostTail().add(dcBaseOmsPick.getBailunSkuCostShipping()) : dcBaseOmsPick.getBailunSkuCostShipping());
-                            mapper.upsertSelective(dcBaseOmsPick);
-                        }
-                    }
+                            try {
+                            DcBaseOmsPickMapper mapper = SessionUtil.getSession().getMapper(DcBaseOmsPickMapper.class);
+                            int i = mapper.updateByExampleSelective(dcBaseOmsPick, DcBaseOmsPickExample.newAndCreateCriteria().andOriginOrderIdEqualTo(dcBaseOmsPick.getOriginOrderId())
+                                                        .andBailunAccountIdEqualTo(dcBaseOmsPick.getBailunAccountId()).andPickOrderIdEqualTo(dcBaseOmsPick.getPickOrderId()).andBailunSkuEqualTo(dcBaseOmsPick.getBailunSku()).example());
+                            if (i == 0) {
+                                mapper.insertSelective(dcBaseOmsPick);
                             }
                             } catch (Exception e) {
                                 e.printStackTrace();
@@ -630,6 +633,10 @@ public class OrderSyncJob extends PointJob {
                                 SessionUtil.closeSession();
                             }
                         }
+                    }
+                }
+
+        }
         dcBaseOmsOrder.setCostHandlePlatform(totalCostPackaging);
         dcBaseOmsOrder.setCostTail(totalCostShipping);
         return totalShippedSkuPrice;

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

@@ -23,10 +23,10 @@ public class OmsOrderTest {
     public void test1() {
         OkHttpClient okHttpClient = OkHttpUtil.getInstance();
         LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
-        map.put("pageIndex", "1");
+        map.put("pageIndex", "239");
         map.put("pageCount", "100");
-        map.put("BailunLastUpdateTimeFrom", "2019-03-01 00:00:00");
-        map.put("BailunLastUpdateTimeTo", "2019-03-02 00:00:00");
+        map.put("BailunLastUpdateTimeFrom", "2019-04-11 11:45:33");
+        map.put("BailunLastUpdateTimeTo", "2019-04-11 16:17:03");
         Request request = new Request.Builder()
                 .get()
                 .url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))
@@ -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", "19022821479G20V");
+        map.put("OriginOrderNo", "362559132611-1018875748023");
         Request request = new Request.Builder()
                 .get()
                 .url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))