Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'…

performance-api/src/main/java/com/clx/performance/vo/pc/loan/owner/OwnerAccountVO.java

+package com.clx.performance.vo.pc.loan.owner;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+* @Author: aiqinguo
+* @Description: 货主借款账户
+* @Date: 2024/01/22 18:17:57
+* @Version: 1.0
+*/
+
+@ApiModel(description = "货主借款账户")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class OwnerAccountVO {
+
+    @ApiModelProperty(value = "货主编码", example = "10000000")
+    private Long ownerUserNo;
+    @ApiModelProperty(value = "货主名称", example = "张三")
+    private String ownerUserName;
+    @ApiModelProperty(value = "联系电话", example = "13000000000")
+    private String mobile;
+    @ApiModelProperty(value = "默认 3：借款账户", example = "3")
+    private Integer accountType;
+    @ApiModelProperty(value = "是否开通借款账户 0：未开通  1：已开通", example = "3")
+    private Integer openAccount;
+
+
+    @ApiModelProperty(value = "可用余额 (元) ", example = "1.23")
+    private BigDecimal amount;
+    public BigDecimal getAmount() {
+        return BigDecimal.ZERO.add(fundingUsableBalance==null? BigDecimal.ZERO : fundingUsableBalance).add(virtuallyUsableBalance==null? BigDecimal.ZERO : virtuallyUsableBalance);
+    }
+
+    @ApiModelProperty(value = "冻结金额(元) ", example = "1.23")
+    private BigDecimal frozenAmount;
+    public BigDecimal getFrozenAmount() {
+        return BigDecimal.ZERO.add(fundingFrozenBalance==null? BigDecimal.ZERO : fundingFrozenBalance).add(virtuallyFrozenBalance==null? BigDecimal.ZERO : virtuallyFrozenBalance);
+    }
+
+    @ApiModelProperty(value = "欠款金额 (元)", example = "1.23")
+    private BigDecimal arrears;
+    public BigDecimal getArrears() {
+        return BigDecimal.ZERO.add(fundingArrears==null? BigDecimal.ZERO : fundingArrears).add(virtuallyArrears==null? BigDecimal.ZERO : virtuallyArrears);
+    }
+
+
+
+
+
+
+    @JsonIgnore
+    @ApiModelProperty(value = "资金账户余额", example = "", hidden = true)
+    @MoneyOutConvert
+    private BigDecimal fundingAccountBalance;
+    @JsonIgnore
+    @ApiModelProperty(value = "资金可用余额", example = "", hidden = true)
+    @MoneyOutConvert
+    private BigDecimal fundingUsableBalance;
+    @JsonIgnore
+    @ApiModelProperty(value = "资金冻结余额", example = "", hidden = true)
+    @MoneyOutConvert
+    private BigDecimal fundingFrozenBalance;
+    @JsonIgnore
+    @ApiModelProperty(value = "虚拟币账户余额", example = "", hidden = true)
+    @MoneyOutConvert
+    private BigDecimal virtuallyAccountBalance;
+    @JsonIgnore
+    @ApiModelProperty(value = "虚拟币可用余额", example = "", hidden = true)
+    @MoneyOutConvert
+    private BigDecimal virtuallyUsableBalance;
+    @JsonIgnore
+    @ApiModelProperty(value = "虚拟币冻结余额", example = "", hidden = true)
+    @MoneyOutConvert
+    private BigDecimal virtuallyFrozenBalance;
+
+    @JsonIgnore
+    @ApiModelProperty(value = "资金欠款", example = "1.23", hidden = true)
+    @MoneyOutConvert
+    private BigDecimal fundingArrears;
+    @JsonIgnore
+    @ApiModelProperty(value = "虚拟币欠款", example = "1.23", hidden = true)
+    @MoneyOutConvert
+    private BigDecimal virtuallyArrears;
+
+}
\ No newline at end of file

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

@@ -5,6 +5,7 @@ import com.clx.performance.service.loan.OwnerLoanAccountApproveService;
 import com.clx.performance.service.loan.OwnerLoanAccountService;
 import com.clx.performance.service.loan.OwnerLoanRecordService;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanAccountVO;
+import com.clx.performance.vo.pc.loan.owner.OwnerAccountVO;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
@@ -49,8 +50,8 @@ public class OwnerLoanAccountController {
     @ApiOperation(value = "货主借款账户信息",notes = "<br>By:刘海泉")
     @GetMapping("/getOwnerLoanAccount")
     @UnitCovert(param = false)
-    public Result<OwnerLoanAccountVO> getOwnerLoanAccount() {
-        OwnerLoanAccountVO ownerLoanAccountVO = ownerLoanAccountService.getOwnerLoanAccount();
-        return Result.ok(ownerLoanAccountVO);
+    public Result<OwnerAccountVO> getOwnerLoanAccount() {
+        OwnerAccountVO ownerAccount = ownerLoanAccountService.getOwnerLoanAccount();
+        return Result.ok(ownerAccount);
     }
 }

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

@@ -8,6 +8,8 @@ import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanAccountParam;
 import com.clx.performance.service.loan.OwnerLoanAccountService;
 import com.clx.performance.struct.loan.OwnerLoanAccountStruct;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanAccountVO;
+import com.clx.performance.vo.pc.loan.owner.OwnerAccountVO;
+import com.msl.common.base.Optional;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
@@ -58,10 +60,14 @@ public class OwnerLoanAccountServiceImpl  implements OwnerLoanAccountService {
     }
 
     @Override
-    public OwnerLoanAccountVO getOwnerLoanAccount() {
+    public OwnerAccountVO getOwnerLoanAccount() {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
-        OwnerLoanAccount ownerLoanAccount  = ownerLoanAccountDao.getOneByField(OwnerLoanAccount :: getOwnerUserNo,loginUserInfo.getUserNo()).orElseThrow(
-                PerformanceResultEnum.DATA_NOT_FIND);
+        Optional<OwnerLoanAccount> optional = ownerLoanAccountDao.getOneByField(OwnerLoanAccount::getOwnerUserNo,
+                loginUserInfo.getUserNo());
+        if(!optional.isPresent()){
+            return OwnerAccountVO.builder().openAccount(0).build();
+        }
+        OwnerLoanAccount ownerLoanAccount  = optional.get();
         return  ownerLoanAccountStruct.convertVO(ownerLoanAccount);
     }
 }

performance-web/src/main/java/com/clx/performance/service/loan/OwnerLoanAccountService.java

@@ -3,6 +3,7 @@ package com.clx.performance.service.loan;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanAccountParam;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanAccountVO;
+import com.clx.performance.vo.pc.loan.owner.OwnerAccountVO;
 
 /**
  * @author kavin
@@ -15,5 +16,5 @@ public interface OwnerLoanAccountService {
 
     IPage<OwnerLoanAccountVO> pageOwnerLoanAccount(PageOwnerLoanAccountParam param);
 
-    OwnerLoanAccountVO getOwnerLoanAccount();
+    OwnerAccountVO getOwnerLoanAccount();
 }

performance-web/src/main/java/com/clx/performance/struct/loan/OwnerLoanAccountStruct.java

@@ -2,6 +2,7 @@ package com.clx.performance.struct.loan;
 
 import com.clx.performance.model.loan.OwnerLoanAccount;
 import com.clx.performance.vo.pc.OwnerLoanAccountVO;
+import com.clx.performance.vo.pc.loan.owner.OwnerAccountVO;
 import com.msl.common.utils.DateStructUtil;
 import org.mapstruct.Mapper;
 
@@ -13,6 +14,6 @@ public interface OwnerLoanAccountStruct {
 
     OwnerLoanAccountVO convert(OwnerLoanAccount account);
 
-    com.clx.performance.vo.pc.loan.carrier.OwnerLoanAccountVO convertVO(OwnerLoanAccount account);
+    OwnerAccountVO convertVO(OwnerLoanAccount account);
 
 }