资金管理

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

+package com.clx.performance.param.pc;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@ApiModel(description = "货主绑卡")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OwnerBindCardParam {
+
+    @ApiModelProperty(value = "所属银行")
+    private String ownerAccountBank;
+
+    @ApiModelProperty(value = "开户行")
+    private String ownerOpenBank;
+
+    @ApiModelProperty(value = "户名")
+    private String ownerAccountName;
+
+    @ApiModelProperty(value = "银行账户")
+    private String ownerBankAccount;
+}

performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerAccountController.java

@@ -138,21 +138,14 @@ public class OwnerAccountController {
 
     @ApiOperation(value = "绑定货主银行卡")
     @PostMapping({"/bindOwnerBindCard"})
-    Result<Object> bindOwnerBindCard(@RequestBody UpdateOwnerBindCardFeignParam param) {
-        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
-        param.setUserNo(loginUserInfo.getUserNo());
-        param.setName(loginUserInfo.getUserName());
-
+    Result<Object> bindOwnerBindCard(@RequestBody OwnerBindCardParam param) {
         ownerAccountService.bindOwnerBindCard(param);
         return Result.ok();
     }
 
     @ApiOperation(value = "解绑货主银行卡")
     @PostMapping({"/unBindOwnerBindCard"})
-    Result<Object> unBindOwnerBindCard(@RequestBody UpdateOwnerBindCardFeignParam param) {
-        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
-        param.setUserNo(loginUserInfo.getUserNo());
-        param.setName(loginUserInfo.getUserName());
+    Result<Object> unBindOwnerBindCard(@RequestBody OwnerBindCardParam param) {
         ownerAccountService.unBindOwnerBindCard(param);
         return Result.ok();
     }

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

@@ -41,8 +41,8 @@ public class OwnerBindCardRecord implements HasKey<Integer> {
     /**
      * 货主类型;1:企业 2：个人
      */
-    @TableField("owner_type")
-    private Integer ownerType;
+//    @TableField("owner_type")
+//    private Integer ownerType;
     /**
      * 货主银行
      */

performance-web/src/main/java/com/clx/performance/service/OwnerAccountService.java

@@ -59,9 +59,9 @@ public interface OwnerAccountService {
 
     OwnerBindCardVO getOwnerBindCard(Long userNo);
 
-    void bindOwnerBindCard(UpdateOwnerBindCardFeignParam param);
+    void bindOwnerBindCard(OwnerBindCardParam param);
 
-    void unBindOwnerBindCard(UpdateOwnerBindCardFeignParam param);
+    void unBindOwnerBindCard(OwnerBindCardParam param);
 
     void ownerAccountFrozen(Long ownerUserNo);
 }

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

@@ -24,6 +24,8 @@ import com.clx.user.vo.pc.owner.OwnerBindCardVO;
 import com.msl.common.base.Optional;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -383,8 +385,10 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
     }
 
     @Override
-    public void bindOwnerBindCard(UpdateOwnerBindCardFeignParam param) {
-        Result<OwnerBindCardVO> result = ownerInfoFeign.getOwnerInfoVO(param.getUserNo());
+    public void bindOwnerBindCard(OwnerBindCardParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+
+        Result<OwnerBindCardVO> result = ownerInfoFeign.getOwnerInfoVO(loginUserInfo.getUserNo());
         if (!result.succeed()) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前参数未查询到有效数据");
         }
@@ -392,10 +396,17 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前货主存在绑定银行卡,请先解绑银行卡后再进行绑定操作");
         }
 
-        ownerInfoFeign.bindOwnerBindCard(param);
+        UpdateOwnerBindCardFeignParam feignParam = new UpdateOwnerBindCardFeignParam();
+        feignParam.setUserNo(loginUserInfo.getUserNo());
+        feignParam.setOwnerAccountBank(param.getOwnerAccountBank());
+        feignParam.setOwnerAccountName(param.getOwnerAccountName());
+        feignParam.setOwnerBankAccount(param.getOwnerBankAccount());
+        feignParam.setOwnerOpenBank(param.getOwnerOpenBank());
+
+        ownerInfoFeign.bindOwnerBindCard(feignParam);
         OwnerBindCardRecord record = new OwnerBindCardRecord();
-        record.setOwnerType(param.getOwnerType());
-        record.setOwnerUserNo(param.getUserNo());
+        record.setOwnerUserNo(loginUserInfo.getUserNo());
+        record.setOwnerUserName(loginUserInfo.getUserName());
         record.setCreateItem("绑定银行卡");
         record.setOwnerBank(param.getOwnerAccountBank());
         record.setOpenAccountBank(param.getOwnerAccountBank());
@@ -406,18 +417,29 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
     }
 
     @Override
-    public void unBindOwnerBindCard(UpdateOwnerBindCardFeignParam param) {
+    public void unBindOwnerBindCard(OwnerBindCardParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Result<OwnerBindCardVO> result = ownerInfoFeign.getOwnerInfoVO(loginUserInfo.getUserNo());
+        if (!result.succeed()) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前参数未查询到有效数据");
+        }
         OwnerBindCardRecord record = new OwnerBindCardRecord();
-        record.setOwnerType(param.getOwnerType());
-        record.setOwnerUserNo(param.getUserNo());
+        //record.setOwnerType(param.getOwnerType());
+        record.setOwnerUserNo(loginUserInfo.getUserNo());
         record.setCreateItem("解绑银行卡");
         record.setOwnerBank(param.getOwnerAccountBank());
         record.setOpenAccountBank(param.getOwnerAccountBank());
         record.setAccountBankName(param.getOwnerAccountName());
-        record.setCreateBy("曹做人");
+        record.setCreateBy(loginUserInfo.getUserName());
         ownerBindCardRecordDao.saveEntity(record);
-
-        ownerInfoFeign.unBindOwnerBindCard(param);
+        UpdateOwnerBindCardFeignParam feignParam = new UpdateOwnerBindCardFeignParam();
+        feignParam.setUserNo(loginUserInfo.getUserNo());
+        feignParam.setOwnerAccountBank(param.getOwnerAccountBank());
+        feignParam.setOwnerAccountName(param.getOwnerAccountName());
+        feignParam.setOwnerBankAccount(param.getOwnerBankAccount());
+        feignParam.setOwnerOpenBank(param.getOwnerOpenBank());
+
+        ownerInfoFeign.unBindOwnerBindCard(feignParam);
     }
 
     @Override