修改bug

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

@@ -105,10 +105,10 @@ public class CancelOrderApplicationController extends BaseController {
     /**
      * 根据主键ID查询订单详情
      *
-     * @param orderId
+     * @param id
      * @return R<CancelOrderApplicationDetailVo> 订单详情
      */
-    @ApiOperation("根据订单ID查询订单详情")
+    @ApiOperation("根据主键ID查询订单详情")
     @GetMapping(value = "/getByOrderId")
     public R<CancelOrderApplicationDetailVo> getByOrderId(@RequestParam("id") String id) {
         try {
@@ -141,11 +141,20 @@ public class CancelOrderApplicationController extends BaseController {
                 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.setProjectName(projectNameBuffer.toString().trim());
+                // 设置项目时长
+                vo.setProjectDuration(projectDuration.intValue());
                 // 设置项目金额
                 vo.setProjectPrice(projectPrice);
             }

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

@@ -18,6 +18,11 @@ public class CancelOrderApplicationDetailVo extends TOrder {
     @JsonProperty(index = 0)
     private String id;
 
+    /**
+     * 项目名称
+     */
+     private String projectName;
+
     /**
      * 项目时长
      */
@@ -32,4 +37,9 @@ public class CancelOrderApplicationDetailVo extends TOrder {
      * 项目金额
      */
      private BigDecimal projectPrice;
+
+    /**
+     * 审核备注
+     */
+    private String auditRemark;
 }