修改了根据订单ID查询后台订单详情接口的bug

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

@@ -364,6 +364,7 @@ public class WeChatController extends BaseController {
             user = new TWxUser();
             user.setcOpenid(openid);
             user.setcNickName(jsonObject.get("nickname").toString());
+            user.setSex((Integer) jsonObject.get("sex"));
             user.setcIcon(jsonObject.get("headimgurl").toString());
             user.setcSessionKey(refreshToken);
             wxUserService.saveOrUpdate(user);

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TWxUser.java

@@ -84,6 +84,12 @@ public class TWxUser implements Serializable {
     @ApiModelProperty("昵称")
     private String cNickName;
 
+    /**
+     * 性别(0女1男)
+     */
+    @ApiModelProperty("性别(0女1男)")
+    private Integer sex;
+
     /**
      * 密码
      */

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

@@ -95,6 +95,10 @@ public class AdminOrderDetailVO {
         private String projectName;
         @ApiModelProperty("项目封面")
         private String projectCover;
+
+        /**
+         * 计量单位(0:分钟 1:小时 2:次）
+         */
         @ApiModelProperty("计费单位")
         private Integer unitType;
         @ApiModelProperty("计费单位名称")

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

@@ -195,4 +195,14 @@ public class AdminOrderPageVO {
      * 商户经度
      */
     private BigDecimal merchantLongitude;
+
+    /**
+     * 用户性别(0女1男)
+     */
+    private Integer sex;
+
+    /**
+     * 服务时间
+     */
+    private LocalDateTime startTime;
 }

nightFragrance-massage/src/main/java/com/ylx/order/service/impl/AdminOrderServiceImpl.java

@@ -539,12 +539,12 @@ public class AdminOrderServiceImpl implements AdminOrderService {
             return "";
         }
         switch (unitType) {
+            case 0:
+                return "分钟";
             case 1:
-                return "次";
-            case 2:
                 return "小时";
-            case 3:
-                return "分钟";
+            case 2:
+                return "次";
             default:
                 return String.valueOf(unitType);
         }

nightFragrance-massage/src/main/resources/mapper/order/AdminOrderMapper.xml

@@ -27,7 +27,9 @@
             p.category_id AS categoryId,
             sc.name AS categoryName,
             o.merchant_latitude as merchantLatitude,
-            o.merchant_longitude as merchantLongitude
+            o.merchant_longitude as merchantLongitude,
+            u.sex as sex,
+            o.start_time as startTime
         FROM t_order o
         LEFT JOIN t_wx_user u ON u.id = CAST(o.user_id AS CHAR) AND u.is_delete = 0
         LEFT JOIN ma_technician mt ON mt.id = o.merchant_id AND mt.is_delete = 0