|
@@ -1802,8 +1802,11 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
|
|
|
orderIdsInApplyReturn = cmReturnedPurchaseDao.findOrderIDsInApplyReturnFlag(oId);
|
|
|
}
|
|
|
for (NewOrder order : results) {
|
|
|
+ Double ableUserMoney = 0d;
|
|
|
CmUser user = cmUserDao.get(order.getUserID().toString());
|
|
|
- Double ableUserMoney = user.getAbleUserMoney() == null ? 0d : user.getAbleUserMoney();
|
|
|
+ if (null != user && null != user.getAbleUserMoney()){
|
|
|
+ ableUserMoney = user.getAbleUserMoney();
|
|
|
+ }
|
|
|
order.setAbleUserMoney(ableUserMoney);
|
|
|
if ((orderIds != null && orderIds.contains(order.getOrderID())) || "1".equals(order.getRebateFlag())) {
|
|
|
order.setRebateOrder("1");
|