diff --git a/src/main/java/cn/van/business/model/jd/OrderRow.java b/src/main/java/cn/van/business/model/jd/OrderRow.java index 26474fa..9d6bde0 100644 --- a/src/main/java/cn/van/business/model/jd/OrderRow.java +++ b/src/main/java/cn/van/business/model/jd/OrderRow.java @@ -163,9 +163,9 @@ public class OrderRow { @Column(name = "rid") private Long rid; - @OneToOne(cascade = CascadeType.ALL) - @JoinColumn(name = "goods_info_id", referencedColumnName = "id") - private GoodsInfoVO goodsInfo; + //@OneToOne(cascade = CascadeType.ALL) + //@JoinColumn(name = "goods_info_id", referencedColumnName = "id") + //private GoodsInfoVO goodsInfo; @Column(name = "express_status") @@ -547,13 +547,13 @@ public class OrderRow { this.rid = rid; } - public GoodsInfoVO getGoodsInfo() { - return goodsInfo; - } - - public void setGoodsInfo(GoodsInfoVO goodsInfo) { - this.goodsInfo = goodsInfo; - } + //public GoodsInfoVO getGoodsInfo() { + // return goodsInfo; + //} + // + //public void setGoodsInfo(GoodsInfoVO goodsInfo) { + // this.goodsInfo = goodsInfo; + //} public Integer getExpressStatus() { return expressStatus; diff --git a/src/main/java/cn/van/business/util/JDUtils.java b/src/main/java/cn/van/business/util/JDUtils.java index a1d03c2..ca91c87 100644 --- a/src/main/java/cn/van/business/util/JDUtils.java +++ b/src/main/java/cn/van/business/util/JDUtils.java @@ -109,14 +109,14 @@ public class JDUtils { orderRow.setPayMonth(orderRowResp.getPayMonth()); orderRow.setSiteId(orderRowResp.getSiteId()); orderRow.setParentId(orderRowResp.getParentId()); - GoodsInfo goodsInfo = orderRowResp.getGoodsInfo(); - GoodsInfoVO goodsInfoVO = new GoodsInfoVO(); - goodsInfoVO.setShopId(String.valueOf(goodsInfo.getShopId())); - goodsInfoVO.setShopName(goodsInfo.getShopName()); - goodsInfoVO.setOwner(goodsInfo.getOwner()); - goodsInfoVO.setProductId(String.valueOf(goodsInfo.getProductId())); - goodsInfoVO.setImageUrl(goodsInfo.getImageUrl()); - orderRow.setGoodsInfo(goodsInfoVO); + //GoodsInfo goodsInfo = orderRowResp.getGoodsInfo(); + //GoodsInfoVO goodsInfoVO = new GoodsInfoVO(); + //goodsInfoVO.setShopId(String.valueOf(goodsInfo.getShopId())); + //goodsInfoVO.setShopName(goodsInfo.getShopName()); + //goodsInfoVO.setOwner(goodsInfo.getOwner()); + //goodsInfoVO.setProductId(String.valueOf(goodsInfo.getProductId())); + //goodsInfoVO.setImageUrl(goodsInfo.getImageUrl()); + //orderRow.setGoodsInfo(goodsInfoVO); orderRow.setCallerItemId(orderRowResp.getCallerItemId()); orderRow.setPid(orderRowResp.getPid()); orderRow.setCid1(orderRowResp.getCid1());