Skip to content

W
wecloud_im_server
Commit b9a24601 by lpx
Options

# 商家端获取行程列表接口国际化需求

parent 209773ca
Showing with 24 additions and 63 deletions
common/src/main/java/com/jumeirah/common/entity/Stroke.java
...@@ -130,18 +130,6 @@ public class Stroke extends BaseEntity { ...@@ -130,18 +130,6 @@ public class Stroke extends BaseEntity {
@ApiModelProperty("到达机场名称") @ApiModelProperty("到达机场名称")
private String arriveAirportName; private String arriveAirportName;
@NotNull(message = "返程飞机型号ID为空")
@ApiModelProperty("返程飞机型号ID")
private Long arrivePlainTypeId;
@NotBlank(message = "返程出发机场名称不能为空")
@ApiModelProperty("返程出发机场名称")
private String backOutsetAirportName;
@NotBlank(message = "返程到达机场名称不能为空")
@ApiModelProperty("返程到达机场名称")
private String backArriveAirportName;
@NotNull(message = "商家id不能为空") @NotNull(message = "商家id不能为空")
@ApiModelProperty("商家id") @ApiModelProperty("商家id")
private Long mcId; private Long mcId;
......
common/src/main/java/com/jumeirah/common/service/impl/StrokeServiceImpl.java
...@@ -2,7 +2,6 @@ package com.jumeirah.common.service.impl; ...@@ -2,7 +2,6 @@ package com.jumeirah.common.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jumeirah.common.entity.Stroke; import com.jumeirah.common.entity.Stroke;
import com.jumeirah.common.enums.StrokeStatusEnum; import com.jumeirah.common.enums.StrokeStatusEnum;
...@@ -99,7 +98,7 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp ...@@ -99,7 +98,7 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp
@Override @Override
public Paging<StrokeQueryVo> getStrokePageList(StrokePageParam strokePageParam, String language) throws Exception { public Paging<StrokeQueryVo> getStrokePageList(StrokePageParam strokePageParam, String language) throws Exception {
// Page<StrokeQueryVo> page = new PageInfo<>(strokePageParam, OrderItem.asc(getLambdaColumn(Stroke::getCreateTime))); // Page<StrokeQueryVo> page = new PageInfo<>(strokePageParam, OrderItem.asc(getLambdaColumn(Stroke::getCreateTime)));
Page<StrokeQueryVo> page = new PageInfo<>(strokePageParam, OrderItem.desc("s.create_time")); Page<StrokeQueryVo> page = new PageInfo<>(strokePageParam);
JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal(); JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
// 查询已完成 需要额外查询已取消状态 // 查询已完成 需要额外查询已取消状态
if (strokePageParam.getStatus().equals(StrokeStatusEnum.COMPLETED.getCode())) { if (strokePageParam.getStatus().equals(StrokeStatusEnum.COMPLETED.getCode())) {
......
common/src/main/java/com/jumeirah/common/vo/StrokeDetailVo.java
...@@ -130,7 +130,6 @@ public class StrokeDetailVo implements Serializable { ...@@ -130,7 +130,6 @@ public class StrokeDetailVo implements Serializable {
@ApiModelProperty("用户选择机型") @ApiModelProperty("用户选择机型")
private Long choosePlainType; private Long choosePlainType;
@NotBlank(message = "出发机场名称不能为空") @NotBlank(message = "出发机场名称不能为空")
@ApiModelProperty("出发机场名称") @ApiModelProperty("出发机场名称")
private String outsetAirportName; private String outsetAirportName;
...@@ -139,18 +138,6 @@ public class StrokeDetailVo implements Serializable { ...@@ -139,18 +138,6 @@ public class StrokeDetailVo implements Serializable {
@ApiModelProperty("到达机场名称") @ApiModelProperty("到达机场名称")
private String arriveAirportName; private String arriveAirportName;
@NotNull(message = "返程飞机型号ID为空")
@ApiModelProperty("返程飞机型号ID")
private Long arrivePlainTypeId;
@NotBlank(message = "返程出发机场名称不能为空")
@ApiModelProperty("返程出发机场名称")
private String backOutsetAirportName;
@NotBlank(message = "返程到达机场名称不能为空")
@ApiModelProperty("返程到达机场名称")
private String backArriveAirportName;
@ApiModelProperty("商家名称") @ApiModelProperty("商家名称")
private String merchantName; private String merchantName;
......
common/src/main/java/com/jumeirah/common/vo/StrokeQueryVo.java
...@@ -37,6 +37,9 @@ public class StrokeQueryVo implements Serializable { ...@@ -37,6 +37,9 @@ public class StrokeQueryVo implements Serializable {
@ApiModelProperty("到达城市名称") @ApiModelProperty("到达城市名称")
private String cityArriveName; private String cityArriveName;
@ApiModelProperty("飞机型号名称")
private String plainTypeName;
@ApiModelProperty("出发时间") @ApiModelProperty("出发时间")
private Timestamp outsetTime; private Timestamp outsetTime;
...@@ -66,18 +69,6 @@ public class StrokeQueryVo implements Serializable { ...@@ -66,18 +69,6 @@ public class StrokeQueryVo implements Serializable {
@ApiModelProperty("到达机场名称") @ApiModelProperty("到达机场名称")
private String arriveAirportName; private String arriveAirportName;
@NotNull(message = "返程飞机型号ID为空")
@ApiModelProperty("返程飞机型号ID")
private Long arrivePlainTypeId;
// @NotBlank(message = "返程出发机场名称不能为空")
// @ApiModelProperty("返程出发机场名称")
// private String backOutsetAirportName;
//
// @NotBlank(message = "返程到达机场名称不能为空")
// @ApiModelProperty("返程到达机场名称")
// private String backArriveAirportName;
@NotNull(message = "付款状态不能为空") @NotNull(message = "付款状态不能为空")
@ApiModelProperty("付款状态，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款") @ApiModelProperty("付款状态，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款")
private Integer paymentStatus; private Integer paymentStatus;
......
common/src/main/resources/mapper/StrokeMapper.xml
...@@ -6,24 +6,23 @@ ...@@ -6,24 +6,23 @@
<sql id="Page_Column_List"> <sql id="Page_Column_List">
s.id, s.id,
mu.id as merchantId, mu.id as merchantId,
city_outset_id, s.city_outset_id,
city_arrive_id, s.city_arrive_id,
people_num, s.people_num,
plain_type_id, s.plain_type_id,
outset_time, s.outset_time,
return_time, s.return_time,
type, s.type,
STATUS, s.status,
money, s.money,
user_id, s.user_id,
mu.username AS merchantName, mu.username AS merchantName,
arrive_plain_type_id, s.payment_status,
payment_status, s.audit_status,
audit_status, s.user_recharge_bank,
user_recharge_bank, s.user_recharge_name,
user_recharge_name, s.is_discount,
is_discount, s.user_recharge_bank_number
user_recharge_bank_number
</sql> </sql>
...@@ -53,7 +52,6 @@ ...@@ -53,7 +52,6 @@
user_id, user_id,
outset_airport_name, outset_airport_name,
arrive_airport_name, arrive_airport_name,
arrive_plain_type_id,
payment_status,audit_status, payment_status,audit_status,
user_recharge_money, user_recharge_money,
user_recharge_bank, user_recharge_bank,
...@@ -86,11 +84,13 @@ ...@@ -86,11 +84,13 @@
ctca.airport_name_cn as arrive_airport_name, ctca.airport_name_cn as arrive_airport_name,
</otherwise> </otherwise>
</choose> </choose>
pt.name as plain_type_name,
<include refid="Page_Column_List"/> <include refid="Page_Column_List"/>
from stroke s from stroke s
INNER JOIN merchant_user mu ON mu.id = s.mc_id INNER JOIN merchant_user mu ON mu.id = s.mc_id
INNER JOIN city_three_code ctco ON ctco.id = s.city_outset_id INNER JOIN city_three_code ctco ON ctco.id = s.city_outset_id
INNER JOIN city_three_code ctca ON ctca.id = s.city_arrive_id INNER JOIN city_three_code ctca ON ctca.id = s.city_arrive_id
INNER JOIN plain_type pt ON pt.id = s.plain_type_id
<where> <where>
and s.user_id = #{userId} and s.user_id = #{userId}
and s.deleted = 0 and s.deleted = 0
...@@ -121,11 +121,13 @@ ...@@ -121,11 +121,13 @@
ctca.airport_name_cn as arrive_airport_name, ctca.airport_name_cn as arrive_airport_name,
</otherwise> </otherwise>
</choose> </choose>
pt.name as plain_type_name,
<include refid="Page_Column_List"/> <include refid="Page_Column_List"/>
from stroke s from stroke s
INNER JOIN merchant_user mu ON mu.id = s.mc_id INNER JOIN merchant_user mu ON mu.id = s.mc_id
INNER JOIN city_three_code ctco ON ctco.id = s.city_outset_id INNER JOIN city_three_code ctco ON ctco.id = s.city_outset_id
INNER JOIN city_three_code ctca ON ctca.id = s.city_arrive_id INNER JOIN city_three_code ctca ON ctca.id = s.city_arrive_id
INNER JOIN plain_type pt ON pt.id = s.plain_type_id
<where> <where>
and s.user_id = #{userId} and s.user_id = #{userId}
and s.deleted = 0 and s.deleted = 0
...@@ -158,7 +160,6 @@ ...@@ -158,7 +160,6 @@
s.remarks, s.remarks,
s.money, s.money,
s.user_id, s.user_id,
s.arrive_plain_type_id,
s.choose_plain_type, s.choose_plain_type,
s.payment_status, s.payment_status,
s.audit_status, s.audit_status,
...@@ -274,9 +275,6 @@ ...@@ -274,9 +275,6 @@
s.remarks, s.remarks,
s.money, s.money,
s.user_id, s.user_id,
s.arrive_plain_type_id,
s.back_outset_airport_name,
s.back_arrive_airport_name,
s.payment_status, s.payment_status,
s.audit_status, s.audit_status,
s.user_recharge_money, s.user_recharge_money,
......
customer-service/src/main/java/com/ym/im/entity/Stroke.java
...@@ -24,8 +24,6 @@ public class Stroke implements Serializable { ...@@ -24,8 +24,6 @@ public class Stroke implements Serializable {
private Long mcId; private Long mcId;
private String outsetAirportName;//出发机场名称 private String outsetAirportName;//出发机场名称
private String arriveAirportName;//到达机场名称 private String arriveAirportName;//到达机场名称
private String backOutsetAirportName;//返程出发机场名称
private String backArriveAirportName;//返程到达机场名称
private boolean isDiscount;//是否是优惠调机 private boolean isDiscount;//是否是优惠调机
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment