提交 7d8251b2 authored 作者: luojie's avatar luojie

修改查看订单物流信息

上级 3440d128
...@@ -29,4 +29,5 @@ public interface TbCfItemDetailDao extends BaseDao<TbCfItemDetailEntity> { ...@@ -29,4 +29,5 @@ public interface TbCfItemDetailDao extends BaseDao<TbCfItemDetailEntity> {
* @return * @return
*/ */
int changeItemState(String cartRecordId, Integer checkFlag); int changeItemState(String cartRecordId, Integer checkFlag);
} }
...@@ -51,4 +51,11 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> { ...@@ -51,4 +51,11 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> {
TbCfCouponEntity queryCouponPrice(String toitableId); TbCfCouponEntity queryCouponPrice(String toitableId);
/**
* 根据订单id和商品id查询订单记录id //后续根据此id 查询物流信息
* @param orderId
* @param itemId
* @return
*/
String getOrdersId(String orderId, String itemId);
} }
...@@ -228,6 +228,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -228,6 +228,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
for (TbCfItemDetailEntity tbCfItemDetail : tbCfItemDetailList) { for (TbCfItemDetailEntity tbCfItemDetail : tbCfItemDetailList) {
TbCfCartItemDetailVo tbCfCartItemDetailVo = new TbCfCartItemDetailVo(); TbCfCartItemDetailVo tbCfCartItemDetailVo = new TbCfCartItemDetailVo();
BeanUtils.copyProperties(tbCfItemDetail, tbCfCartItemDetailVo); BeanUtils.copyProperties(tbCfItemDetail, tbCfCartItemDetailVo);
tbCfCartItemDetailVo.setOrdersId(tbCfOrderDao.getOrdersId(orderVo.getOrderId(),tbCfItemDetail.getItemId()));
itemDetailVoList.add(tbCfCartItemDetailVo); itemDetailVoList.add(tbCfCartItemDetailVo);
} }
orderVo.setItemDetailList(itemDetailVoList); orderVo.setItemDetailList(itemDetailVoList);
...@@ -433,6 +434,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -433,6 +434,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
for (TbCfItemDetailEntity tbCfItemDetail : tbCfItemDetailList) { for (TbCfItemDetailEntity tbCfItemDetail : tbCfItemDetailList) {
TbCfCartItemDetailVo tbCfCartItemDetailVo = new TbCfCartItemDetailVo(); TbCfCartItemDetailVo tbCfCartItemDetailVo = new TbCfCartItemDetailVo();
BeanUtils.copyProperties(tbCfItemDetail, tbCfCartItemDetailVo); BeanUtils.copyProperties(tbCfItemDetail, tbCfCartItemDetailVo);
tbCfCartItemDetailVo.setOrdersId(tbCfOrderDao.getOrdersId(orderId,tbCfItemDetail.getItemId()));
itemDetailVoList.add(tbCfCartItemDetailVo); itemDetailVoList.add(tbCfCartItemDetailVo);
} }
tbCfOrderVo.setItemDetailList(itemDetailVoList); tbCfOrderVo.setItemDetailList(itemDetailVoList);
...@@ -657,7 +659,6 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -657,7 +659,6 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
* @return * @return
*/ */
private TbCfOrderVo getGenericOrder(List<TbCfCartItemDetailVo> itemDetailList) { private TbCfOrderVo getGenericOrder(List<TbCfCartItemDetailVo> itemDetailList) {
TbCfOrderVo genericOrder = new TbCfOrderVo(); TbCfOrderVo genericOrder = new TbCfOrderVo();
genericOrder.setItemDetailList(itemDetailList); genericOrder.setItemDetailList(itemDetailList);
//初始商品总价 //初始商品总价
......
...@@ -17,7 +17,11 @@ import java.util.Date; ...@@ -17,7 +17,11 @@ import java.util.Date;
@ApiModel @ApiModel
public class TbCfCartItemDetailVo implements Serializable { public class TbCfCartItemDetailVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 购物车记录id
*/
@ApiModelProperty("订单记录id")
private String ordersId;
/** /**
* 购物车记录id * 购物车记录id
*/ */
...@@ -102,6 +106,14 @@ public class TbCfCartItemDetailVo implements Serializable { ...@@ -102,6 +106,14 @@ public class TbCfCartItemDetailVo implements Serializable {
@ApiModelProperty("商品品名") @ApiModelProperty("商品品名")
private String descripitionName; private String descripitionName;
public String getOrdersId() {
return ordersId;
}
public void setOrdersId(String ordersId) {
this.ordersId = ordersId;
}
public String getDescripitionName() { public String getDescripitionName() {
return descripitionName; return descripitionName;
} }
......
...@@ -19,7 +19,11 @@ import java.util.List; ...@@ -19,7 +19,11 @@ import java.util.List;
@ApiModel @ApiModel
public class TbCfOrderVo implements Serializable { public class TbCfOrderVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 订单id
*/
@ApiModelProperty("订单表id")
private String ordersId;
/** /**
* 订单id * 订单id
*/ */
...@@ -176,6 +180,15 @@ public class TbCfOrderVo implements Serializable { ...@@ -176,6 +180,15 @@ public class TbCfOrderVo implements Serializable {
*/ */
private Integer enableFlag; private Integer enableFlag;
public String getOrdersId() {
return ordersId;
}
public void setOrdersId(String ordersId) {
this.ordersId = ordersId;
}
/** /**
* 设置:订单id * 设置:订单id
*/ */
......
...@@ -81,7 +81,6 @@ ...@@ -81,7 +81,6 @@
AND name LIKE concat('%',#{name},'%') AND name LIKE concat('%',#{name},'%')
</if> </if>
</select> </select>
<insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity"> <insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity">
insert into tb_cf_item_detail( insert into tb_cf_item_detail(
`item_id`, `item_id`,
......
...@@ -255,7 +255,9 @@ ...@@ -255,7 +255,9 @@
<if test="orderStatus != null"> and order_status = #{orderStatus} </if> <if test="orderStatus != null"> and order_status = #{orderStatus} </if>
order by order_time desc order by order_time desc
</select> </select>
<select id="getOrdersId" resultType="String">
select r.order_item_id ordersId from tb_cf_item_order_r r where r.order_id=#{orderId} and r.item_id=#{itemId}
</select>
<!--根据订单id,获取订单内商品详情--> <!--根据订单id,获取订单内商品详情-->
<select id="getOrderItemList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity"> <select id="getOrderItemList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity">
SELECT SELECT
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论