数据中心--同步oms新增产品备注、客户留言异常

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

@@ -197,6 +197,8 @@ public class OrderSyncJob extends PointJob {
                         }
                         dcBaseOmsSku.setHasDelete(false);
                         dcBaseOmsSku.setHasScalp(dcBaseOmsOrder.getHasScalp());
+                        dcBaseOmsSku.setHasBuyerRemark(dcBaseOmsOrder.getHasBuyerRemark());
+                        dcBaseOmsSku.setHasPlatskuRemark(dcBaseOmsOrder.getHasPlatskuRemark());
                         /*
                          * dc_base_oms_sku字段赋值, 给初始值是为了避免nullPoint
                          */
@@ -691,6 +693,8 @@ public class OrderSyncJob extends PointJob {
 
     private void listOrderExceptions(OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder) {
         dcBaseOmsOrder.setHasScalp(false);
+        dcBaseOmsOrder.setHasBuyerRemark(false);
+        dcBaseOmsOrder.setHasPlatskuRemark(false);
         List<OrderException> orderExceptions = omsResult.getOrderExceptions();
         if (orderExceptions != null && orderExceptions.size() > 0) {
             for (OrderException orderException : orderExceptions) {
@@ -700,6 +704,18 @@ public class OrderSyncJob extends PointJob {
                         dcBaseOmsOrder.setHasScalp(true);
                     }
                 }
+
+                if (StringUtils.isNotBlank(orderException.getExceptionType()) && StringUtils.isNotBlank(orderException.getStatus()) && orderException.getExceptionType().equals(OrderExceptionType.BuyerRemark.value())) {
+                    if (orderException.getStatus().equals(OrderExceptionStatus.UnHandle.value()) || orderException.getStatus().equals(OrderExceptionStatus.Handling.value())){
+                        dcBaseOmsOrder.setHasBuyerRemark(true);
+                    }
+                }
+
+                if (StringUtils.isNotBlank(orderException.getExceptionType()) && StringUtils.isNotBlank(orderException.getStatus()) && orderException.getExceptionType().equals(OrderExceptionType.PlatSkuRemark.value())) {
+                    if (orderException.getStatus().equals(OrderExceptionStatus.UnHandle.value()) || orderException.getStatus().equals(OrderExceptionStatus.Handling.value())){
+                        dcBaseOmsOrder.setHasPlatskuRemark(true);
+                    }
+                }
             }
         }
     }

data-base/base-sync-oms-order/src/main/resources/job.properties

@@ -9,7 +9,7 @@ EVENT_RDB_STORAGE_USERNAME=root
 EVENT_RDB_STORAGE_PASSWORD=#7kfnymAM$Y9-Ntf
 ZOOKEEPER_SERVER=172.31.255.120:2181
 NAME_SPACE=data-center
-JOB_NAME=base-sync-oms-order-coroutine
-#JOB_NAME=base-sync-oms-order
+#JOB_NAME=base-sync-oms-order-coroutine
+JOB_NAME=base-sync-oms-order
 JOB_CRON=0/1 * * * * ? *
 SHARDING_TOTAL_COUNT=1
\ No newline at end of file

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

@@ -802,6 +802,24 @@ public class DcBaseOmsOrder {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.has_buyer_remark
+     *
+     * @mbg.generated
+     */
+    private Boolean hasBuyerRemark;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.has_platsku_remark
+     *
+     * @mbg.generated
+     */
+    private Boolean hasPlatskuRemark;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_base_oms_order.has_innersale
      *
      * @mbg.generated
@@ -998,6 +1016,8 @@ public class DcBaseOmsOrder {
         sb.append(", bailunPickingStatus=").append(bailunPickingStatus);
         sb.append(", bailunRequireLogistics=").append(bailunRequireLogistics);
         sb.append(", hasScalp=").append(hasScalp);
+        sb.append(", hasBuyerRemark=").append(hasBuyerRemark);
+        sb.append(", hasPlatskuRemark=").append(hasPlatskuRemark);
         sb.append(", hasInnersale=").append(hasInnersale);
         sb.append(", companyId=").append(companyId);
         sb.append(", profitOms=").append(profitOms);
@@ -1119,6 +1139,8 @@ public class DcBaseOmsOrder {
             && (this.getBailunPickingStatus() == null ? other.getBailunPickingStatus() == null : this.getBailunPickingStatus().equals(other.getBailunPickingStatus()))
             && (this.getBailunRequireLogistics() == null ? other.getBailunRequireLogistics() == null : this.getBailunRequireLogistics().equals(other.getBailunRequireLogistics()))
             && (this.getHasScalp() == null ? other.getHasScalp() == null : this.getHasScalp().equals(other.getHasScalp()))
+            && (this.getHasBuyerRemark() == null ? other.getHasBuyerRemark() == null : this.getHasBuyerRemark().equals(other.getHasBuyerRemark()))
+            && (this.getHasPlatskuRemark() == null ? other.getHasPlatskuRemark() == null : this.getHasPlatskuRemark().equals(other.getHasPlatskuRemark()))
             && (this.getHasInnersale() == null ? other.getHasInnersale() == null : this.getHasInnersale().equals(other.getHasInnersale()))
             && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
             && (this.getProfitOms() == null ? other.getProfitOms() == null : this.getProfitOms().equals(other.getProfitOms()))
@@ -1230,6 +1252,8 @@ public class DcBaseOmsOrder {
         result = prime * result + ((getBailunPickingStatus() == null) ? 0 : getBailunPickingStatus().hashCode());
         result = prime * result + ((getBailunRequireLogistics() == null) ? 0 : getBailunRequireLogistics().hashCode());
         result = prime * result + ((getHasScalp() == null) ? 0 : getHasScalp().hashCode());
+        result = prime * result + ((getHasBuyerRemark() == null) ? 0 : getHasBuyerRemark().hashCode());
+        result = prime * result + ((getHasPlatskuRemark() == null) ? 0 : getHasPlatskuRemark().hashCode());
         result = prime * result + ((getHasInnersale() == null) ? 0 : getHasInnersale().hashCode());
         result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
         result = prime * result + ((getProfitOms() == null) ? 0 : getProfitOms().hashCode());

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

@@ -910,6 +910,24 @@ public class DcBaseOmsSku {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.has_buyer_remark
+     *
+     * @mbg.generated
+     */
+    private Boolean hasBuyerRemark;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.has_platsku_remark
+     *
+     * @mbg.generated
+     */
+    private Boolean hasPlatskuRemark;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_base_oms_sku.logistics_method_code
      *
      * @mbg.generated
@@ -1127,6 +1145,8 @@ public class DcBaseOmsSku {
         sb.append(", bailunRequireLogistics=").append(bailunRequireLogistics);
         sb.append(", hasDelete=").append(hasDelete);
         sb.append(", hasScalp=").append(hasScalp);
+        sb.append(", hasBuyerRemark=").append(hasBuyerRemark);
+        sb.append(", hasPlatskuRemark=").append(hasPlatskuRemark);
         sb.append(", logisticsMethodCode=").append(logisticsMethodCode);
         sb.append(", logisticsMethodName=").append(logisticsMethodName);
         sb.append(", hasInnersale=").append(hasInnersale);
@@ -1261,6 +1281,8 @@ public class DcBaseOmsSku {
             && (this.getBailunRequireLogistics() == null ? other.getBailunRequireLogistics() == null : this.getBailunRequireLogistics().equals(other.getBailunRequireLogistics()))
             && (this.getHasDelete() == null ? other.getHasDelete() == null : this.getHasDelete().equals(other.getHasDelete()))
             && (this.getHasScalp() == null ? other.getHasScalp() == null : this.getHasScalp().equals(other.getHasScalp()))
+            && (this.getHasBuyerRemark() == null ? other.getHasBuyerRemark() == null : this.getHasBuyerRemark().equals(other.getHasBuyerRemark()))
+            && (this.getHasPlatskuRemark() == null ? other.getHasPlatskuRemark() == null : this.getHasPlatskuRemark().equals(other.getHasPlatskuRemark()))
             && (this.getLogisticsMethodCode() == null ? other.getLogisticsMethodCode() == null : this.getLogisticsMethodCode().equals(other.getLogisticsMethodCode()))
             && (this.getLogisticsMethodName() == null ? other.getLogisticsMethodName() == null : this.getLogisticsMethodName().equals(other.getLogisticsMethodName()))
             && (this.getHasInnersale() == null ? other.getHasInnersale() == null : this.getHasInnersale().equals(other.getHasInnersale()))
@@ -1385,6 +1407,8 @@ public class DcBaseOmsSku {
         result = prime * result + ((getBailunRequireLogistics() == null) ? 0 : getBailunRequireLogistics().hashCode());
         result = prime * result + ((getHasDelete() == null) ? 0 : getHasDelete().hashCode());
         result = prime * result + ((getHasScalp() == null) ? 0 : getHasScalp().hashCode());
+        result = prime * result + ((getHasBuyerRemark() == null) ? 0 : getHasBuyerRemark().hashCode());
+        result = prime * result + ((getHasPlatskuRemark() == null) ? 0 : getHasPlatskuRemark().hashCode());
         result = prime * result + ((getLogisticsMethodCode() == null) ? 0 : getLogisticsMethodCode().hashCode());
         result = prime * result + ((getLogisticsMethodName() == null) ? 0 : getLogisticsMethodName().hashCode());
         result = prime * result + ((getHasInnersale() == null) ? 0 : getHasInnersale().hashCode());

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

@@ -6061,6 +6061,126 @@ public class DcBaseOmsOrderExample {
             return (Criteria) this;
         }
 
+        public Criteria andHasBuyerRemarkIsNull() {
+            addCriterion("has_buyer_remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkIsNotNull() {
+            addCriterion("has_buyer_remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkEqualTo(Boolean value) {
+            addCriterion("has_buyer_remark =", value, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkNotEqualTo(Boolean value) {
+            addCriterion("has_buyer_remark <>", value, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkGreaterThan(Boolean value) {
+            addCriterion("has_buyer_remark >", value, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("has_buyer_remark >=", value, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkLessThan(Boolean value) {
+            addCriterion("has_buyer_remark <", value, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkLessThanOrEqualTo(Boolean value) {
+            addCriterion("has_buyer_remark <=", value, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkIn(List<Boolean> values) {
+            addCriterion("has_buyer_remark in", values, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkNotIn(List<Boolean> values) {
+            addCriterion("has_buyer_remark not in", values, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_buyer_remark between", value1, value2, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_buyer_remark not between", value1, value2, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkIsNull() {
+            addCriterion("has_platsku_remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkIsNotNull() {
+            addCriterion("has_platsku_remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkEqualTo(Boolean value) {
+            addCriterion("has_platsku_remark =", value, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkNotEqualTo(Boolean value) {
+            addCriterion("has_platsku_remark <>", value, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkGreaterThan(Boolean value) {
+            addCriterion("has_platsku_remark >", value, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("has_platsku_remark >=", value, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkLessThan(Boolean value) {
+            addCriterion("has_platsku_remark <", value, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkLessThanOrEqualTo(Boolean value) {
+            addCriterion("has_platsku_remark <=", value, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkIn(List<Boolean> values) {
+            addCriterion("has_platsku_remark in", values, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkNotIn(List<Boolean> values) {
+            addCriterion("has_platsku_remark not in", values, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_platsku_remark between", value1, value2, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_platsku_remark not between", value1, value2, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
         public Criteria andHasInnersaleIsNull() {
             addCriterion("has_innersale is null");
             return (Criteria) this;

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

@@ -6811,6 +6811,126 @@ public class DcBaseOmsSkuExample {
             return (Criteria) this;
         }
 
+        public Criteria andHasBuyerRemarkIsNull() {
+            addCriterion("has_buyer_remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkIsNotNull() {
+            addCriterion("has_buyer_remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkEqualTo(Boolean value) {
+            addCriterion("has_buyer_remark =", value, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkNotEqualTo(Boolean value) {
+            addCriterion("has_buyer_remark <>", value, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkGreaterThan(Boolean value) {
+            addCriterion("has_buyer_remark >", value, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("has_buyer_remark >=", value, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkLessThan(Boolean value) {
+            addCriterion("has_buyer_remark <", value, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkLessThanOrEqualTo(Boolean value) {
+            addCriterion("has_buyer_remark <=", value, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkIn(List<Boolean> values) {
+            addCriterion("has_buyer_remark in", values, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkNotIn(List<Boolean> values) {
+            addCriterion("has_buyer_remark not in", values, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_buyer_remark between", value1, value2, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasBuyerRemarkNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_buyer_remark not between", value1, value2, "hasBuyerRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkIsNull() {
+            addCriterion("has_platsku_remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkIsNotNull() {
+            addCriterion("has_platsku_remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkEqualTo(Boolean value) {
+            addCriterion("has_platsku_remark =", value, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkNotEqualTo(Boolean value) {
+            addCriterion("has_platsku_remark <>", value, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkGreaterThan(Boolean value) {
+            addCriterion("has_platsku_remark >", value, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("has_platsku_remark >=", value, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkLessThan(Boolean value) {
+            addCriterion("has_platsku_remark <", value, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkLessThanOrEqualTo(Boolean value) {
+            addCriterion("has_platsku_remark <=", value, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkIn(List<Boolean> values) {
+            addCriterion("has_platsku_remark in", values, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkNotIn(List<Boolean> values) {
+            addCriterion("has_platsku_remark not in", values, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_platsku_remark between", value1, value2, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPlatskuRemarkNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_platsku_remark not between", value1, value2, "hasPlatskuRemark");
+            return (Criteria) this;
+        }
+
         public Criteria andLogisticsMethodCodeIsNull() {
             addCriterion("logistics_method_code is null");
             return (Criteria) this;