货主充值记录增加相关信息字段

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

@@ -38,6 +38,16 @@ public class OwnerTopUpParam {
     @ApiModelProperty(value = "打款凭证", example = "/a.png")
     private String drawingProof;
 
+    @ApiModelProperty(value = "收款人企业信息", example = "收款人企业信息")
+    private String enterpriseName;
 
+    @ApiModelProperty(value = "收款人开户行", example = "62213545878787")
+    private String openAccountBank;
+
+    @ApiModelProperty(value = "收款人开户行银行代码", example = "收款人开户行银行代码")
+    private String openAccountBankNumber;
+
+    @ApiModelProperty(value = "收款人账户账号", example = "")
+    private String accountNumber;
 
 }
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/OwnerAccountAllVO.java

 package com.clx.performance.vo.pc;
 
 import com.msl.common.convertor.field.Converted;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class OwnerAccountAllVO {
 
+    @ApiModelProperty("保证金账户")
     @Converted(isDynamic = true)
     private OwnerAccountVO marginAccount;
 
+    @ApiModelProperty("预付运费账户")
     @Converted(isDynamic = true)
     private OwnerAccountVO prepaidFreightAccount;
+
+    @ApiModelProperty("0:没有交易密码  1：有交易密码")
+    private Integer ownerAccountPassword;
 }

performance-api/src/main/java/com/clx/performance/vo/pc/OwnerTopUpVO.java

@@ -91,4 +91,10 @@ public class OwnerTopUpVO {
     @ApiModelProperty(value = "审批拒绝")
     private String approvalTurnDown;
 
+    @ApiModelProperty(value = "收款人企业信息")
+    private String enterpriseName;
+
+    @ApiModelProperty(value = "收款人账户账号")
+    private String accountNumber;
+
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/model/OwnerTopUp.java

@@ -100,6 +100,31 @@ public class OwnerTopUp implements HasKey<Integer> {
      */
     @TableField("modified_time")
     private LocalDateTime modifiedTime;
+
+    /**
+     * 收款人企业信息
+     */
+    @TableField("enterprise_name")
+    private String enterpriseName;
+
+    /**
+     *收款人开户行
+     */
+    @TableField("open_account_bank")
+    private String openAccountBank;
+
+    /**
+     * 收款人开户行银行代码
+     */
+    @TableField("open_account_bank_number")
+    private String openAccountBankNumber;
+
+    /**
+     * 收款人账户账号
+     */
+    @TableField("account_number")
+    private String accountNumber;
+
     @KeyColumn("id")
     @Override
     public Integer gainKey() {

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

@@ -96,6 +96,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
 
     private final OwnerAccountPasswordDao ownerAccountPasswordDao;
 
+
     @Override
     public IPage<OwnerAccountVO> pageList(PageOwnerAccountListParam param) {
         return ownerAccountDao.pageList(param);
@@ -127,6 +128,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
                 result.setPrepaidFreightAccount(ownerAccountVO);
             }
         }
+        OwnerAccountPassword entityByUserNo = ownerAccountPasswordDao.findEntityByUserNo(ownerUserNo);
+        if (null != entityByUserNo) {
+            result.setOwnerAccountPassword(1);
+        } else {
+            result.setOwnerAccountPassword(0);
+        }
         return result;
     }
 
@@ -144,6 +151,11 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         entity.setDrawingBankNumber(param.getDrawingBankNumber());
         entity.setDrawingProof(param.getDrawingProof());
         entity.setCreateBy(loginUserInfo.getUserName());
+        entity.setEnterpriseName(param.getEnterpriseName());
+        entity.setOpenAccountBank(param.getOpenAccountBank());
+        entity.setOpenAccountBankNumber(param.getOpenAccountBankNumber());
+        entity.setAccountNumber(param.getAccountNumber());
+
         //充值编号
         entity.setTopUpNo(idGenerateSnowFlake.nextId(IdTypeEnum.Type.TOP_UP.getCode()));
 

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

@@ -13,7 +13,7 @@ public class OwnerTopUpProvider {
         String sql = new SQL() {{
             SELECT("a.id, a.owner_user_no," +
                     " a.top_up_no, a.top_up_balance, a.account_type, " +
-                    " a.status,a.drawing_bank, a.drawing_bank_number,a.drawing_proof,date_format(a.approval_time, '%Y-%m-%d %H:%i:%s') as approval_time,a.approval_by,a.approval_turn_down,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time,a.modified_time");
+                    " a.status,a.drawing_bank,a.enterprise_name,a.account_number,a.drawing_bank_number,a.drawing_proof,date_format(a.approval_time, '%Y-%m-%d %H:%i:%s') as approval_time,a.approval_by,a.approval_turn_down,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time,a.modified_time");
             FROM("owner_top_up a");
             if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {
                 WHERE("a.create_time >= #{param.beginTime} and a.create_time <= #{param.endTime}");