销售额改为考虑运费收入(非FBA); 物流支出cost_logistics替代cost_tail, 因为cost_tail是真实的费用,表里暂且保留,

data-base/base-sync-oms-order/src/main/java/com/bailuntec/domain/pojo/LogisticsItem.java

@@ -6,4 +6,5 @@ import lombok.Data;
 public class LogisticsItem {
     private Warehouse warehouse;
     private Logistics logisticsMethod;
+    private Currency logisticsCost;
 }

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

@@ -25,8 +25,8 @@ public class OmsOrderTest {
         LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
         map.put("pageIndex", "1");
         map.put("pageCount", "100");
-        map.put("BailunLastUpdateTimeFrom", "2019-02-28 13:38:02");
-        map.put("BailunLastUpdateTimeTo", "2019-02-28 14:32:14");
+        map.put("BailunLastUpdateTimeFrom", "2019-03-01 00:00:00");
+        map.put("BailunLastUpdateTimeTo", "2019-03-02 00:00:00");
         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", "249457436016");
+        map.put("OriginOrderNo", "99429310429230");
         Request request = new Request.Builder()
                 .get()
                 .url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))

data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsOrder.java

@@ -514,6 +514,15 @@ public class DcBaseOmsOrder {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.cost_logistics
+     *
+     * @mbg.generated
+     */
+    private BigDecimal costLogistics;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_base_oms_order.profit_total
      *
      * @mbg.generated
@@ -813,6 +822,7 @@ public class DcBaseOmsOrder {
         sb.append(", costHandlePlatform=").append(costHandlePlatform);
         sb.append(", costTail=").append(costTail);
         sb.append(", costFirst=").append(costFirst);
+        sb.append(", costLogistics=").append(costLogistics);
         sb.append(", profitTotal=").append(profitTotal);
         sb.append(", profitRate=").append(profitRate);
         sb.append(", receiptCountry=").append(receiptCountry);
@@ -917,6 +927,7 @@ public class DcBaseOmsOrder {
             && (this.getCostHandlePlatform() == null ? other.getCostHandlePlatform() == null : this.getCostHandlePlatform().equals(other.getCostHandlePlatform()))
             && (this.getCostTail() == null ? other.getCostTail() == null : this.getCostTail().equals(other.getCostTail()))
             && (this.getCostFirst() == null ? other.getCostFirst() == null : this.getCostFirst().equals(other.getCostFirst()))
+            && (this.getCostLogistics() == null ? other.getCostLogistics() == null : this.getCostLogistics().equals(other.getCostLogistics()))
             && (this.getProfitTotal() == null ? other.getProfitTotal() == null : this.getProfitTotal().equals(other.getProfitTotal()))
             && (this.getProfitRate() == null ? other.getProfitRate() == null : this.getProfitRate().equals(other.getProfitRate()))
             && (this.getReceiptCountry() == null ? other.getReceiptCountry() == null : this.getReceiptCountry().equals(other.getReceiptCountry()))
@@ -1011,6 +1022,7 @@ public class DcBaseOmsOrder {
         result = prime * result + ((getCostHandlePlatform() == null) ? 0 : getCostHandlePlatform().hashCode());
         result = prime * result + ((getCostTail() == null) ? 0 : getCostTail().hashCode());
         result = prime * result + ((getCostFirst() == null) ? 0 : getCostFirst().hashCode());
+        result = prime * result + ((getCostLogistics() == null) ? 0 : getCostLogistics().hashCode());
         result = prime * result + ((getProfitTotal() == null) ? 0 : getProfitTotal().hashCode());
         result = prime * result + ((getProfitRate() == null) ? 0 : getProfitRate().hashCode());
         result = prime * result + ((getReceiptCountry() == null) ? 0 : getReceiptCountry().hashCode());

data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsSku.java

@@ -622,6 +622,15 @@ public class DcBaseOmsSku {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.cost_logistics
+     *
+     * @mbg.generated
+     */
+    private BigDecimal costLogistics;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_base_oms_sku.profit_total
      *
      * @mbg.generated
@@ -924,6 +933,7 @@ public class DcBaseOmsSku {
         sb.append(", costHandlePlatform=").append(costHandlePlatform);
         sb.append(", costTail=").append(costTail);
         sb.append(", costFirst=").append(costFirst);
+        sb.append(", costLogistics=").append(costLogistics);
         sb.append(", profitTotal=").append(profitTotal);
         sb.append(", profitRate=").append(profitRate);
         sb.append(", receiptCountry=").append(receiptCountry);
@@ -1039,6 +1049,7 @@ public class DcBaseOmsSku {
             && (this.getCostHandlePlatform() == null ? other.getCostHandlePlatform() == null : this.getCostHandlePlatform().equals(other.getCostHandlePlatform()))
             && (this.getCostTail() == null ? other.getCostTail() == null : this.getCostTail().equals(other.getCostTail()))
             && (this.getCostFirst() == null ? other.getCostFirst() == null : this.getCostFirst().equals(other.getCostFirst()))
+            && (this.getCostLogistics() == null ? other.getCostLogistics() == null : this.getCostLogistics().equals(other.getCostLogistics()))
             && (this.getProfitTotal() == null ? other.getProfitTotal() == null : this.getProfitTotal().equals(other.getProfitTotal()))
             && (this.getProfitRate() == null ? other.getProfitRate() == null : this.getProfitRate().equals(other.getProfitRate()))
             && (this.getReceiptCountry() == null ? other.getReceiptCountry() == null : this.getReceiptCountry().equals(other.getReceiptCountry()))
@@ -1144,6 +1155,7 @@ public class DcBaseOmsSku {
         result = prime * result + ((getCostHandlePlatform() == null) ? 0 : getCostHandlePlatform().hashCode());
         result = prime * result + ((getCostTail() == null) ? 0 : getCostTail().hashCode());
         result = prime * result + ((getCostFirst() == null) ? 0 : getCostFirst().hashCode());
+        result = prime * result + ((getCostLogistics() == null) ? 0 : getCostLogistics().hashCode());
         result = prime * result + ((getProfitTotal() == null) ? 0 : getProfitTotal().hashCode());
         result = prime * result + ((getProfitRate() == null) ? 0 : getProfitRate().hashCode());
         result = prime * result + ((getReceiptCountry() == null) ? 0 : getReceiptCountry().hashCode());

data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsOrderExample.java

@@ -3961,6 +3961,66 @@ public class DcBaseOmsOrderExample {
             return (Criteria) this;
         }
 
+        public Criteria andCostLogisticsIsNull() {
+            addCriterion("cost_logistics is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsIsNotNull() {
+            addCriterion("cost_logistics is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsEqualTo(BigDecimal value) {
+            addCriterion("cost_logistics =", value, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsNotEqualTo(BigDecimal value) {
+            addCriterion("cost_logistics <>", value, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsGreaterThan(BigDecimal value) {
+            addCriterion("cost_logistics >", value, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("cost_logistics >=", value, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsLessThan(BigDecimal value) {
+            addCriterion("cost_logistics <", value, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("cost_logistics <=", value, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsIn(List<BigDecimal> values) {
+            addCriterion("cost_logistics in", values, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsNotIn(List<BigDecimal> values) {
+            addCriterion("cost_logistics not in", values, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("cost_logistics between", value1, value2, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("cost_logistics not between", value1, value2, "costLogistics");
+            return (Criteria) this;
+        }
+
         public Criteria andProfitTotalIsNull() {
             addCriterion("profit_total is null");
             return (Criteria) this;

data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsSkuExample.java

@@ -4741,6 +4741,66 @@ public class DcBaseOmsSkuExample {
             return (Criteria) this;
         }
 
+        public Criteria andCostLogisticsIsNull() {
+            addCriterion("cost_logistics is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsIsNotNull() {
+            addCriterion("cost_logistics is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsEqualTo(BigDecimal value) {
+            addCriterion("cost_logistics =", value, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsNotEqualTo(BigDecimal value) {
+            addCriterion("cost_logistics <>", value, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsGreaterThan(BigDecimal value) {
+            addCriterion("cost_logistics >", value, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("cost_logistics >=", value, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsLessThan(BigDecimal value) {
+            addCriterion("cost_logistics <", value, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("cost_logistics <=", value, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsIn(List<BigDecimal> values) {
+            addCriterion("cost_logistics in", values, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsNotIn(List<BigDecimal> values) {
+            addCriterion("cost_logistics not in", values, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("cost_logistics between", value1, value2, "costLogistics");
+            return (Criteria) this;
+        }
+
+        public Criteria andCostLogisticsNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("cost_logistics not between", value1, value2, "costLogistics");
+            return (Criteria) this;
+        }
+
         public Criteria andProfitTotalIsNull() {
             addCriterion("profit_total is null");
             return (Criteria) this;