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

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

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

@@ -189,7 +189,7 @@ public class EvaluationServiceImpl implements EvaluationService {
 
         QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo("", request.getOrderId(), "", null, LogThreadLocal.getTrackingNo());
         if (orderDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(orderDetailResponse.getCode() + "")
-                || orderDetailResponse.getResult() == null || orderDetailResponse.getResult().getOrderCode() == null) {
+                || orderDetailResponse.getResult() == null || StringUtils.isEmpty(orderDetailResponse.getResult().getOrderCode())) {
             return ResponseUtil.success(ResponseResult.ORDER_NOT_EXIST);
         }