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

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

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