Skip to content

S
SiEn
Commit 7bb07ab0 by giaogiao
Options

Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into future/sys/userLogin

parents 7d27469a 1e3126cb
Showing with 77 additions and 60 deletions
api-app/src/main/java/com/jumeirah/api/app/controller/StrokeController.java
...@@ -160,7 +160,7 @@ public class StrokeController extends BaseController { ...@@ -160,7 +160,7 @@ public class StrokeController extends BaseController {
JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal(); JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
StrokeDiscountQueryVo strokeDiscountQueryVo = strokeDiscountService.getStrokeDiscountById(strokeDiscountParam.getSdId()); StrokeDiscountQueryVo strokeDiscountQueryVo = strokeDiscountService.getStrokeDiscountById(strokeDiscountParam.getSdId());
Stroke stroke = new Stroke(); Stroke stroke = new Stroke();
stroke.setType(StrokeTypeEnum.PREFERENTIAL_TUNING.getCode()) stroke.setType(strokeDiscountQueryVo.getType())
.setCityOutsetId(strokeDiscountQueryVo.getCityOutsetId()) .setCityOutsetId(strokeDiscountQueryVo.getCityOutsetId())
.setCityArriveId(strokeDiscountQueryVo.getCityArriveId()) .setCityArriveId(strokeDiscountQueryVo.getCityArriveId())
.setPeopleNum(strokeDiscountParam.getPeopleNum()) .setPeopleNum(strokeDiscountParam.getPeopleNum())
...@@ -168,6 +168,7 @@ public class StrokeController extends BaseController { ...@@ -168,6 +168,7 @@ public class StrokeController extends BaseController {
.setOutsetTime(strokeDiscountParam.getOutsetTime()) .setOutsetTime(strokeDiscountParam.getOutsetTime())
.setMoney(strokeDiscountQueryVo.getMoney()) .setMoney(strokeDiscountQueryVo.getMoney())
.setMcId(strokeDiscountQueryVo.getMcId()) .setMcId(strokeDiscountQueryVo.getMcId())
.setIsDiscount(true)
.setUserId(jwtToken.getUserId()); .setUserId(jwtToken.getUserId());
boolean flag = strokeService.saveStroke(stroke); boolean flag = strokeService.saveStroke(stroke);
return ApiResult.result(flag); return ApiResult.result(flag);
......
api-merchant/src/main/java/com/jumeirah/api/merchant/entity/param/McStrokeDiscountAddParam.java
...@@ -45,4 +45,8 @@ public class McStrokeDiscountAddParam extends BaseEntity { ...@@ -45,4 +45,8 @@ public class McStrokeDiscountAddParam extends BaseEntity {
@ApiModelProperty("价格") @ApiModelProperty("价格")
private BigDecimal money; private BigDecimal money;
@NotNull(message = "行程类型不能为空")
@ApiModelProperty("行程类型，0-单程，1-往返行程，2-货运，3-医疗")
private Integer type;
} }
common/src/main/java/com/jumeirah/common/entity/Stroke.java
...@@ -67,7 +67,7 @@ public class Stroke extends BaseEntity { ...@@ -67,7 +67,7 @@ public class Stroke extends BaseEntity {
private Timestamp returnTime; private Timestamp returnTime;
@NotNull(message = "行程类型，0-单程，1-往返行程，2-货运，3-医疗不能为空") @NotNull(message = "行程类型，0-单程，1-往返行程，2-货运，3-医疗不能为空")
@ApiModelProperty("行程类型，0-单程，1-往返行程，2-货运，3-医疗，4-优惠调机") @ApiModelProperty("行程类型，0-单程，1-往返行程，2-货运，3-医疗")
private Integer type; private Integer type;
@NotNull(message = "状态，0-审核中，1-进行中，2-已完成，99-取消不能为空") @NotNull(message = "状态，0-审核中，1-进行中，2-已完成，99-取消不能为空")
...@@ -171,4 +171,8 @@ public class Stroke extends BaseEntity { ...@@ -171,4 +171,8 @@ public class Stroke extends BaseEntity {
@ApiModelProperty("用户充值截图证据, 传入数组") @ApiModelProperty("用户充值截图证据, 传入数组")
private String userRechargeCredentialsUrl; private String userRechargeCredentialsUrl;
@NotBlank(message = "是否是优惠调机不能为空")
@ApiModelProperty("是否是优惠调机，0-否，1-是")
private Boolean isDiscount;
} }
common/src/main/java/com/jumeirah/common/enums/StrokeTypeEnum.java
...@@ -15,7 +15,6 @@ public enum StrokeTypeEnum implements BaseEnum { ...@@ -15,7 +15,6 @@ public enum StrokeTypeEnum implements BaseEnum {
ROUND_TRIP(1, "往返"), ROUND_TRIP(1, "往返"),
CARGO_FLIGHT(2, "货运"), CARGO_FLIGHT(2, "货运"),
MEDICAL_FLIGHT(3, "医疗"), MEDICAL_FLIGHT(3, "医疗"),
PREFERENTIAL_TUNING(4, "优惠调机"),
; ;
/** /**
......
common/src/main/java/com/jumeirah/common/param/McStrokePageParam.java
...@@ -22,7 +22,7 @@ import lombok.experimental.Accessors; ...@@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
public class McStrokePageParam extends BasePageOrderParam { public class McStrokePageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("行程类型，-1-全部，0-单程，1-往返行程，2-货运，3-医疗，4-优惠调机") @ApiModelProperty("行程类型，-1-全部，0-单程，1-往返行程，2-货运，3-医疗")
private Integer type; private Integer type;
@ApiModelProperty("主键id") @ApiModelProperty("主键id")
......
common/src/main/java/com/jumeirah/common/vo/StrokeDiscountQueryVo.java
...@@ -70,4 +70,7 @@ public class StrokeDiscountQueryVo implements Serializable { ...@@ -70,4 +70,7 @@ public class StrokeDiscountQueryVo implements Serializable {
@ApiModelProperty("商家ID") @ApiModelProperty("商家ID")
private Long mcId; private Long mcId;
@ApiModelProperty("行程类型，0-单程，1-往返行程，2-货运，3-医疗")
private Integer type;
} }
common/src/main/java/com/jumeirah/common/vo/StrokeQueryVo.java
...@@ -23,78 +23,82 @@ import java.sql.Timestamp; ...@@ -23,78 +23,82 @@ import java.sql.Timestamp;
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "StrokeQueryVo对象") @ApiModel(value = "StrokeQueryVo对象")
public class StrokeQueryVo implements Serializable { public class StrokeQueryVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("主键ID") @ApiModelProperty("主键ID")
private Long id; private Long id;
@ApiModelProperty("商家ID") @ApiModelProperty("商家ID")
private Long merchantId; private Long merchantId;
@ApiModelProperty("出发城市名称") @ApiModelProperty("出发城市名称")
private String cityOutsetName; private String cityOutsetName;
@ApiModelProperty("到达城市名称") @ApiModelProperty("到达城市名称")
private String cityArriveName; private String cityArriveName;
@ApiModelProperty("出发时间") @ApiModelProperty("出发时间")
private Timestamp outsetTime; private Timestamp outsetTime;
@ApiModelProperty("返程时间") @ApiModelProperty("返程时间")
private Timestamp returnTime; private Timestamp returnTime;
@ApiModelProperty("行程类型，0-单程，1-往返行程，2-货运，3-医疗") @ApiModelProperty("行程类型，0-单程，1-往返行程，2-货运，3-医疗")
private Integer type; private Integer type;
@ApiModelProperty("付款状态，0-未付款，1-用户已付款,待审核，2-用户已付款,审核通过，3-退款中，99-已退款") @ApiModelProperty("付款状态，0-未付款，1-用户已付款,待审核，2-用户已付款,审核通过，3-退款中，99-已退款")
private Integer status; private Integer status;
@ApiModelProperty("价格") @ApiModelProperty("价格")
private BigDecimal money; private BigDecimal money;
@ApiModelProperty("用户ID") @ApiModelProperty("用户ID")
private Long userId; private Long userId;
@ApiModelProperty("商家名称") @ApiModelProperty("商家名称")
private String merchantName; private String merchantName;
@NotBlank(message = "出发机场名称不能为空") @NotBlank(message = "出发机场名称不能为空")
@ApiModelProperty("出发机场名称") @ApiModelProperty("出发机场名称")
private String outsetAirportName; private String outsetAirportName;
@NotBlank(message = "到达机场名称不能为空") @NotBlank(message = "到达机场名称不能为空")
@ApiModelProperty("到达机场名称") @ApiModelProperty("到达机场名称")
private String arriveAirportName; private String arriveAirportName;
@NotNull(message = "返程飞机型号ID为空") @NotNull(message = "返程飞机型号ID为空")
@ApiModelProperty("返程飞机型号ID") @ApiModelProperty("返程飞机型号ID")
private Long arrivePlainTypeId; private Long arrivePlainTypeId;
@NotBlank(message = "返程出发机场名称不能为空") @NotBlank(message = "返程出发机场名称不能为空")
@ApiModelProperty("返程出发机场名称") @ApiModelProperty("返程出发机场名称")
private String backOutsetAirportName; private String backOutsetAirportName;
@NotBlank(message = "返程到达机场名称不能为空") @NotBlank(message = "返程到达机场名称不能为空")
@ApiModelProperty("返程到达机场名称") @ApiModelProperty("返程到达机场名称")
private String backArriveAirportName; 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;
@NotNull(message = "审核状态不能为空") @NotNull(message = "审核状态不能为空")
@ApiModelProperty("审核状态,0审核中,1审核通过,2审核未通过") @ApiModelProperty("审核状态,0审核中,1审核通过,2审核未通过")
private Integer auditStatus; private Integer auditStatus;
@NotBlank(message = "商家开户银行不能为空") @NotBlank(message = "商家开户银行不能为空")
@ApiModelProperty("商家开户银行") @ApiModelProperty("商家开户银行")
private String rechargeBank; private String rechargeBank;
@NotBlank(message = "商家开户名称不能为空") @NotBlank(message = "商家开户名称不能为空")
@ApiModelProperty("商家开户名称") @ApiModelProperty("商家开户名称")
private String rechargeName; private String rechargeName;
@NotBlank(message = "商家银行卡号") @NotBlank(message = "商家银行卡号")
@ApiModelProperty("商家银行卡号") @ApiModelProperty("商家银行卡号")
private String rechargeBankNumber; private String rechargeBankNumber;
}
\ No newline at end of file @NotBlank(message = "是否是优惠调机不能为空")
@ApiModelProperty("是否是优惠调机，0-否，1-是")
private Boolean isDiscount;
}
common/src/main/resources/mapper/StrokeDiscountMapper.xml
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
update_time, update_time,
remarks, remarks,
money, money,
mc_id mc_id,
type
</sql> </sql>
<select id="getStrokeDiscountById" resultType="com.jumeirah.common.vo.StrokeDiscountQueryVo"> <select id="getStrokeDiscountById" resultType="com.jumeirah.common.vo.StrokeDiscountQueryVo">
......
common/src/main/resources/mapper/StrokeMapper.xml
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
audit_status, audit_status,
user_recharge_bank, user_recharge_bank,
user_recharge_name, user_recharge_name,
is_discount,
user_recharge_bank_number user_recharge_bank_number
</sql> </sql>
...@@ -62,6 +63,7 @@ ...@@ -62,6 +63,7 @@
user_recharge_bank, user_recharge_bank,
user_recharge_name, user_recharge_name,
user_recharge_bank_number, user_recharge_bank_number,
is_discount,
user_recharge_credentials_url user_recharge_credentials_url
</sql> </sql>
......
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