Merge branch 'future/strokeList' into 'master'

Future/stroke list

See merge request hewei/Jumeirah!12

api-app/src/main/java/com/jumeirah/api/app/controller/StrokeController.java

 package com.jumeirah.api.app.controller;
 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.StrokeAddBackAndForthVo;
 import com.jumeirah.api.app.entity.vo.StrokeAddFreightVo;
 import com.jumeirah.api.app.entity.vo.StrokeAddFreightVo;
 import com.jumeirah.api.app.entity.vo.StrokeAddMedicalTreatmentVo;
 import com.jumeirah.api.app.entity.vo.StrokeAddMedicalTreatmentVo;
 import com.jumeirah.api.app.entity.vo.StrokeAddOneWayVo;
 import com.jumeirah.api.app.entity.vo.StrokeAddOneWayVo;
 import com.jumeirah.common.entity.Stroke;
 import com.jumeirah.common.entity.Stroke;
+import com.jumeirah.common.enums.StatePaymentStatusEnum;
 import com.jumeirah.common.param.StrokePageParam;
 import com.jumeirah.common.param.StrokePageParam;
+import com.jumeirah.common.param.app.StrokePaymentInfoParam;
 import com.jumeirah.common.service.StrokeService;
 import com.jumeirah.common.service.StrokeService;
 import com.jumeirah.common.vo.StrokeDetailVo;
 import com.jumeirah.common.vo.StrokeDetailVo;
 import com.jumeirah.common.vo.StrokeQueryVo;
 import com.jumeirah.common.vo.StrokeQueryVo;
@@ -46,6 +49,25 @@ public class StrokeController extends BaseController {
     private StrokeService strokeService;
     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")
     @PostMapping("/add/oneWay")
@@ -130,6 +152,17 @@ public class StrokeController extends BaseController {
     }
     }
 
 
     /**
     /**
+     * 取消行程
+     */
+    @PostMapping("/cancel/{id}")
+    @OperationLog(name = "取消行程", type = OperationLogType.UPDATE)
+    @ApiOperation(value = "取消行程", response = ApiResult.class)
+    public ApiResult<Boolean> cancel(@PathVariable("id") Long id) throws Exception {
+        boolean flag = strokeService.cancelStroke(id);
+        return ApiResult.result(flag);
+    }
+
+    /**
      * 获取行程表详情
      * 获取行程表详情
      */
      */
     @GetMapping("/info/{id}")
     @GetMapping("/info/{id}")

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.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.sql.Timestamp;
 
 
 /**
 /**
@@ -107,8 +108,8 @@ public class Stroke extends BaseEntity {
     @ApiModelProperty("备注")
     @ApiModelProperty("备注")
     private String remarks;
     private String remarks;
 
 
-    @ApiModelProperty("价格，单位：分")
-    private Long money;
+    @ApiModelProperty("价格")
+    private BigDecimal money;
 
 
     @NotNull(message = "用户ID不能为空")
     @NotNull(message = "用户ID不能为空")
     @ApiModelProperty("用户ID")
     @ApiModelProperty("用户ID")
@@ -138,8 +139,36 @@ public class Stroke extends BaseEntity {
     @ApiModelProperty("商家id")
     @ApiModelProperty("商家id")
     private Long mcId;
     private Long mcId;
 
 
-    @NotNull(message = "用户选择机型不能为空")
+    @NotBlank(message = "用户选择机型不能为空")
     @ApiModelProperty("用户选择机型")
     @ApiModelProperty("用户选择机型")
     private String choosePlainType;
     private String choosePlainType;
 
 
+    @NotNull(message = "付款状态不能为空")
+    @ApiModelProperty("付款状态，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款")
+    private Integer paymentStatus;
+
+    @NotNull(message = "审核状态不能为空")
+    @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;
+
 }
 }

common/src/main/java/com/jumeirah/common/enums/StateAuditStatusEnum.java

+
+package com.jumeirah.common.enums;
+
+import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 审核状态,0审核中,1审核通过,2审核未通过
+ **/
+@Getter
+@AllArgsConstructor
+public enum StateAuditStatusEnum implements BaseEnum {
+
+
+    /**
+     * 0审核中
+     **/
+    UNDER_REVIEW(0, "0审核中"),
+    /**
+     * 1审核通过
+     **/
+    PASSED(1, "1审核通过"),
+    /**
+     * 2审核未通过
+     **/
+    FAILED_THE_AUDIT(2, "2审核未通过");
+
+    private final Integer code;
+    private final String desc;
+
+}

common/src/main/java/com/jumeirah/common/enums/StatePaymentStatusEnum.java

+
+package com.jumeirah.common.enums;
+
+import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 付款状态，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款
+ **/
+@Getter
+@AllArgsConstructor
+public enum StatePaymentStatusEnum implements BaseEnum {
+
+//    0-UNPAID, 1-PAYING, 2-PAID, 3-REFUNDING, 99-REFUNDED
+
+    /**
+     * 未付款
+     **/
+    UNPAID(0, "未付款"),
+    /**
+     * 付款中
+     **/
+    PAYING(1, "用户已付款,待审核"),
+    /**
+     * 已付款
+     **/
+    PAID(2, "用户已付款,审核通过"),
+    /**
+     * 退款中
+     **/
+    REFUNDING(3, "退款中"),
+    /**
+     * 已退款
+     **/
+    REFUNDED(99, "已退款");
+
+    private final Integer code;
+    private final String desc;
+
+}

common/src/main/java/com/jumeirah/common/enums/StrokeStatusEnum.java

 package com.jumeirah.common.enums;
 package com.jumeirah.common.enums;
 
 
+import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 /**
 /**
  * 状态，0-审核中，1-进行中，2-已完成，99-取消
  * 状态，0-审核中，1-进行中，2-已完成，99-取消
  */
  */
-public enum StrokeStatusEnum {
+@Getter
+@AllArgsConstructor
+public enum StrokeStatusEnum implements BaseEnum {
 
 
     UNDER_REVIEW(0, "审核中"),
     UNDER_REVIEW(0, "审核中"),
     PROCESSING(1, "进行中"),
     PROCESSING(1, "进行中"),
@@ -13,16 +19,11 @@ public enum StrokeStatusEnum {
     /**
     /**
      * 编号
      * 编号
      */
      */
-    private final Integer id;
+    private final Integer code;
     /**
     /**
      * 名称
      * 名称
      */
      */
-    private final String name;
-
-    StrokeStatusEnum(Integer id, String name) {
+    private final String desc;
 
 
-        this.id = id;
-        this.name = name;
 
 
-    }
 }
 }

common/src/main/java/com/jumeirah/common/enums/StrokeTypeEnum.java

 package com.jumeirah.common.enums;
 package com.jumeirah.common.enums;
 
 
+import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 /**
 /**
  * 行程类型，0-单程，1-往返行程，2-货运，3-医疗
  * 行程类型，0-单程，1-往返行程，2-货运，3-医疗
  */
  */
-public enum StrokeTypeEnum {
+@Getter
+@AllArgsConstructor
+public enum StrokeTypeEnum implements BaseEnum {
 
 
     ONE_WAY(0, "单程"),
     ONE_WAY(0, "单程"),
     ROUND_TRIP(1, "往返"),
     ROUND_TRIP(1, "往返"),
@@ -13,16 +19,10 @@ public enum StrokeTypeEnum {
     /**
     /**
      * 编号
      * 编号
      */
      */
-    private final Integer id;
+    private final Integer code;
     /**
     /**
      * 名称
      * 名称
      */
      */
-    private final String name;
-
-    StrokeTypeEnum(Integer id, String name) {
-
-        this.id = id;
-        this.name = name;
+    private final String desc;
 
 
-    }
 }
 }

common/src/main/java/com/jumeirah/common/param/StrokePageParam.java

@@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
 public class StrokePageParam extends BasePageOrderParam {
 public class StrokePageParam extends BasePageOrderParam {
         private static final long serialVersionUID = 1L;
         private static final long serialVersionUID = 1L;
 
 
-        @ApiModelProperty("行程状态，-1=全部, 0-审核中，1-进行中，2-已完成")//99-取消
+        @ApiModelProperty(value = "行程状态，-1=全部, 0-审核中，1-进行中，2-已完成", required = true)//99-取消
         private Integer status;
         private Integer status;
 
 
 }
 }

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;
+
+}

common/src/main/java/com/jumeirah/common/service/StrokeService.java

@@ -42,6 +42,10 @@ public interface StrokeService extends BaseService<Stroke> {
      */
      */
     boolean deleteStroke(Long id) throws Exception;
     boolean deleteStroke(Long id) throws Exception;
 
 
+
+    boolean cancelStroke(Long id) throws Exception;
+
+
     /**
     /**
      * 根据ID获取查询对象
      * 根据ID获取查询对象
      *
      *

common/src/main/java/com/jumeirah/common/service/impl/StrokeServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 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.mapper.StrokeMapper;
 import com.jumeirah.common.mapper.StrokeMapper;
 import com.jumeirah.common.param.StrokePageParam;
 import com.jumeirah.common.param.StrokePageParam;
 import com.jumeirah.common.service.StrokeService;
 import com.jumeirah.common.service.StrokeService;
@@ -58,6 +59,20 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp
     }
     }
 
 
     @Override
     @Override
+    public boolean cancelStroke(Long id) throws Exception {
+        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
+        Stroke byId = super.getById(id);
+        // 判断该记录是否属于此用户
+        if (!byId.getUserId().equals(jwtToken.getUserId())) {
+            return false;
+        }
+        Stroke stroke = new Stroke();
+        stroke.setId(id);
+        stroke.setStatus(StrokeStatusEnum.CANCEL.getCode());
+        return super.updateById(stroke);
+    }
+
+    @Override
     public StrokeDetailVo getStrokeById(Long id) throws Exception {
     public StrokeDetailVo getStrokeById(Long id) throws Exception {
         return strokeMapper.getStrokeById(id);
         return strokeMapper.getStrokeById(id);
     }
     }

common/src/main/java/com/jumeirah/common/vo/StrokeDetailVo.java

@@ -147,4 +147,12 @@ public class StrokeDetailVo implements Serializable {
     @ApiModelProperty("商家名称")
     @ApiModelProperty("商家名称")
     private String merchantName;
     private String merchantName;
 
 
+    @NotNull(message = "付款状态不能为空")
+    @ApiModelProperty("付款状态，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款")
+    private Integer paymentStatus;
+
+    @NotNull(message = "审核状态不能为空")
+    @ApiModelProperty("审核状态,0审核中,1审核通过,2审核未通过")
+    private Integer auditStatus;
+
 }
 }
\ No newline at end of file

common/src/main/java/com/jumeirah/common/vo/StrokeQueryVo.java

@@ -74,4 +74,12 @@ public class StrokeQueryVo implements Serializable {
         @NotBlank(message = "返程到达机场名称不能为空")
         @NotBlank(message = "返程到达机场名称不能为空")
         @ApiModelProperty("返程到达机场名称")
         @ApiModelProperty("返程到达机场名称")
         private String backArriveAirportName;
         private String backArriveAirportName;
+
+        @NotNull(message = "付款状态不能为空")
+        @ApiModelProperty("付款状态，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款")
+        private Integer paymentStatus;
+
+        @NotNull(message = "审核状态不能为空")
+        @ApiModelProperty("审核状态,0审核中,1审核通过,2审核未通过")
+        private Integer auditStatus;
 }
 }
\ No newline at end of file

common/src/main/resources/mapper/StrokeMapper.xml

@@ -17,15 +17,17 @@
         STATUS,
         STATUS,
         money,
         money,
         user_id,
         user_id,
-        mu.username AS merchantName
-        ,outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name
+        mu.username AS merchantName,
+        outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name,
+        payment_status,audit_status
 
 
    </sql>
    </sql>
 
 
     <!-- 通用查询结果列 -->
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
     <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
         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
+        ,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>
     </sql>
 
 
     <select id="getStrokeById" resultType="com.jumeirah.common.vo.StrokeDetailVo">
     <select id="getStrokeById" resultType="com.jumeirah.common.vo.StrokeDetailVo">

generator/src/main/java/io/geekidea/springbootplus/generator/SpringBootPlusGenerator.java

@@ -25,6 +25,8 @@ import io.geekidea.springbootplus.generator.constant.GeneratorConstant;
 import io.geekidea.springbootplus.generator.properties.GeneratorProperties;
 import io.geekidea.springbootplus.generator.properties.GeneratorProperties;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
+import java.util.Scanner;
+
 /**
 /**
  * spring-boot-plus代码生成器入口类
  * spring-boot-plus代码生成器入口类
  *
  *
@@ -40,7 +42,12 @@ public class SpringBootPlusGenerator {
      * @param args
      * @param args
      */
      */
     public static void main(String[] args) {
     public static void main(String[] args) {
-        getCode("plain_type");
+
+        Scanner sc = new Scanner(System.in);
+        System.out.println("请输入表名称：");
+        String name = sc.nextLine();
+
+        getCode(name);
     }
     }
 
 
     private static void getCode(String tableName) {
     private static void getCode(String tableName) {
@@ -51,7 +58,7 @@ public class SpringBootPlusGenerator {
                 .setMavenModuleName("common")
                 .setMavenModuleName("common")
                 .setParentPackage("com.jumeirah.common")
                 .setParentPackage("com.jumeirah.common")
 //                .setModuleName("api-app")
 //                .setModuleName("api-app")
-                .setAuthor("wei")
+                .setAuthor("xxx") // 设置作者名称
                 .setFileOverride(true);
                 .setFileOverride(true);
 
 
         // 设置表信息
         // 设置表信息