111

rk

14 小时以前 f27e0eae38502d40a187dedc3710ff4a291b05ed

 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java

@@ -811,7 +811,8 @@
        if(type == 0|| type ==1 || type==2){
            //如果是阶段退款
            Goodsorder goodsorder = goodsorderMapper.selectById(refund.getObjId());
            closeGoodsorderDoneNoRefund(goodsorder,type,refund.getMoney(),refund.getId(),null);
            List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());//打车骑行记录
            closeGoodsorderDoneNoRefund(goodsorder,type,refund.getMoney(),refund.getId(),memberRides);
        }
     }

@@ -1142,7 +1143,7 @@
            model.setRefundNum(Constants.formatIntegerNum(refund.getCountNum()));
            model.setRefundMoney(Constants.translateMoney(Constants.formatDecimalNum(refund.getMoney())));
        }
        model.setClosedMoney(model.getPayMoney().subtract(model.getRefundMoney()).subtract(model.getUnClosedMoney()));
        model.setClosedMoney(model.getPayMoney().add(model.getDiscountMoney()).subtract(model.getRefundMoney()).subtract(model.getUnClosedMoney()));
        return  model;
    }
    @Override