|
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
|
|
|
import com.uas.api.b2c_erp.buyer.model.B2cOrder;
|
|
import com.uas.api.b2c_erp.buyer.model.B2cOrder;
|
|
|
import com.uas.api.b2c_erp.buyer.model.B2cOrderDetail;
|
|
import com.uas.api.b2c_erp.buyer.model.B2cOrderDetail;
|
|
|
import com.uas.platform.b2c.common.account.model.User;
|
|
import com.uas.platform.b2c.common.account.model.User;
|
|
|
|
|
+import com.uas.platform.b2c.core.constant.Status;
|
|
|
import com.uas.platform.b2c.core.support.SystemSession;
|
|
import com.uas.platform.b2c.core.support.SystemSession;
|
|
|
import com.uas.platform.b2c.core.utils.StringUtilB2C;
|
|
import com.uas.platform.b2c.core.utils.StringUtilB2C;
|
|
|
import com.uas.platform.b2c.logistics.model.InvoiceFOrder;
|
|
import com.uas.platform.b2c.logistics.model.InvoiceFOrder;
|
|
@@ -13,33 +14,13 @@ import com.uas.platform.b2c.trade.aftersale.model.AfterSaleStatus;
|
|
|
import com.uas.platform.b2c.trade.aftersale.util.ExceptionUtil;
|
|
import com.uas.platform.b2c.trade.aftersale.util.ExceptionUtil;
|
|
|
import com.uas.platform.core.exception.IllegalOperatorException;
|
|
import com.uas.platform.core.exception.IllegalOperatorException;
|
|
|
import com.uas.platform.core.model.EncodingRulesConstant;
|
|
import com.uas.platform.core.model.EncodingRulesConstant;
|
|
|
-import com.uas.platform.core.model.Status;
|
|
|
|
|
import com.uas.platform.core.persistence.StatusColumn;
|
|
import com.uas.platform.core.persistence.StatusColumn;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
import org.springframework.util.CollectionUtils;
|
|
|
import org.springframework.util.StringUtils;
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
|
|
-import javax.persistence.CascadeType;
|
|
|
|
|
-import javax.persistence.Column;
|
|
|
|
|
-import javax.persistence.Entity;
|
|
|
|
|
-import javax.persistence.EnumType;
|
|
|
|
|
-import javax.persistence.Enumerated;
|
|
|
|
|
-import javax.persistence.FetchType;
|
|
|
|
|
-import javax.persistence.GeneratedValue;
|
|
|
|
|
-import javax.persistence.Id;
|
|
|
|
|
-import javax.persistence.JoinColumn;
|
|
|
|
|
-import javax.persistence.OneToMany;
|
|
|
|
|
-import javax.persistence.OneToOne;
|
|
|
|
|
-import javax.persistence.OrderBy;
|
|
|
|
|
-import javax.persistence.Table;
|
|
|
|
|
-import javax.persistence.Transient;
|
|
|
|
|
|
|
+import javax.persistence.*;
|
|
|
import java.io.Serializable;
|
|
import java.io.Serializable;
|
|
|
-import java.util.Date;
|
|
|
|
|
-import java.util.HashMap;
|
|
|
|
|
-import java.util.HashSet;
|
|
|
|
|
-import java.util.Iterator;
|
|
|
|
|
-import java.util.Map;
|
|
|
|
|
-import java.util.Objects;
|
|
|
|
|
-import java.util.Set;
|
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 订单
|
|
* 订单
|