فهرست منبع

[fix]
订单列表中的返利金额,如果为null的话,则显示0

chenchen 1 ماه پیش
والد
کامیت
ab48aeda75

+ 3 - 1
application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourOrderController.java

@@ -165,7 +165,9 @@ public class TourOrderController {
         String orderBy = MyOrderParam.buildOrderBy(orderParam, TourOrder.class);
         List<TourOrder> tourOrderList = tourOrderService.getTourOrderListWithRelation(tourOrderFilter, orderBy);
         for(TourOrder item:tourOrderList){
-            item.setRebateSumPrice(tourOrderService.getTourUserRebate(item.getCreateUserId(),item.getGroupPurchaseProgressId()));
+            item.setRebateSumPrice(tourOrderService.getTourUserRebate(
+                    item.getCreateUserId(),item.getGroupPurchaseProgressId()) == null?
+                    BigDecimal.ZERO:tourOrderService.getTourUserRebate(item.getCreateUserId(),item.getGroupPurchaseProgressId()));
         }
          return ResponseResult.success(MyPageUtil.makeResponseData(tourOrderList, TourOrderVo.class));
     }