| @@ -304,8 +304,9 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| } | } | ||||
| private List<WxOrderPayVo> toOrderPayVoList(TenantEntity tenantEntity,List<WxOrder> orderList) { | private List<WxOrderPayVo> toOrderPayVoList(TenantEntity tenantEntity,List<WxOrder> orderList) { | ||||
| List<WxOrderPayVo> voList = new ArrayList<WxOrderPayVo>(); | |||||
| if (null == orderList || orderList.size() <= 0 ) { | if (null == orderList || orderList.size() <= 0 ) { | ||||
| return null; | |||||
| return voList; | |||||
| } | } | ||||
| List<Long> bUserIds = new ArrayList<Long>(); | List<Long> bUserIds = new ArrayList<Long>(); | ||||
| @@ -321,7 +322,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| } | } | ||||
| if (bUserIds.size() <= 0 ) { | if (bUserIds.size() <= 0 ) { | ||||
| return null; | |||||
| return voList; | |||||
| } | } | ||||
| Map<Long,WxMerchantBUser> bUserMap = new HashMap<Long,WxMerchantBUser>(); | Map<Long,WxMerchantBUser> bUserMap = new HashMap<Long,WxMerchantBUser>(); | ||||
| @@ -369,8 +370,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| List<WxOrderPayVo> voList = new ArrayList<WxOrderPayVo>(); | |||||
| for (int i = 0 ; i < orderList.size(); i++ ) { | for (int i = 0 ; i < orderList.size(); i++ ) { | ||||
| WxOrder o = orderList.get(i); | WxOrder o = orderList.get(i); | ||||
| WxOrderPayVo vo = new WxOrderPayVo(); | WxOrderPayVo vo = new WxOrderPayVo(); | ||||