Commit 45091588 by zhiwj

修改bug

parent e149af5e
......@@ -94,6 +94,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
List<OrderGoodsDTO> dtoList = EntityUtil.changeEntityListByJSON(OrderGoodsDTO.class, orderListDetailDTO.getOrderItemList());
evaluateDTO.setGoodsInfo(JSON.toJSONString(dtoList));
StoreDTO storeDTO = storeApiService.getStoreById(evaluateDTO.getEnterpriseId(), Integer.valueOf(orderListDetailDTO.getOrderDTO().getStoreIdOffline())).getResult();
evaluateDTO.setStoreId(storeDTO.getStoreId());
evaluateDTO.setStoreName(storeDTO.getStoreName());
evaluateDTO.setStoreCode(storeDTO.getStoreCode());
......@@ -219,7 +220,6 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
// }
TabEvaluate evaluate = this.evaluateService.getEvaluate(memberReplyDTO.getEnterpriseId(), memberReplyDTO.getEvaluateId());
if (overLimitTime(evaluateOrderConfig, evaluate.getReceiptsDate())) {
return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "已超越评价期限,无法评价");
}
// 是否超过次数
List<TabEvaluateReply> replyList = this.evaluateReplyService.listEvaluateReply(memberReplyDTO.getEnterpriseId(), memberReplyDTO.getEvaluateId(), Constants.OPEN);
......@@ -372,7 +372,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
} else {
// 是否追评超过次数
List<TabEvaluateReply> replyList = this.evaluateReplyService.listEvaluateReply(evaluate.getEnterpriseId(), evaluate.getEvaluateId(), Constants.OPEN);
if (CollectionUtils.isNotEmpty(replyList) && evaluateOrderConfig.getReviewTimes() < this.evaluateReplyService.countReviewReplyByMember(enterpriseId, evaluate.getEvaluateId())) {
if (CollectionUtils.isNotEmpty(replyList) && evaluateOrderConfig.getReviewTimes() <= this.evaluateReplyService.countReviewReplyByMember(enterpriseId, evaluate.getEvaluateId())) {
// 追评超过次数
resultMap.put(statusQO.getOrderId(), OrderReplyEnum.REPLY_OVER_MAX_TIMES.getCode());
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment