فهرست منبع

订单列表页面,加入律师领域信息

zhangchen 1 ماه پیش
والد
کامیت
1999ea394c

+ 1 - 1
alien-entity/src/main/java/shop/alien/entity/store/LawyerConsultationOrder.java

@@ -65,7 +65,7 @@ public class LawyerConsultationOrder extends Model<LawyerConsultationOrder> {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
 
-    @ApiModelProperty(value = "订单状态, 0:待支付, 1:已支付, 2:进行中, 3:已完成, 4:已取消")
+    @ApiModelProperty(value = "订单状态, 0:待支付, 2:进行中, 3:已完成, 4:已取消")
     @TableField("order_status")
     private Integer orderStatus;
 

+ 1 - 1
alien-entity/src/main/java/shop/alien/entity/store/vo/LawyerConsultationOrderVO.java

@@ -54,7 +54,7 @@ public class LawyerConsultationOrderVO implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
 
-    @ApiModelProperty(value = "订单状态, 0:待支付, 1:已支付, 2:进行中, 3:已完成, 4:已取消")
+    @ApiModelProperty(value = "订单状态, 0:待支付, 2:进行中, 3:已完成, 4:已取消")
     private Integer orderStatus;
 
     @ApiModelProperty(value = "支付状态, 0:未支付, 1:已支付")

+ 5 - 1
alien-store/src/main/java/shop/alien/store/service/impl/LawyerConsultationOrderServiceImpl.java

@@ -20,6 +20,7 @@ import shop.alien.entity.store.LawyerUser;
 import shop.alien.entity.store.dto.LawyerConsultationOrderDto;
 import shop.alien.entity.store.vo.LawyerConsultationOrderVO;
 import shop.alien.mapper.LawyerConsultationOrderMapper;
+import shop.alien.mapper.LawyerExpertiseAreaMapper;
 import shop.alien.mapper.LawyerServiceAreaMapper;
 import shop.alien.mapper.LawyerUserMapper;
 import shop.alien.store.service.LawyerConsultationOrderService;
@@ -48,6 +49,7 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
     private final LawyerUserService lawyerUserService;
     private final LawyerServiceAreaMapper lawyerServiceAreaMapper;
     private final LawyerUserMapper lawyerUserMapper;
+    private final LawyerExpertiseAreaMapper lawyerExpertiseAreaMapper;
 
     @Override
     public R<IPage<LawyerConsultationOrderVO>> getConsultationOrderList(int pageNum, int pageSize, String orderNumber,
@@ -510,8 +512,10 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
             if (lawyerUser != null) {
                 fillLawyerInfo(orderVO, lawyerUser);
             }
+
+
             
-            // 查询律师服务领域
+            // 查询律师问题场景
             List<Integer> lawyerIdList = Collections.singletonList(lawyerUserId);
             Map<String, List<String>> serviceAreaMap = getLawyerServiceArea(lawyerIdList);
             String lawyerUserIdStr = String.valueOf(lawyerUserId);