Commit 745d2414 by huluobin

# update

parent b68af3fa
...@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; ...@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.time.LocalDateTime;
@Data @Data
public class PurchaseDetailDTO { public class PurchaseDetailDTO {
...@@ -333,7 +333,7 @@ public class PurchaseDetailDTO { ...@@ -333,7 +333,7 @@ public class PurchaseDetailDTO {
private Integer payStatus; private Integer payStatus;
@JSONField(name = "lastsigntime") @JSONField(name = "lastsigntime")
private Date lastSigntime; private LocalDateTime lastSigntime;
@JSONField(name = "arrivalstatus") @JSONField(name = "arrivalstatus")
private Integer arrivalStatus; private Integer arrivalStatus;
...@@ -350,10 +350,12 @@ public class PurchaseDetailDTO { ...@@ -350,10 +350,12 @@ public class PurchaseDetailDTO {
@JSONField(name = "createusername") @JSONField(name = "createusername")
private String createusername; private String createusername;
@JSONField(name = "can_7day_refund") @JSONField(name = "can_7day_refund")
@JsonProperty("can_7day_refund") @JsonProperty("can_7day_refund")
private Integer can7dayRefund; private Integer can7dayRefund;
@JSONField(name = "arrivaldate")
private LocalDateTime arrivaldate;
} }
...@@ -87,6 +87,8 @@ public class SyncPurchaseDetailsJob extends PointJob { ...@@ -87,6 +87,8 @@ public class SyncPurchaseDetailsJob extends PointJob {
dcBasePurchaseDetails.setCreateTime(LocalDateTime.parse(purchaseDetail.getCreateTimed(), DateTimeFormatter.ofPattern("yyyy/M/d H:m:s"))); dcBasePurchaseDetails.setCreateTime(LocalDateTime.parse(purchaseDetail.getCreateTimed(), DateTimeFormatter.ofPattern("yyyy/M/d H:m:s")));
dcBasePurchaseDetails.setUpdateTime(LocalDateTime.parse(purchaseDetail.getUpdateTimed(), DateTimeFormatter.ofPattern("yyyy/M/d H:m:s"))); dcBasePurchaseDetails.setUpdateTime(LocalDateTime.parse(purchaseDetail.getUpdateTimed(), DateTimeFormatter.ofPattern("yyyy/M/d H:m:s")));
dcBasePurchaseDetails.setGmtModified(LocalDateTime.now()); dcBasePurchaseDetails.setGmtModified(LocalDateTime.now());
dcBasePurchaseDetails.setWarehouseCode(dcBasePurchaseDetails.getIsallot() == 1 ? dcBasePurchaseDetails.getWarehouseIntoCode() : dcBasePurchaseDetails.getWarehouseFromCode());
int i = mapper.updateByExampleSelective(dcBasePurchaseDetails, DcBasePurchaseDetailsExample.newAndCreateCriteria().andBailunSkuEqualTo(dcBasePurchaseDetails.getBailunSku()).andPurchaseIdEqualTo(dcBasePurchaseDetails.getPurchaseId()).example()); int i = mapper.updateByExampleSelective(dcBasePurchaseDetails, DcBasePurchaseDetailsExample.newAndCreateCriteria().andBailunSkuEqualTo(dcBasePurchaseDetails.getBailunSku()).andPurchaseIdEqualTo(dcBasePurchaseDetails.getPurchaseId()).example());
if (i == 0) { if (i == 0) {
mapper.insertSelective(dcBasePurchaseDetails); mapper.insertSelective(dcBasePurchaseDetails);
......
...@@ -475,6 +475,15 @@ public class DcBasePurchaseDetails { ...@@ -475,6 +475,15 @@ public class DcBasePurchaseDetails {
private String warehouseCode; private String warehouseCode;
/** /**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.arrivaldate
*
* @mbg.generated
*/
private LocalDateTime arrivaldate;
/**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_purchase_details * This method corresponds to the database table dc_base_purchase_details
* *
...@@ -538,6 +547,7 @@ public class DcBasePurchaseDetails { ...@@ -538,6 +547,7 @@ public class DcBasePurchaseDetails {
sb.append(", createusername=").append(createusername); sb.append(", createusername=").append(createusername);
sb.append(", can7dayRefund=").append(can7dayRefund); sb.append(", can7dayRefund=").append(can7dayRefund);
sb.append(", warehouseCode=").append(warehouseCode); sb.append(", warehouseCode=").append(warehouseCode);
sb.append(", arrivaldate=").append(arrivaldate);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
...@@ -611,7 +621,8 @@ public class DcBasePurchaseDetails { ...@@ -611,7 +621,8 @@ public class DcBasePurchaseDetails {
&& (this.getAmountExpress() == null ? other.getAmountExpress() == null : this.getAmountExpress().equals(other.getAmountExpress())) && (this.getAmountExpress() == null ? other.getAmountExpress() == null : this.getAmountExpress().equals(other.getAmountExpress()))
&& (this.getCreateusername() == null ? other.getCreateusername() == null : this.getCreateusername().equals(other.getCreateusername())) && (this.getCreateusername() == null ? other.getCreateusername() == null : this.getCreateusername().equals(other.getCreateusername()))
&& (this.getCan7dayRefund() == null ? other.getCan7dayRefund() == null : this.getCan7dayRefund().equals(other.getCan7dayRefund())) && (this.getCan7dayRefund() == null ? other.getCan7dayRefund() == null : this.getCan7dayRefund().equals(other.getCan7dayRefund()))
&& (this.getWarehouseCode() == null ? other.getWarehouseCode() == null : this.getWarehouseCode().equals(other.getWarehouseCode())); && (this.getWarehouseCode() == null ? other.getWarehouseCode() == null : this.getWarehouseCode().equals(other.getWarehouseCode()))
&& (this.getArrivaldate() == null ? other.getArrivaldate() == null : this.getArrivaldate().equals(other.getArrivaldate()));
} }
/** /**
...@@ -676,6 +687,7 @@ public class DcBasePurchaseDetails { ...@@ -676,6 +687,7 @@ public class DcBasePurchaseDetails {
result = prime * result + ((getCreateusername() == null) ? 0 : getCreateusername().hashCode()); result = prime * result + ((getCreateusername() == null) ? 0 : getCreateusername().hashCode());
result = prime * result + ((getCan7dayRefund() == null) ? 0 : getCan7dayRefund().hashCode()); result = prime * result + ((getCan7dayRefund() == null) ? 0 : getCan7dayRefund().hashCode());
result = prime * result + ((getWarehouseCode() == null) ? 0 : getWarehouseCode().hashCode()); result = prime * result + ((getWarehouseCode() == null) ? 0 : getWarehouseCode().hashCode());
result = prime * result + ((getArrivaldate() == null) ? 0 : getArrivaldate().hashCode());
return result; return result;
} }
} }
\ No newline at end of file
...@@ -3650,6 +3650,66 @@ public class DcBasePurchaseDetailsExample { ...@@ -3650,6 +3650,66 @@ public class DcBasePurchaseDetailsExample {
addCriterion("warehouse_code not between", value1, value2, "warehouseCode"); addCriterion("warehouse_code not between", value1, value2, "warehouseCode");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andArrivaldateIsNull() {
addCriterion("arrivaldate is null");
return (Criteria) this;
}
public Criteria andArrivaldateIsNotNull() {
addCriterion("arrivaldate is not null");
return (Criteria) this;
}
public Criteria andArrivaldateEqualTo(LocalDateTime value) {
addCriterion("arrivaldate =", value, "arrivaldate");
return (Criteria) this;
}
public Criteria andArrivaldateNotEqualTo(LocalDateTime value) {
addCriterion("arrivaldate <>", value, "arrivaldate");
return (Criteria) this;
}
public Criteria andArrivaldateGreaterThan(LocalDateTime value) {
addCriterion("arrivaldate >", value, "arrivaldate");
return (Criteria) this;
}
public Criteria andArrivaldateGreaterThanOrEqualTo(LocalDateTime value) {
addCriterion("arrivaldate >=", value, "arrivaldate");
return (Criteria) this;
}
public Criteria andArrivaldateLessThan(LocalDateTime value) {
addCriterion("arrivaldate <", value, "arrivaldate");
return (Criteria) this;
}
public Criteria andArrivaldateLessThanOrEqualTo(LocalDateTime value) {
addCriterion("arrivaldate <=", value, "arrivaldate");
return (Criteria) this;
}
public Criteria andArrivaldateIn(List<LocalDateTime> values) {
addCriterion("arrivaldate in", values, "arrivaldate");
return (Criteria) this;
}
public Criteria andArrivaldateNotIn(List<LocalDateTime> values) {
addCriterion("arrivaldate not in", values, "arrivaldate");
return (Criteria) this;
}
public Criteria andArrivaldateBetween(LocalDateTime value1, LocalDateTime value2) {
addCriterion("arrivaldate between", value1, value2, "arrivaldate");
return (Criteria) this;
}
public Criteria andArrivaldateNotBetween(LocalDateTime value1, LocalDateTime value2) {
addCriterion("arrivaldate not between", value1, value2, "arrivaldate");
return (Criteria) this;
}
} }
/** /**
......
...@@ -2,9 +2,10 @@ package com.bailuntec.mapper; ...@@ -2,9 +2,10 @@ package com.bailuntec.mapper;
import com.bailuntec.domain.entity.DcBasePurchaseDetails; import com.bailuntec.domain.entity.DcBasePurchaseDetails;
import com.bailuntec.domain.example.DcBasePurchaseDetailsExample; import com.bailuntec.domain.example.DcBasePurchaseDetailsExample;
import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface DcBasePurchaseDetailsMapper { public interface DcBasePurchaseDetailsMapper {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment