获得活动信息

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -277,7 +277,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         if(!CollectionUtils.isEmpty(list)) {
 
             for (Order order : list) {
-                price = price.add(order.getOrderPrice());
+                if (order.getOrderPrice() != null) {
+                    price = price.add(order.getOrderPrice());
+                }
             }
         }
         List<CouponVo> couponVos=iCouponService.listUserOrder(bo.getUserId(),0);
@@ -307,7 +309,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         userOrderInFo.setUserLevel(userVo.getUserLevel());
         userOrderInFo.setIntegral(userVo.getIntegral());
         userOrderInFo.setActivityNum(count);
-        userOrderInFo.setStudyNum(getHour(ranKingUser.getHourse()));
+        if (ranKingUser.getHourse()!=null) {
+            userOrderInFo.setStudyNum(getHour(ranKingUser.getHourse()));
+        }
         userOrderInFo.setCourseNum(cousreList.getCourseVoList().size());
         userOrderInFo.setBankNum(bankList.getQuestionBankList().size());
         userOrderInFo.setCollectCourseNum(collectCourseList.size());