1
This commit is contained in:
@@ -163,9 +163,9 @@ public class OrderRow {
|
|||||||
@Column(name = "rid")
|
@Column(name = "rid")
|
||||||
private Long rid;
|
private Long rid;
|
||||||
|
|
||||||
@OneToOne(cascade = CascadeType.ALL)
|
//@OneToOne(cascade = CascadeType.ALL)
|
||||||
@JoinColumn(name = "goods_info_id", referencedColumnName = "id")
|
//@JoinColumn(name = "goods_info_id", referencedColumnName = "id")
|
||||||
private GoodsInfoVO goodsInfo;
|
//private GoodsInfoVO goodsInfo;
|
||||||
|
|
||||||
|
|
||||||
@Column(name = "express_status")
|
@Column(name = "express_status")
|
||||||
@@ -547,13 +547,13 @@ public class OrderRow {
|
|||||||
this.rid = rid;
|
this.rid = rid;
|
||||||
}
|
}
|
||||||
|
|
||||||
public GoodsInfoVO getGoodsInfo() {
|
//public GoodsInfoVO getGoodsInfo() {
|
||||||
return goodsInfo;
|
// return goodsInfo;
|
||||||
}
|
//}
|
||||||
|
//
|
||||||
public void setGoodsInfo(GoodsInfoVO goodsInfo) {
|
//public void setGoodsInfo(GoodsInfoVO goodsInfo) {
|
||||||
this.goodsInfo = goodsInfo;
|
// this.goodsInfo = goodsInfo;
|
||||||
}
|
//}
|
||||||
|
|
||||||
public Integer getExpressStatus() {
|
public Integer getExpressStatus() {
|
||||||
return expressStatus;
|
return expressStatus;
|
||||||
|
|||||||
@@ -109,14 +109,14 @@ public class JDUtils {
|
|||||||
orderRow.setPayMonth(orderRowResp.getPayMonth());
|
orderRow.setPayMonth(orderRowResp.getPayMonth());
|
||||||
orderRow.setSiteId(orderRowResp.getSiteId());
|
orderRow.setSiteId(orderRowResp.getSiteId());
|
||||||
orderRow.setParentId(orderRowResp.getParentId());
|
orderRow.setParentId(orderRowResp.getParentId());
|
||||||
GoodsInfo goodsInfo = orderRowResp.getGoodsInfo();
|
//GoodsInfo goodsInfo = orderRowResp.getGoodsInfo();
|
||||||
GoodsInfoVO goodsInfoVO = new GoodsInfoVO();
|
//GoodsInfoVO goodsInfoVO = new GoodsInfoVO();
|
||||||
goodsInfoVO.setShopId(String.valueOf(goodsInfo.getShopId()));
|
//goodsInfoVO.setShopId(String.valueOf(goodsInfo.getShopId()));
|
||||||
goodsInfoVO.setShopName(goodsInfo.getShopName());
|
//goodsInfoVO.setShopName(goodsInfo.getShopName());
|
||||||
goodsInfoVO.setOwner(goodsInfo.getOwner());
|
//goodsInfoVO.setOwner(goodsInfo.getOwner());
|
||||||
goodsInfoVO.setProductId(String.valueOf(goodsInfo.getProductId()));
|
//goodsInfoVO.setProductId(String.valueOf(goodsInfo.getProductId()));
|
||||||
goodsInfoVO.setImageUrl(goodsInfo.getImageUrl());
|
//goodsInfoVO.setImageUrl(goodsInfo.getImageUrl());
|
||||||
orderRow.setGoodsInfo(goodsInfoVO);
|
//orderRow.setGoodsInfo(goodsInfoVO);
|
||||||
orderRow.setCallerItemId(orderRowResp.getCallerItemId());
|
orderRow.setCallerItemId(orderRowResp.getCallerItemId());
|
||||||
orderRow.setPid(orderRowResp.getPid());
|
orderRow.setPid(orderRowResp.getPid());
|
||||||
orderRow.setCid1(orderRowResp.getCid1());
|
orderRow.setCid1(orderRowResp.getCid1());
|
||||||
|
|||||||
Reference in New Issue
Block a user