Merge branch 'feature/fix-NPE-bowen' into qa

call-back-service/src/main/java/cn/freemud/service/impl/OrderCallBackServiceImpl.java

@@ -74,7 +74,7 @@ public class OrderCallBackServiceImpl implements OrderCallBackService{
             mqService.sendOrderMQ(requestVo);
         } finally {
             if (lockSucc){
-                ApiLog.infoMessage("紧急方案 orderCode:{} 理论成功lockKey:{}", requestVo.getOrderCode(), requestVo.getRequestId(),lockKey);
+                ApiLog.infoMessage("紧急方案 orderCode:{} 理论成功lockKey:{}", requestVo.getOrderCode(),lockKey);
                 redisLock.unlock(lockKey);
             }
         }

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

@@ -104,8 +104,13 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
             extendInfoRequest.setIsQueryPaid(1);
             BaseResponse<GetMemberExtendInfoResponseDto> extendInfo = customerClient.getMemberExtendInfo(extendInfoRequest);
             OrderExtInfoDto extInfoDTO = JSONObject.parseObject(confirmOrderRequest.getExtInfo(),OrderExtInfoDto.class);
+            if (null == extendInfo.getData()) {
+                extInfoDTO.setMemberLevel("");
+                extInfoDTO.setPaidMember(false);
+            } else {
                 extInfoDTO.setMemberLevel(extendInfo.getData().getMemberGrade() != null ? extendInfo.getData().getMemberGrade().getRuleName(): "");
                 extInfoDTO.setPaidMember(CollectionUtils.isNotEmpty(extendInfo.getData().getMemberPaids()));
+            }
             extInfoDTO.setPayTransId(confirmOrderRequest.getPayTransId());
             extInfoDTO.setPayDate(confirmOrderRequest.getPayDate());
             extInfoDTO.setEndTransId(confirmOrderRequest.getEndTransId());