修改同步物流头程费, 对数据不做处理.

data-base/base-sync-cost-first/src/main/java/com/bailuntec/domain/pojo/CostFirstData.java

@@ -14,9 +14,25 @@ public class CostFirstData {
     private Integer channelId;
     @JSONField(name = "boxCode")
     private String boxId;
-    @JSONField(name = "moneyRMB")
-    private BigDecimal costFirst;
     @JSONField(name = "wareCode")
     private String warehouseCode;
     private List<CostFirstSku> skus;
+    //燃油附加费
+    @JSONField(name = "fuelFee")
+    private BigDecimal costFuel;
+    //原始重量邮费
+    @JSONField(name = "weightFee")
+    private BigDecimal costWeight;
+    //清关费
+    @JSONField(name = "customsClearanceFee")
+    private BigDecimal costCustomsClearance;
+    //关税预付
+    @JSONField(name = "dutyFee")
+    private BigDecimal costDuty;
+    //报关费
+    @JSONField(name = "clearanceGoodsFee")
+    private BigDecimal costGoodsClearance;
+    //总费用
+    @JSONField(name = "totalPrices")
+    private BigDecimal costFirst;
 }

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

@@ -54,11 +54,47 @@ public class DcBaseCostFirst {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column dc_base_cost_first.bailun_sku
+     * This field corresponds to the database column dc_base_cost_first.cost_goods_clearance
      *
      * @mbg.generated
      */
-    private String bailunSku;
+    private BigDecimal costGoodsClearance;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_cost_first.cost_duty
+     *
+     * @mbg.generated
+     */
+    private BigDecimal costDuty;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_cost_first.cost_customs_clearance
+     *
+     * @mbg.generated
+     */
+    private BigDecimal costCustomsClearance;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_cost_first.cost_weight
+     *
+     * @mbg.generated
+     */
+    private BigDecimal costWeight;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_cost_first.cost_fuel
+     *
+     * @mbg.generated
+     */
+    private BigDecimal costFuel;
 
     /**
      *
@@ -72,6 +108,15 @@ public class DcBaseCostFirst {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_cost_first.bailun_sku
+     *
+     * @mbg.generated
+     */
+    private String bailunSku;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_base_cost_first.quantity
      *
      * @mbg.generated
@@ -81,11 +126,11 @@ public class DcBaseCostFirst {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column dc_base_cost_first.ratio_weight
+     * This field corresponds to the database column dc_base_cost_first.sku_weight
      *
      * @mbg.generated
      */
-    private BigDecimal ratioWeight;
+    private BigDecimal skuWeight;
 
     /**
      * This method was generated by MyBatis Generator.
@@ -104,10 +149,15 @@ public class DcBaseCostFirst {
         sb.append(", channelId=").append(channelId);
         sb.append(", boxId=").append(boxId);
         sb.append(", costFirst=").append(costFirst);
-        sb.append(", bailunSku=").append(bailunSku);
+        sb.append(", costGoodsClearance=").append(costGoodsClearance);
+        sb.append(", costDuty=").append(costDuty);
+        sb.append(", costCustomsClearance=").append(costCustomsClearance);
+        sb.append(", costWeight=").append(costWeight);
+        sb.append(", costFuel=").append(costFuel);
         sb.append(", warehouseCode=").append(warehouseCode);
+        sb.append(", bailunSku=").append(bailunSku);
         sb.append(", quantity=").append(quantity);
-        sb.append(", ratioWeight=").append(ratioWeight);
+        sb.append(", skuWeight=").append(skuWeight);
         sb.append("]");
         return sb.toString();
     }
@@ -135,10 +185,15 @@ public class DcBaseCostFirst {
             && (this.getChannelId() == null ? other.getChannelId() == null : this.getChannelId().equals(other.getChannelId()))
             && (this.getBoxId() == null ? other.getBoxId() == null : this.getBoxId().equals(other.getBoxId()))
             && (this.getCostFirst() == null ? other.getCostFirst() == null : this.getCostFirst().equals(other.getCostFirst()))
-            && (this.getBailunSku() == null ? other.getBailunSku() == null : this.getBailunSku().equals(other.getBailunSku()))
+            && (this.getCostGoodsClearance() == null ? other.getCostGoodsClearance() == null : this.getCostGoodsClearance().equals(other.getCostGoodsClearance()))
+            && (this.getCostDuty() == null ? other.getCostDuty() == null : this.getCostDuty().equals(other.getCostDuty()))
+            && (this.getCostCustomsClearance() == null ? other.getCostCustomsClearance() == null : this.getCostCustomsClearance().equals(other.getCostCustomsClearance()))
+            && (this.getCostWeight() == null ? other.getCostWeight() == null : this.getCostWeight().equals(other.getCostWeight()))
+            && (this.getCostFuel() == null ? other.getCostFuel() == null : this.getCostFuel().equals(other.getCostFuel()))
             && (this.getWarehouseCode() == null ? other.getWarehouseCode() == null : this.getWarehouseCode().equals(other.getWarehouseCode()))
+            && (this.getBailunSku() == null ? other.getBailunSku() == null : this.getBailunSku().equals(other.getBailunSku()))
             && (this.getQuantity() == null ? other.getQuantity() == null : this.getQuantity().equals(other.getQuantity()))
-            && (this.getRatioWeight() == null ? other.getRatioWeight() == null : this.getRatioWeight().equals(other.getRatioWeight()));
+            && (this.getSkuWeight() == null ? other.getSkuWeight() == null : this.getSkuWeight().equals(other.getSkuWeight()));
     }
 
     /**
@@ -156,10 +211,15 @@ public class DcBaseCostFirst {
         result = prime * result + ((getChannelId() == null) ? 0 : getChannelId().hashCode());
         result = prime * result + ((getBoxId() == null) ? 0 : getBoxId().hashCode());
         result = prime * result + ((getCostFirst() == null) ? 0 : getCostFirst().hashCode());
-        result = prime * result + ((getBailunSku() == null) ? 0 : getBailunSku().hashCode());
+        result = prime * result + ((getCostGoodsClearance() == null) ? 0 : getCostGoodsClearance().hashCode());
+        result = prime * result + ((getCostDuty() == null) ? 0 : getCostDuty().hashCode());
+        result = prime * result + ((getCostCustomsClearance() == null) ? 0 : getCostCustomsClearance().hashCode());
+        result = prime * result + ((getCostWeight() == null) ? 0 : getCostWeight().hashCode());
+        result = prime * result + ((getCostFuel() == null) ? 0 : getCostFuel().hashCode());
         result = prime * result + ((getWarehouseCode() == null) ? 0 : getWarehouseCode().hashCode());
+        result = prime * result + ((getBailunSku() == null) ? 0 : getBailunSku().hashCode());
         result = prime * result + ((getQuantity() == null) ? 0 : getQuantity().hashCode());
-        result = prime * result + ((getRatioWeight() == null) ? 0 : getRatioWeight().hashCode());
+        result = prime * result + ((getSkuWeight() == null) ? 0 : getSkuWeight().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -161,6 +161,15 @@ public class DcBaseCrmRefund {
     private BigDecimal amountRefundRmb;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_crm_refund.crm_id
+     *
+     * @mbg.generated
+     */
+    private Integer crmId;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_crm_refund
      *
@@ -189,6 +198,7 @@ public class DcBaseCrmRefund {
         sb.append(", gmtModified=").append(gmtModified);
         sb.append(", linked=").append(linked);
         sb.append(", amountRefundRmb=").append(amountRefundRmb);
+        sb.append(", crmId=").append(crmId);
         sb.append("]");
         return sb.toString();
     }
@@ -227,7 +237,8 @@ public class DcBaseCrmRefund {
             && (this.getGmtCreate() == null ? other.getGmtCreate() == null : this.getGmtCreate().equals(other.getGmtCreate()))
             && (this.getGmtModified() == null ? other.getGmtModified() == null : this.getGmtModified().equals(other.getGmtModified()))
             && (this.getLinked() == null ? other.getLinked() == null : this.getLinked().equals(other.getLinked()))
-            && (this.getAmountRefundRmb() == null ? other.getAmountRefundRmb() == null : this.getAmountRefundRmb().equals(other.getAmountRefundRmb()));
+            && (this.getAmountRefundRmb() == null ? other.getAmountRefundRmb() == null : this.getAmountRefundRmb().equals(other.getAmountRefundRmb()))
+            && (this.getCrmId() == null ? other.getCrmId() == null : this.getCrmId().equals(other.getCrmId()));
     }
 
     /**
@@ -257,6 +268,7 @@ public class DcBaseCrmRefund {
         result = prime * result + ((getGmtModified() == null) ? 0 : getGmtModified().hashCode());
         result = prime * result + ((getLinked() == null) ? 0 : getLinked().hashCode());
         result = prime * result + ((getAmountRefundRmb() == null) ? 0 : getAmountRefundRmb().hashCode());
+        result = prime * result + ((getCrmId() == null) ? 0 : getCrmId().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -1460,6 +1460,66 @@ public class DcBaseCrmRefundExample {
             addCriterion("amount_refund_rmb not between", value1, value2, "amountRefundRmb");
             return (Criteria) this;
         }
+
+        public Criteria andCrmIdIsNull() {
+            addCriterion("crm_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrmIdIsNotNull() {
+            addCriterion("crm_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrmIdEqualTo(Integer value) {
+            addCriterion("crm_id =", value, "crmId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrmIdNotEqualTo(Integer value) {
+            addCriterion("crm_id <>", value, "crmId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrmIdGreaterThan(Integer value) {
+            addCriterion("crm_id >", value, "crmId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrmIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("crm_id >=", value, "crmId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrmIdLessThan(Integer value) {
+            addCriterion("crm_id <", value, "crmId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrmIdLessThanOrEqualTo(Integer value) {
+            addCriterion("crm_id <=", value, "crmId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrmIdIn(List<Integer> values) {
+            addCriterion("crm_id in", values, "crmId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrmIdNotIn(List<Integer> values) {
+            addCriterion("crm_id not in", values, "crmId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrmIdBetween(Integer value1, Integer value2) {
+            addCriterion("crm_id between", value1, value2, "crmId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrmIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("crm_id not between", value1, value2, "crmId");
+            return (Criteria) this;
+        }
     }
 
     /**

data-common/src/main/java/com/bailuntec/domain/pojo/CommonSkuCondition.java

@@ -87,6 +87,6 @@ public class CommonSkuCondition {
     /// </summary>
     private Integer isResultWare;
 
-
-
+    //是否上传
+    public Integer IsUpApi;
 }