Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'master' of…

Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

@@ -372,6 +372,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
         List<ScoreRecordVo> result = new ArrayList<>();
         List<OrderInfoReqs> list = userorderResponse.getResult().getItemList();
         list.forEach(order -> {
+            if (order != null){
                 ScoreRecordVo responseVo = new ScoreRecordVo();
                 responseVo.setOrderCode(order.getOrderCode());
                 responseVo.setOrderStatus(order.getOrderState());
@@ -400,6 +401,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
                     responseVo.setAddressDetail(deliveryContactInfoResp.getAddressDetail());
                 }
                 result.add(responseVo);
+            }
         });
         PageInfo<ScoreRecordVo> pageInfo = new PageInfo<>();
         pageInfo.setList(result);