提交 18cde5ad authored 作者: zgy's avatar zgy

定单页面加是否评论的标识

上级 662b8806
......@@ -22,5 +22,7 @@ public interface TbCfItemCommentDao extends BaseDao<TbCfItemCommentEntity> {
List<TbCfItemCommentEntity> queryScore(String itemId);
TbCfItemCommentEntity queryByUser(@Param("itemId") String itemId, @Param("userId") String userId);
}
......@@ -102,6 +102,8 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
@Qualifier("redisTokenManager")
private TokenManager tokenManager;
@Autowired
private TbCfItemCommentDao tbCfItemCommentDao;
@Autowired
private HttpServletRequest request; //自动注入request
......@@ -215,6 +217,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
@Override
public Result getUserOrderList(Integer pageNum, Integer pageSize, Integer orderStatus) throws InterruptedException {
Result<PageInfo<TbCfOrderVo>> result = new Result<>();
boolean isCommented = false;
//获取用户
synchronized (this) {
String token = jwtTokenProvider.resolveToken(request);
......@@ -235,10 +238,16 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
//返回的订单商品详情
List<TbCfCartItemDetailVo> itemDetailVoList = new ArrayList<>();
for (TbCfItemDetailEntity tbCfItemDetail : tbCfItemDetailList) {
//判断商品是否评论过
TbCfItemCommentEntity comment = tbCfItemCommentDao.queryByUser(tbCfItemDetail.getItemId(), tbCfUserInfoVo.getUserId());
if (comment != null) {
isCommented = true;
}
TbCfCartItemDetailVo tbCfCartItemDetailVo = new TbCfCartItemDetailVo();
BeanUtils.copyProperties(tbCfItemDetail, tbCfCartItemDetailVo);
tbCfCartItemDetailVo.setOrdersId(tbCfOrderDao.getOrdersId(orderVo.getOrderId(), tbCfItemDetail.getItemId()));
tbCfCartItemDetailVo.setOrderStatus(tbCfOrderDao.findOrderStatus(tbCfOrderDao.getOrdersId(orderVo.getOrderId(), tbCfItemDetail.getItemId())));
tbCfCartItemDetailVo.setCommented(isCommented);
itemDetailVoList.add(tbCfCartItemDetailVo);
}
orderVo.setItemDetailList(itemDetailVoList);
......@@ -248,7 +257,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
PageInfo<TbCfOrderVo> returnPageInfo = new PageInfo<>();
BeanUtils.copyProperties(pageInfo, returnPageInfo);
returnPageInfo.setList(tbCfOrderVoList);
result.setData(returnPageInfo);
result.setData(returnPageInfo).setMessage(ResultCodeEnum.SUCCESS.getDesc());
}
return result;
}
......
......@@ -110,6 +110,17 @@ public class TbCfCartItemDetailVo implements Serializable {
@ApiModelProperty("订单商品状态")
private Integer orderStatus;
@ApiModelProperty("评论状态")
private boolean isCommented;
public boolean isCommented() {
return isCommented;
}
public void setCommented(boolean commented) {
isCommented = commented;
}
public String getOrdersId() {
return ordersId;
}
......@@ -125,6 +136,7 @@ public class TbCfCartItemDetailVo implements Serializable {
public void setDescripitionName(String descripitionName) {
this.descripitionName = descripitionName;
}
/**
* 设置:商品id
*/
......@@ -138,6 +150,7 @@ public class TbCfCartItemDetailVo implements Serializable {
public String getItemId() {
return itemId;
}
/**
* 设置:来源站点id
*/
......@@ -151,6 +164,7 @@ public class TbCfCartItemDetailVo implements Serializable {
public String getStationId() {
return stationId;
}
/**
* 设置:站点类型
*/
......@@ -164,6 +178,7 @@ public class TbCfCartItemDetailVo implements Serializable {
public Integer getStationType() {
return stationType;
}
/**
* 设置:商品名称
*/
......@@ -177,6 +192,7 @@ public class TbCfCartItemDetailVo implements Serializable {
public String getItemTitle() {
return itemTitle;
}
/**
* 设置:商品数量
*/
......@@ -190,6 +206,7 @@ public class TbCfCartItemDetailVo implements Serializable {
public Integer getItemNum() {
return itemNum;
}
/**
* 设置:商品主图
*/
......@@ -203,6 +220,7 @@ public class TbCfCartItemDetailVo implements Serializable {
public String getItemImg() {
return itemImg;
}
/**
* 设置:商品价格
*/
......@@ -216,6 +234,7 @@ public class TbCfCartItemDetailVo implements Serializable {
public BigDecimal getItemPrice() {
return itemPrice;
}
/**
* 设置:商品分类
*/
......@@ -229,6 +248,7 @@ public class TbCfCartItemDetailVo implements Serializable {
public String getItemCategory() {
return itemCategory;
}
/**
* 设置:商品skus
*/
......@@ -242,6 +262,7 @@ public class TbCfCartItemDetailVo implements Serializable {
public String getItemSku() {
return itemSku;
}
/**
* 设置:所属商铺名
*/
......@@ -255,6 +276,7 @@ public class TbCfCartItemDetailVo implements Serializable {
public String getShopName() {
return shopName;
}
/**
* 设置:所属商铺链接
*/
......
......@@ -5,6 +5,10 @@ server:
tomcat:
uri-encoding: utf-8
spring:
servlet:
multipart:
max-file-size: 300MB
max-request-size: 350MB
# http配置,编码格式utf-8 HttpMessageConverter换为 Gson 速度稍慢但是稳定
# 如果使用了 swagger 那么会有兼容问题 需要在 WebMvcConfig 处理
http:
......@@ -76,7 +80,7 @@ spring:
# 添加过滤规则
url-pattern: /*
# 忽略过滤的格式
exclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
exclusions: '*.js,*.mp4,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
# StatViewServlet配置
stat-view-servlet:
......
......@@ -70,6 +70,26 @@
c.create_time DESC
LIMIT 1
</select>
<select id="queryByUser" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemCommentEntity">
select
`id`,
`user_id`,
`order_id`,
`item_id`,
`type`,
`urls`,
`item_score`,
`service_score`,
`logistics_score`,
`price_score`,
`item_review`,
`like_num`,
`del_flag`,
`create_time`,
`update_time`
from tb_cf_item_comment
WHERE item_id=#{itemId} and user_id=#{userId}
</select>
<select id="queryScore" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemCommentEntity">
select
`id`,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论