修改bug

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/CancelOrderApplicationController.java

@@ -115,8 +115,11 @@ public class CancelOrderApplicationController extends BaseController {
             if (StringUtils.isBlank(id)) {
                 return R.fail("ID不能为空");
             }
-            //通过主键ID查询退单申请
+            //通过主键ID查询退单申请信息
             CancelOrderApplication application = cancelOrderApplicationService.getById(id);
+            if (application == null) {
+                return R.fail("退单申请不存在");
+            }
             String orderId = application.getOrderId();
             TOrder order = orderService.getById(orderId);
             if (order == null) {
@@ -135,31 +138,32 @@ public class CancelOrderApplicationController extends BaseController {
             vo.setJsName(tech.getcName());
             vo.setCNickName(tech.getcNickName());
             vo.setJsPhone(tech.getcPhone());
-            if (application != null) {
-                // 设置服务时长（分钟）
-                vo.setServiceDuration(application.getServiceDuration());
-                JSONArray objects = order.getcGoods();
-                // 遍历商品列表，累加项目金额
-                BigDecimal projectPrice = BigDecimal.ZERO;
-                StringBuffer projectNameBuffer = new StringBuffer();
-                //项目时长
-                BigDecimal projectDuration = new BigDecimal(0);
-                for (int i = 0; i < objects.size(); i++) {
-                    JSONObject object = objects.getJSONObject(i);
-                    BigDecimal price = object.getBigDecimal("dPrice");
-                    projectPrice = projectPrice.add(price);
-                    projectNameBuffer.append(object.getString("cTitle")).append(" ");
-                    projectDuration = projectDuration.add(object.getBigDecimal("nMinute"));
-                }
-                // 设置退单原因
-                vo.setCancelOrderReason(application.getCancelOrderReason());
-                // 设置项目名称
-                vo.setProjectName(projectNameBuffer.toString().trim());
-                // 设置项目时长
-                vo.setProjectDuration(projectDuration.intValue());
-                // 设置项目金额
-                vo.setProjectPrice(projectPrice);
+
+            // 设置服务时长（分钟）
+            vo.setServiceDuration(application.getServiceDuration());
+            JSONArray objects = order.getcGoods();
+            // 遍历商品列表，累加项目金额
+            BigDecimal projectPrice = BigDecimal.ZERO;
+            StringBuffer projectNameBuffer = new StringBuffer();
+            //项目时长
+            BigDecimal projectDuration = new BigDecimal(0);
+            for (int i = 0; i < objects.size(); i++) {
+                JSONObject object = objects.getJSONObject(i);
+                BigDecimal price = object.getBigDecimal("dPrice");
+                projectPrice = projectPrice.add(price);
+                projectNameBuffer.append(object.getString("cTitle")).append(" ");
+                projectDuration = projectDuration.add(object.getBigDecimal("nMinute"));
             }
+            // 设置退单原因
+            vo.setCancelOrderReason(application.getCancelOrderReason());
+            // 设置项目名称
+            vo.setProjectName(projectNameBuffer.toString().trim());
+            // 设置项目时长
+            vo.setProjectDuration(projectDuration.intValue());
+            // 设置项目金额
+            vo.setProjectPrice(projectPrice);
+            // 设置退款金额
+            vo.setRefundAmount(application.getRefundAmount());
             return R.ok(vo);
         } catch (Exception e) {
             e.printStackTrace();

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/CancelOrderApplicationDetailVo.java

@@ -43,6 +43,11 @@ public class CancelOrderApplicationDetailVo extends TOrder {
      */
      private BigDecimal projectPrice;
 
+    /**
+     * 退款金额
+     */
+     private BigDecimal refundAmount;
+
     /**
      * 审核备注
      */