Commit 6be20939 by 胡博文

Merge branch 'feature/fix-NPE-bowen'

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