|
|
|
@ -49,6 +49,11 @@ public class BsOrderGoods implements Serializable { |
|
|
|
|
*/ |
|
|
|
|
private String childOrderNo; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 三方订单号 |
|
|
|
|
*/ |
|
|
|
|
private String thirdOrderNo; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 商户id |
|
|
|
|
*/ |
|
|
|
@ -170,7 +175,7 @@ public class BsOrderGoods implements Serializable { |
|
|
|
|
private Integer payType; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* bs_order_child订单表同步 |
|
|
|
|
* 1:待发货 2:已发货 3:配送中 4:已送达 5:已取消 6:退货中 7:已退货 8:待支付 0:删除 |
|
|
|
|
*/ |
|
|
|
|
private Integer status; |
|
|
|
|
|
|
|
|
@ -288,6 +293,14 @@ public class BsOrderGoods implements Serializable { |
|
|
|
|
this.childOrderNo = childOrderNo; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public String getThirdOrderNo() { |
|
|
|
|
return thirdOrderNo; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public void setThirdOrderNo(String thirdOrderNo) { |
|
|
|
|
this.thirdOrderNo = thirdOrderNo; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public Long getMerId() { |
|
|
|
|
return merId; |
|
|
|
|
} |
|
|
|
@ -591,171 +604,4 @@ public class BsOrderGoods implements Serializable { |
|
|
|
|
public void setExt3(String ext3) { |
|
|
|
|
this.ext3 = ext3; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public boolean equals(Object that) { |
|
|
|
|
if (this == that) { |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
if (that == null) { |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
if (getClass() != that.getClass()) { |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
BsOrderGoods other = (BsOrderGoods) that; |
|
|
|
|
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) |
|
|
|
|
&& (this.getLogisticsNo() == null ? other.getLogisticsNo() == null : this.getLogisticsNo().equals(other.getLogisticsNo())) |
|
|
|
|
&& (this.getFreightPrice() == null ? other.getFreightPrice() == null : this.getFreightPrice().equals(other.getFreightPrice())) |
|
|
|
|
&& (this.getDeliveryAddressId() == null ? other.getDeliveryAddressId() == null : this.getDeliveryAddressId().equals(other.getDeliveryAddressId())) |
|
|
|
|
&& (this.getDeliveryAddress() == null ? other.getDeliveryAddress() == null : this.getDeliveryAddress().equals(other.getDeliveryAddress())) |
|
|
|
|
&& (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) |
|
|
|
|
&& (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo())) |
|
|
|
|
&& (this.getMerId() == null ? other.getMerId() == null : this.getMerId().equals(other.getMerId())) |
|
|
|
|
&& (this.getMerName() == null ? other.getMerName() == null : this.getMerName().equals(other.getMerName())) |
|
|
|
|
&& (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) |
|
|
|
|
&& (this.getUserPhone() == null ? other.getUserPhone() == null : this.getUserPhone().equals(other.getUserPhone())) |
|
|
|
|
&& (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId())) |
|
|
|
|
&& (this.getImg() == null ? other.getImg() == null : this.getImg().equals(other.getImg())) |
|
|
|
|
&& (this.getGoodsName() == null ? other.getGoodsName() == null : this.getGoodsName().equals(other.getGoodsName())) |
|
|
|
|
&& (this.getGoodsTypeId() == null ? other.getGoodsTypeId() == null : this.getGoodsTypeId().equals(other.getGoodsTypeId())) |
|
|
|
|
&& (this.getGoodsTypeName() == null ? other.getGoodsTypeName() == null : this.getGoodsTypeName().equals(other.getGoodsTypeName())) |
|
|
|
|
&& (this.getGoodsBrandId() == null ? other.getGoodsBrandId() == null : this.getGoodsBrandId().equals(other.getGoodsBrandId())) |
|
|
|
|
&& (this.getGoodsBrandName() == null ? other.getGoodsBrandName() == null : this.getGoodsBrandName().equals(other.getGoodsBrandName())) |
|
|
|
|
&& (this.getGoodsSpecsId() == null ? other.getGoodsSpecsId() == null : this.getGoodsSpecsId().equals(other.getGoodsSpecsId())) |
|
|
|
|
&& (this.getGoodsSpecsName() == null ? other.getGoodsSpecsName() == null : this.getGoodsSpecsName().equals(other.getGoodsSpecsName())) |
|
|
|
|
&& (this.getGoodsSpecsOriginalPrice() == null ? other.getGoodsSpecsOriginalPrice() == null : this.getGoodsSpecsOriginalPrice().equals(other.getGoodsSpecsOriginalPrice())) |
|
|
|
|
&& (this.getGoodsCount() == null ? other.getGoodsCount() == null : this.getGoodsCount().equals(other.getGoodsCount())) |
|
|
|
|
&& (this.getTotalPrice() == null ? other.getTotalPrice() == null : this.getTotalPrice().equals(other.getTotalPrice())) |
|
|
|
|
&& (this.getTotalDeductionPrice() == null ? other.getTotalDeductionPrice() == null : this.getTotalDeductionPrice().equals(other.getTotalDeductionPrice())) |
|
|
|
|
&& (this.getCouponDiscountPrice() == null ? other.getCouponDiscountPrice() == null : this.getCouponDiscountPrice().equals(other.getCouponDiscountPrice())) |
|
|
|
|
&& (this.getIntegralDiscountPrice() == null ? other.getIntegralDiscountPrice() == null : this.getIntegralDiscountPrice().equals(other.getIntegralDiscountPrice())) |
|
|
|
|
&& (this.getPlatformCode() == null ? other.getPlatformCode() == null : this.getPlatformCode().equals(other.getPlatformCode())) |
|
|
|
|
&& (this.getPayRealPrice() == null ? other.getPayRealPrice() == null : this.getPayRealPrice().equals(other.getPayRealPrice())) |
|
|
|
|
&& (this.getPayChannel() == null ? other.getPayChannel() == null : this.getPayChannel().equals(other.getPayChannel())) |
|
|
|
|
&& (this.getPaySerialNo() == null ? other.getPaySerialNo() == null : this.getPaySerialNo().equals(other.getPaySerialNo())) |
|
|
|
|
&& (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType())) |
|
|
|
|
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) |
|
|
|
|
&& (this.getLogisticsStatusDesc() == null ? other.getLogisticsStatusDesc() == null : this.getLogisticsStatusDesc().equals(other.getLogisticsStatusDesc())) |
|
|
|
|
&& (this.getLogisticsStatus() == null ? other.getLogisticsStatus() == null : this.getLogisticsStatus().equals(other.getLogisticsStatus())) |
|
|
|
|
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) |
|
|
|
|
&& (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime())) |
|
|
|
|
&& (this.getCancelTime() == null ? other.getCancelTime() == null : this.getCancelTime().equals(other.getCancelTime())) |
|
|
|
|
&& (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime())) |
|
|
|
|
&& (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime())) |
|
|
|
|
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) |
|
|
|
|
&& (this.getExceptionStatus() == null ? other.getExceptionStatus() == null : this.getExceptionStatus().equals(other.getExceptionStatus())) |
|
|
|
|
&& (this.getExceptionMsg() == null ? other.getExceptionMsg() == null : this.getExceptionMsg().equals(other.getExceptionMsg())) |
|
|
|
|
&& (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) |
|
|
|
|
&& (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) |
|
|
|
|
&& (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public int hashCode() { |
|
|
|
|
final int prime = 31; |
|
|
|
|
int result = 1; |
|
|
|
|
result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); |
|
|
|
|
result = prime * result + ((getLogisticsNo() == null) ? 0 : getLogisticsNo().hashCode()); |
|
|
|
|
result = prime * result + ((getFreightPrice() == null) ? 0 : getFreightPrice().hashCode()); |
|
|
|
|
result = prime * result + ((getDeliveryAddressId() == null) ? 0 : getDeliveryAddressId().hashCode()); |
|
|
|
|
result = prime * result + ((getDeliveryAddress() == null) ? 0 : getDeliveryAddress().hashCode()); |
|
|
|
|
result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); |
|
|
|
|
result = prime * result + ((getChildOrderNo() == null) ? 0 : getChildOrderNo().hashCode()); |
|
|
|
|
result = prime * result + ((getMerId() == null) ? 0 : getMerId().hashCode()); |
|
|
|
|
result = prime * result + ((getMerName() == null) ? 0 : getMerName().hashCode()); |
|
|
|
|
result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); |
|
|
|
|
result = prime * result + ((getUserPhone() == null) ? 0 : getUserPhone().hashCode()); |
|
|
|
|
result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode()); |
|
|
|
|
result = prime * result + ((getImg() == null) ? 0 : getImg().hashCode()); |
|
|
|
|
result = prime * result + ((getGoodsName() == null) ? 0 : getGoodsName().hashCode()); |
|
|
|
|
result = prime * result + ((getGoodsTypeId() == null) ? 0 : getGoodsTypeId().hashCode()); |
|
|
|
|
result = prime * result + ((getGoodsTypeName() == null) ? 0 : getGoodsTypeName().hashCode()); |
|
|
|
|
result = prime * result + ((getGoodsBrandId() == null) ? 0 : getGoodsBrandId().hashCode()); |
|
|
|
|
result = prime * result + ((getGoodsBrandName() == null) ? 0 : getGoodsBrandName().hashCode()); |
|
|
|
|
result = prime * result + ((getGoodsSpecsId() == null) ? 0 : getGoodsSpecsId().hashCode()); |
|
|
|
|
result = prime * result + ((getGoodsSpecsName() == null) ? 0 : getGoodsSpecsName().hashCode()); |
|
|
|
|
result = prime * result + ((getGoodsSpecsOriginalPrice() == null) ? 0 : getGoodsSpecsOriginalPrice().hashCode()); |
|
|
|
|
result = prime * result + ((getGoodsCount() == null) ? 0 : getGoodsCount().hashCode()); |
|
|
|
|
result = prime * result + ((getTotalPrice() == null) ? 0 : getTotalPrice().hashCode()); |
|
|
|
|
result = prime * result + ((getTotalDeductionPrice() == null) ? 0 : getTotalDeductionPrice().hashCode()); |
|
|
|
|
result = prime * result + ((getCouponDiscountPrice() == null) ? 0 : getCouponDiscountPrice().hashCode()); |
|
|
|
|
result = prime * result + ((getIntegralDiscountPrice() == null) ? 0 : getIntegralDiscountPrice().hashCode()); |
|
|
|
|
result = prime * result + ((getPlatformCode() == null) ? 0 : getPlatformCode().hashCode()); |
|
|
|
|
result = prime * result + ((getPayRealPrice() == null) ? 0 : getPayRealPrice().hashCode()); |
|
|
|
|
result = prime * result + ((getPayChannel() == null) ? 0 : getPayChannel().hashCode()); |
|
|
|
|
result = prime * result + ((getPaySerialNo() == null) ? 0 : getPaySerialNo().hashCode()); |
|
|
|
|
result = prime * result + ((getPayType() == null) ? 0 : getPayType().hashCode()); |
|
|
|
|
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); |
|
|
|
|
result = prime * result + ((getLogisticsStatusDesc() == null) ? 0 : getLogisticsStatusDesc().hashCode()); |
|
|
|
|
result = prime * result + ((getLogisticsStatus() == null) ? 0 : getLogisticsStatus().hashCode()); |
|
|
|
|
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); |
|
|
|
|
result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode()); |
|
|
|
|
result = prime * result + ((getCancelTime() == null) ? 0 : getCancelTime().hashCode()); |
|
|
|
|
result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode()); |
|
|
|
|
result = prime * result + ((getFinishTime() == null) ? 0 : getFinishTime().hashCode()); |
|
|
|
|
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); |
|
|
|
|
result = prime * result + ((getExceptionStatus() == null) ? 0 : getExceptionStatus().hashCode()); |
|
|
|
|
result = prime * result + ((getExceptionMsg() == null) ? 0 : getExceptionMsg().hashCode()); |
|
|
|
|
result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); |
|
|
|
|
result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); |
|
|
|
|
result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); |
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public String toString() { |
|
|
|
|
StringBuilder sb = new StringBuilder(); |
|
|
|
|
sb.append(getClass().getSimpleName()); |
|
|
|
|
sb.append(" ["); |
|
|
|
|
sb.append("Hash = ").append(hashCode()); |
|
|
|
|
sb.append(", id=").append(id); |
|
|
|
|
sb.append(", logisticsNo=").append(logisticsNo); |
|
|
|
|
sb.append(", freightPrice=").append(freightPrice); |
|
|
|
|
sb.append(", deliveryAddressId=").append(deliveryAddressId); |
|
|
|
|
sb.append(", deliveryAddress=").append(deliveryAddress); |
|
|
|
|
sb.append(", orderNo=").append(orderNo); |
|
|
|
|
sb.append(", childOrderNo=").append(childOrderNo); |
|
|
|
|
sb.append(", merId=").append(merId); |
|
|
|
|
sb.append(", merName=").append(merName); |
|
|
|
|
sb.append(", userId=").append(userId); |
|
|
|
|
sb.append(", userPhone=").append(userPhone); |
|
|
|
|
sb.append(", goodsId=").append(goodsId); |
|
|
|
|
sb.append(", img=").append(img); |
|
|
|
|
sb.append(", goodsName=").append(goodsName); |
|
|
|
|
sb.append(", goodsTypeId=").append(goodsTypeId); |
|
|
|
|
sb.append(", goodsTypeName=").append(goodsTypeName); |
|
|
|
|
sb.append(", goodsBrandId=").append(goodsBrandId); |
|
|
|
|
sb.append(", goodsBrandName=").append(goodsBrandName); |
|
|
|
|
sb.append(", goodsSpecsId=").append(goodsSpecsId); |
|
|
|
|
sb.append(", goodsSpecsName=").append(goodsSpecsName); |
|
|
|
|
sb.append(", goodsSpecsOriginalPrice=").append(goodsSpecsOriginalPrice); |
|
|
|
|
sb.append(", goodsCount=").append(goodsCount); |
|
|
|
|
sb.append(", totalPrice=").append(totalPrice); |
|
|
|
|
sb.append(", totalDeductionPrice=").append(totalDeductionPrice); |
|
|
|
|
sb.append(", couponDiscountPrice=").append(couponDiscountPrice); |
|
|
|
|
sb.append(", integralDiscountPrice=").append(integralDiscountPrice); |
|
|
|
|
sb.append(", platformCode=").append(platformCode); |
|
|
|
|
sb.append(", payRealPrice=").append(payRealPrice); |
|
|
|
|
sb.append(", payChannel=").append(payChannel); |
|
|
|
|
sb.append(", paySerialNo=").append(paySerialNo); |
|
|
|
|
sb.append(", payType=").append(payType); |
|
|
|
|
sb.append(", status=").append(status); |
|
|
|
|
sb.append(", logisticsStatusDesc=").append(logisticsStatusDesc); |
|
|
|
|
sb.append(", logisticsStatus=").append(logisticsStatus); |
|
|
|
|
sb.append(", createTime=").append(createTime); |
|
|
|
|
sb.append(", payTime=").append(payTime); |
|
|
|
|
sb.append(", cancelTime=").append(cancelTime); |
|
|
|
|
sb.append(", refundTime=").append(refundTime); |
|
|
|
|
sb.append(", finishTime=").append(finishTime); |
|
|
|
|
sb.append(", updateTime=").append(updateTime); |
|
|
|
|
sb.append(", exceptionStatus=").append(exceptionStatus); |
|
|
|
|
sb.append(", exceptionMsg=").append(exceptionMsg); |
|
|
|
|
sb.append(", ext1=").append(ext1); |
|
|
|
|
sb.append(", ext2=").append(ext2); |
|
|
|
|
sb.append(", ext3=").append(ext3); |
|
|
|
|
sb.append(", serialVersionUID=").append(serialVersionUID); |
|
|
|
|
sb.append("]"); |
|
|
|
|
return sb.toString(); |
|
|
|
|
} |
|
|
|
|
} |