Merge remote-tracking branch 'origin/v7.0_small_version_fix_20231120' into test

performance-api/src/main/java/com/clx/performance/param/pc/OwnerCaseOutParam.java

@@ -29,9 +29,12 @@ public class OwnerCaseOutParam {
     @ApiModelProperty(value = "账户类型： 1：保证金 2：预付运费", example = "1")
     private Integer accountType;
 
-    @ApiModelProperty(value = "提现银行", example = "浙江银行")
+    @ApiModelProperty(value = "提现银行开户行", example = "浙江银行开户行")
     private String ownerOpenBank;
 
+    @ApiModelProperty(value = "提现银行", example = "浙江银行")
+    private String ownerAccountBank;
+
     @ApiModelProperty(value = "提现银行卡号", example = "62213545878787")
     private String ownerBankAccount;
 

performance-web/pom.xml

@@ -49,7 +49,6 @@
         <dependency>
             <groupId>com.clx.cy</groupId>
             <artifactId>message-api</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>

performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java

@@ -251,7 +251,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
                 entity.setCaseOutBalance(caseOutBalance);
                 entity.setOwnerUserNo(param.getOwnerUserNo());
                 entity.setStatus(OwnerAccountEnum.CaseOutStatus.PENDING_PAYMENT.getCode());
-                entity.setCaseOutBank(param.getOwnerOpenBank());
+                entity.setCaseOutBank(param.getOwnerBankAccount());
                 entity.setCaseOutBankNumber(param.getOwnerBankAccount());
                 entity.setCreateBy(loginUserInfo.getUserName());
 

performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerRunningWaterRecordSqlProvider.java

@@ -89,7 +89,7 @@ public class OwnerRunningWaterRecordSqlProvider {
 
     public String prepaidFreightOwnerAccountPageList(@Param(value = "page") Page<OwnerAccountRunningWaterRecordVO> page, @Param("param") PageAppPrepaidFreightAccountParam param) {
         String sql = new SQL() {{
-            SELECT("a.id, a.owner_user_no," +
+            SELECT("a.id, a.owner_user_no,a.relation_id" +
                     " a.owner_user_name,a.running_water_no, a.mobile, a.account_type, a.running_water_type,a.order_id,a.order_no,a.order_child_id,a.order_child_no,a.alteration_balance," +
                     " a.account_balance,a.usable_balance,a.take_out_balance,a.frozen_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
             FROM("owner_running_water_record a");