fix null getByVoucherId

app/src/main/java/com/jiejing/fitness/finance/app/controller/axf/StudioAxfOrderController.java

@@ -72,7 +72,9 @@ public class StudioAxfOrderController implements StudioAxfOrderApi {
     List<StudioAxfOrderVO> axfOrderVOS = Lists.newArrayList();
     request.getVoucherIds().forEach(voucherId->{
       StudioAxfOrderVO axfOrderVO = axfService.getByVoucherId(voucherId);
+      if (null != axfOrderVO){
         axfOrderVOS.add(axfOrderVO);
+      }
     });
     return JsonResult.success(axfOrderVOS);
   }

service/src/main/java/com/jiejing/fitness/finance/service/axf/impl/AxfServiceImpl.java

@@ -17,10 +17,28 @@ import com.jiejing.common.utils.crypt.AesUtil;
 import com.jiejing.filecenter.api.resource.vo.ResourceInfoVO;
 import com.jiejing.fitness.enums.delay.DelayTaskCodeEnum;
 import com.jiejing.fitness.enums.finance.PartyTypeEnum;
-import com.jiejing.fitness.finance.api.axf.enums.*;
-import com.jiejing.fitness.finance.api.axf.request.*;
-import com.jiejing.fitness.finance.api.axf.vo.*;
-import com.jiejing.fitness.finance.repository.entity.*;
+import com.jiejing.fitness.finance.api.axf.enums.AxfOrderSignStateEnums;
+import com.jiejing.fitness.finance.api.axf.enums.AxfStateEnums;
+import com.jiejing.fitness.finance.api.axf.request.CreateStudioAxfCommodityRequest;
+import com.jiejing.fitness.finance.api.axf.request.PageStudioAxfApplyRequest;
+import com.jiejing.fitness.finance.api.axf.request.PageStudioAxfOrderRequest;
+import com.jiejing.fitness.finance.api.axf.request.StudioAxfApplyRequest;
+import com.jiejing.fitness.finance.api.axf.vo.AggStudioAxfApplyVO;
+import com.jiejing.fitness.finance.api.axf.vo.AggStudioAxfOrderVO;
+import com.jiejing.fitness.finance.api.axf.vo.StudioAuthTokenVO;
+import com.jiejing.fitness.finance.api.axf.vo.StudioAxfApplyVO;
+import com.jiejing.fitness.finance.api.axf.vo.StudioAxfOrderDeductionVO;
+import com.jiejing.fitness.finance.api.axf.vo.StudioAxfOrderRecoveryVO;
+import com.jiejing.fitness.finance.api.axf.vo.StudioAxfOrderVO;
+import com.jiejing.fitness.finance.repository.entity.PartyToMerchant;
+import com.jiejing.fitness.finance.repository.entity.StudioAxfApply;
+import com.jiejing.fitness.finance.repository.entity.StudioAxfAuth;
+import com.jiejing.fitness.finance.repository.entity.StudioAxfAuthApply;
+import com.jiejing.fitness.finance.repository.entity.StudioAxfCommodityTemplate;
+import com.jiejing.fitness.finance.repository.entity.StudioAxfCommodityTemplateApply;
+import com.jiejing.fitness.finance.repository.entity.StudioAxfOrder;
+import com.jiejing.fitness.finance.repository.entity.StudioAxfOrderDeduction;
+import com.jiejing.fitness.finance.repository.entity.StudioAxfOrderRecovery;
 import com.jiejing.fitness.finance.repository.service.PartyToMerchantRpService;
 import com.jiejing.fitness.finance.repository.service.StudioAxfApplyRpService;
 import com.jiejing.fitness.finance.repository.service.StudioAxfAuthApplyRpService;
@@ -41,8 +59,6 @@ import com.jiejing.fitness.finance.service.utils.DingUtil;
 import com.jiejing.fitness.finance.service.utils.MoneyUtil;
 import com.jiejing.fitness.request.MemberIdRequest;
 import com.jiejing.member.api.member.MemberApi;
-import com.jiejing.member.api.member.request.ListByIdOffsetRequest;
-import com.jiejing.member.api.member.request.ListStudioMemberInfoRequest;
 import com.jiejing.member.api.member.vo.MemberDetailVO;
 import com.jiejing.message.enums.MsgChannelEnum;
 import com.jiejing.message.event.SendCommonMsgEvent;
@@ -50,20 +66,44 @@ import com.jiejing.paycenter.api.merchant.MerchantApi;
 import com.jiejing.paycenter.api.merchant.MerchantQueryApi;
 import com.jiejing.paycenter.api.merchant.StoreApi;
 import com.jiejing.paycenter.api.merchant.StoreQueryApi;
-import com.jiejing.paycenter.api.merchant.request.*;
+import com.jiejing.paycenter.api.merchant.request.ApplyMerchantRequest;
+import com.jiejing.paycenter.api.merchant.request.AuthTokenRequest;
+import com.jiejing.paycenter.api.merchant.request.CancelCommodityOrderRequest;
+import com.jiejing.paycenter.api.merchant.request.CreateCommodityRequest;
+import com.jiejing.paycenter.api.merchant.request.CreateCommodityTemplateRequest;
+import com.jiejing.paycenter.api.merchant.request.GetByMerchantIdRequest;
+import com.jiejing.paycenter.api.merchant.request.GetCommodityByBizIdRequest;
+import com.jiejing.paycenter.api.merchant.request.GetCommodityByThirdCommodityIdRequest;
+import com.jiejing.paycenter.api.merchant.request.ListBankCardRequest;
+import com.jiejing.paycenter.api.merchant.request.MerchantBindCardRequest;
+import com.jiejing.paycenter.api.merchant.request.UploadRequest;
 import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
-import com.jiejing.paycenter.common.enums.merchant.*;
+import com.jiejing.paycenter.common.enums.merchant.CardTypeEnums;
+import com.jiejing.paycenter.common.enums.merchant.CommodityOrderDeductionStateEnums;
+import com.jiejing.paycenter.common.enums.merchant.CycleTypeEnums;
+import com.jiejing.paycenter.common.enums.merchant.GrantTypeEnums;
+import com.jiejing.paycenter.common.enums.merchant.ResourceTypeEnums;
+import com.jiejing.paycenter.common.enums.merchant.SubChannelOpenTypeEnums;
 import com.jiejing.paycenter.common.event.CommodityOrderEvent;
 import com.jiejing.paycenter.common.event.MerchantEvent;
 import com.jiejing.paycenter.common.event.OrderDeductionEvent;
 import com.jiejing.paycenter.common.event.StoreEvent;
-import com.jiejing.paycenter.common.model.request.*;
+import com.jiejing.paycenter.common.model.request.BankCard;
+import com.jiejing.paycenter.common.model.request.CycleCommodityAttr;
 import com.jiejing.paycenter.common.model.request.CycleCommodityAttr.PeriodPrice;
-import com.jiejing.paycenter.common.model.vo.*;
+import com.jiejing.paycenter.common.model.request.ResourceInfo;
+import com.jiejing.paycenter.common.model.vo.ApplyMerchantResultVO;
 import com.jiejing.paycenter.common.model.vo.AuthTokenVO;
 import com.jiejing.paycenter.common.model.vo.BankCardVO;
 import com.jiejing.paycenter.common.model.vo.BindCardVO;
+import com.jiejing.paycenter.common.model.vo.CancelCommodityOrderVO;
+import com.jiejing.paycenter.common.model.vo.CommodityVO;
+import com.jiejing.paycenter.common.model.vo.CreateCommodityTemplateVO;
+import com.jiejing.paycenter.common.model.vo.CreateCommodityVO;
 import com.jiejing.paycenter.common.model.vo.OpenStoreVO;
+import com.jiejing.paycenter.common.model.vo.StoreVO;
+import com.jiejing.paycenter.common.model.vo.SubChannelVO;
+import com.jiejing.paycenter.common.model.vo.UploadVO;
 import com.jiejing.studio.api.admin.vo.AdminVO;
 import com.jiejing.studio.api.admin.vo.BaseAdminVO;
 import com.jiejing.studio.api.studio.vo.StudioVO;
@@ -1074,6 +1114,9 @@ public class AxfServiceImpl implements AxfService {
   @Override
   public StudioAxfOrderVO getByVoucherId(Long voucherId) {
     StudioAxfOrder order = studioAxfOrderRpService.getByVoucherId(voucherId);
+    if (order == null) {
+      return null;
+    }
     return AxfConvert.toVO(order);
   }