Merge branches 'feature/20220105_无单收银支持储值卡_wuping' and 'qa' of…

Merge branches 'feature/20220105_无单收银支持储值卡_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/service/impl/EvaluationServiceImpl.java

@@ -199,7 +199,7 @@ public class EvaluationServiceImpl implements EvaluationService {
         getEvaluationsByOrderIdReq.setPartnerId(request.getPartnerId());
         OrderBaseResp<GetEvaluationsByOrderIdResultDto> evaluationsByOrderId = orderSdkService.getEvaluationsByOrderId(getEvaluationsByOrderIdReq, LogThreadLocal.getTrackingNo());
         CheckAndJoinResponse checkAndJoinMsg;
-        if (evaluationsByOrderId != null && evaluationsByOrderId.getResult() != null && evaluationsByOrderId.getResult().getOrderEvaluations().size() > 0) {
+        if (evaluationsByOrderId != null && evaluationsByOrderId.getResult() != null && CollectionUtils.isNotEmpty(evaluationsByOrderId.getResult().getOrderEvaluations())) {
             // 获取 评价有礼活动
             GetOrderEvaluationDto assortmentOrderEvaluation = evaluationsByOrderId.getResult().getOrderEvaluations().get(0);
             checkAndJoinMsg = getCheckAndJoinMsg(orderDetailResponse.getResult(), request.getSessionId(), assortmentOrderEvaluation.getOrderId(), assortmentOrderEvaluation.getActivityId());