二手家电回收
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
2025-04-22 4b2c48677c2b5de7f89ff0d018a55b7916467b27 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java


@@ -321,7 +321,7 @@


        withdrawDetailVO.setServeId(order.getServeId());


        withdrawDetailVO.setServeName(order.getServeName());


        withdrawDetailVO.setServePrice(order.getServePrice());


        withdrawDetailVO.setOrderMoney(order.getOrderMoney());


        withdrawDetailVO.setOrderMoney(order.getSubsidy()!=null?order.getSubsidy().add(order.getOrderMoney()):order.getOrderMoney());


        withdrawDetailVO.setReservationName(order.getReservationName());


        withdrawDetailVO.setReservationPhone(order.getReservationPhone());


        withdrawDetailVO.setReservationAddress(order.getReservationAddress());


@@ -340,6 +340,7 @@


            withdrawDetailVO.setWithdrawalState(withdraw.getState());


            withdrawDetailVO.setWithdrawalTime(withdraw.getCreateTime());


        }


        withdrawDetailVO.setPackageInfo(order.getPackageInfo());


        withdrawDetailVO.setAddress(order.getAddress());


        if (null != serveRecord) {


            withdrawDetailVO.setPhoto(serveRecord.getPhoto());