增加接口:填写付款信息

37747eef · giaogiao · 71d7f4c0 · 37747eef · 37747eef · 37747eef
Commit 37747eef authored Oct 12, 2020 by giaogiao
5 changed files
--- a/api-app/src/main/java/com/jumeirah/api/app/controller/StrokeController.java
+++ b/api-app/src/main/java/com/jumeirah/api/app/controller/StrokeController.java
 package com.jumeirah.api.app.controller;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.jumeirah.api.app.entity.vo.StrokeAddBackAndForthVo;
 import com.jumeirah.api.app.entity.vo.StrokeAddFreightVo;
 import com.jumeirah.api.app.entity.vo.StrokeAddMedicalTreatmentVo;
 import com.jumeirah.api.app.entity.vo.StrokeAddOneWayVo;
 import com.jumeirah.common.entity.Stroke;
+import com.jumeirah.common.enums.StatePaymentStatusEnum;
 import com.jumeirah.common.param.StrokePageParam;
+import com.jumeirah.common.param.app.StrokePaymentInfoParam;
 import com.jumeirah.common.service.StrokeService;
 import com.jumeirah.common.vo.StrokeDetailVo;
 import com.jumeirah.common.vo.StrokeQueryVo;
@@ -46,6 +49,25 @@ public class StrokeController extends BaseController {
    private StrokeService strokeService;
    /**
+     * 填写付款信息
+     */
+    @PostMapping("/add/paymentInfo")
+    @OperationLog(name = "填写付款信息", type = OperationLogType.ADD)
+    @ApiOperation(value = "填写付款信息", response = ApiResult.class)
+    public ApiResult<Boolean> addPaymentInfo(@Validated @RequestBody StrokePaymentInfoParam strokePaymentInfoParam) throws Exception {
+        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
+        Stroke stroke = new Stroke();
+        BeanUtils.copyProperties(strokePaymentInfoParam, stroke);
+        stroke.setPaymentStatus(StatePaymentStatusEnum.PAYING.getCode());
+        boolean flag = strokeService.update(stroke, new UpdateWrapper<Stroke>().lambda()
+                .eq(Stroke::getUserId, jwtToken.getUserId())
+                .eq(Stroke::getId, strokePaymentInfoParam.getId())
+        );
+        return ApiResult.result(flag);
+    }
+    /**
     * 添加单程行程表
     */
    @PostMapping("/add/oneWay")

--- a/common/src/main/java/com/jumeirah/common/entity/Stroke.java
+++ b/common/src/main/java/com/jumeirah/common/entity/Stroke.java
@@ -13,6 +13,7 @@ import lombok.experimental.Accessors;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.sql.Timestamp;
 /**
@@ -107,8 +108,8 @@ public class Stroke extends BaseEntity {
    @ApiModelProperty("备注")
    private String remarks;
-    @ApiModelProperty("价格，单位：分")
+    @ApiModelProperty("价格")
-    private Long money;
+    private BigDecimal money;
    @NotNull(message = "用户ID不能为空")
    @ApiModelProperty("用户ID")
@@ -138,7 +139,7 @@ public class Stroke extends BaseEntity {
    @ApiModelProperty("商家id")
    private Long mcId;
-    @NotNull(message = "用户选择机型不能为空")
+    @NotBlank(message = "用户选择机型不能为空")
    @ApiModelProperty("用户选择机型")
    private String choosePlainType;
@@ -150,4 +151,24 @@ public class Stroke extends BaseEntity {
    @ApiModelProperty("审核状态,0审核中,1审核通过,2审核未通过")
    private Integer auditStatus;
+    @NotNull(message = "用户充值金额不能为空")
+    @ApiModelProperty("用户充值金额")
+    private BigDecimal userRechargeMoney;
+    @NotBlank(message = "用户充值银行不能为空")
+    @ApiModelProperty("用户充值银行名称")
+    private String userRechargeBank;
+    @NotBlank(message = "用户充值账户名不能为空")
+    @ApiModelProperty("用户充值账户名")
+    private String userRechargeName;
+    @NotBlank(message = "用户充值卡号不能为空")
+    @ApiModelProperty("用户充值卡号")
+    private String userRechargeBankNumber;
+    @NotBlank(message = "用户充值截图证据,  传入数组不能为空")
+    @ApiModelProperty("用户充值截图证据,  传入数组")
+    private String userRechargeCredentialsUrl;
 }
--- a/common/src/main/java/com/jumeirah/common/enums/StatePaymentStatusEnum.java
+++ b/common/src/main/java/com/jumeirah/common/enums/StatePaymentStatusEnum.java
@@ -21,11 +21,11 @@ public enum StatePaymentStatusEnum implements BaseEnum {
    /**
     * 付款中
     **/
-    PAYING(1, "付款中"),
+    PAYING(1, "用户已付款,待审核"),
    /**
     * 已付款
     **/
-    PAID(2, "已付款"),
+    PAID(2, "用户已付款,审核通过"),
    /**
     * 退款中
     **/

--- a/common/src/main/java/com/jumeirah/common/param/app/StrokePaymentInfoParam.java
+++ b/common/src/main/java/com/jumeirah/common/param/app/StrokePaymentInfoParam.java
+package com.jumeirah.common.param.app;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+/**
+ * <pre>
+ * 行程付款信息填写
+ * </pre>
+ *
+ * @author wei
+ * @date 2020-09-29
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "行程付款信息填写")
+public class StrokePaymentInfoParam implements Serializable {
+        private static final long serialVersionUID = 1L;
+        @NotNull(message = "id不能为空")
+        @ApiModelProperty("主键ID")
+        private Long id;
+        @NotNull(message = "用户充值金额不能为空")
+        @ApiModelProperty("用户充值金额")
+        private BigDecimal userRechargeMoney;
+        @NotBlank(message = "用户充值账户名不能为空")
+        @ApiModelProperty("用户充值账户名")
+        private String userRechargeName;
+        @NotBlank(message = "用户充值卡号不能为空")
+        @ApiModelProperty("用户充值卡号")
+        private String userRechargeBankNumber;
+        @NotBlank(message = "用户充值截图证据,  传入数组不能为空")
+        @ApiModelProperty("用户充值截图证据,  传入数组")
+        private String userRechargeCredentialsUrl;
+}
--- a/common/src/main/resources/mapper/StrokeMapper.xml
+++ b/common/src/main/resources/mapper/StrokeMapper.xml
@@ -18,14 +18,16 @@
        money,
        user_id,
        mu.username AS merchantName,
-        outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name
+        outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name,
+        payment_status,audit_status
   </sql>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, city_outset_id, deleted, city_outset_name, city_arrive_id, city_arrive_name, people_mun, plain_type_id, outset_time, return_time, type, status, create_time, update_time, goods_name, goods_size, goods_weight, disease_name, instruments, medical_persons, remarks, money, user_id
-        ,outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name,payment_status,audit_status
+        ,outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name,payment_status,audit_status, user_recharge_money,user_recharge_bank,user_recharge_name,
+    user_recharge_bank_number,user_recharge_credentials_url
    </sql>
    <select id="getStrokeById" resultType="com.jumeirah.common.vo.StrokeDetailVo">