Merge branch 'future/strokeList' into 'master'

行程列表返回商家开户银行

See merge request hewei/Jumeirah!13

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

@@ -15,7 +15,6 @@ import com.jumeirah.common.vo.StrokeQueryVo;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
-import io.geekidea.springbootplus.framework.core.validator.groups.Update;
 import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
 import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
 import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
@@ -129,16 +128,16 @@ public class StrokeController extends BaseController {
     }
 
 
-    /**
-     * 修改行程表
-     */
-    @PostMapping("/update")
-    @OperationLog(name = "修改行程表", type = OperationLogType.UPDATE)
-    @ApiOperation(value = "修改行程表", response = ApiResult.class)
-    public ApiResult<Boolean> updateStroke(@Validated(Update.class) @RequestBody Stroke stroke) throws Exception {
-        boolean flag = strokeService.updateStroke(stroke);
-        return ApiResult.result(flag);
-    }
+//    /**
+//     * 修改行程表
+//     */
+//    @PostMapping("/update")
+//    @OperationLog(name = "修改行程表", type = OperationLogType.UPDATE)
+//    @ApiOperation(value = "修改行程表", response = ApiResult.class)
+//    public ApiResult<Boolean> updateStroke(@Validated(Update.class) @RequestBody Stroke stroke) throws Exception {
+//        boolean flag = strokeService.updateStroke(stroke);
+//        return ApiResult.result(flag);
+//    }
 
     /**
      * 删除行程表

common/src/main/java/com/jumeirah/common/entity/Stroke.java

@@ -171,4 +171,16 @@ public class Stroke extends BaseEntity {
     @ApiModelProperty("用户充值截图证据,  传入数组")
     private String userRechargeCredentialsUrl;
 
+    @NotBlank(message = "商家开户银行不能为空")
+    @ApiModelProperty("商家开户银行")
+    private String rechargeBank;
+
+    @NotBlank(message = "商家开户名称不能为空")
+    @ApiModelProperty("商家开户名称")
+    private String rechargeName;
+
+    @NotBlank(message = "商家银行卡号")
+    @ApiModelProperty("商家银行卡号")
+    private String rechargeBankNumber;
+
 }

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

@@ -28,6 +28,9 @@ public class StrokeQueryVo implements Serializable {
         @ApiModelProperty("主键ID")
         private Long id;
 
+        @ApiModelProperty("商家ID")
+        private Long merchantId;
+
         @ApiModelProperty("出发城市名称")
         private String cityOutsetName;
 
@@ -82,4 +85,16 @@ public class StrokeQueryVo implements Serializable {
         @NotNull(message = "审核状态不能为空")
         @ApiModelProperty("审核状态,0审核中,1审核通过,2审核未通过")
         private Integer auditStatus;
+
+        @NotBlank(message = "商家开户银行不能为空")
+        @ApiModelProperty("商家开户银行")
+        private String rechargeBank;
+
+        @NotBlank(message = "商家开户名称不能为空")
+        @ApiModelProperty("商家开户名称")
+        private String rechargeName;
+
+        @NotBlank(message = "商家银行卡号")
+        @ApiModelProperty("商家银行卡号")
+        private String rechargeBankNumber;
 }
\ No newline at end of file

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

@@ -5,6 +5,7 @@
     <!-- 分页列表查询结果列 -->
     <sql id="Page_Column_List">
         s.id,
+        mu.id as merchantId,
         city_outset_id,
         city_outset_name,
         city_arrive_id,
@@ -19,7 +20,7 @@
         user_id,
         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
+        payment_status,audit_status,recharge_bank,recharge_name,recharge_bank_number
 
    </sql>
 
@@ -27,7 +28,7 @@
     <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, user_recharge_money,user_recharge_bank,user_recharge_name,
-    user_recharge_bank_number,user_recharge_credentials_url
+    user_recharge_bank_number,user_recharge_credentials_url,recharge_bank,recharge_name,recharge_bank_number
     </sql>
 
     <select id="getStrokeById" resultType="com.jumeirah.common.vo.StrokeDetailVo">