Merge remote-tracking branch 'origin/v12.2_upgradeFunction_20240424' into test

performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java

@@ -12,6 +12,7 @@ import com.clx.performance.vo.app.collect.AppCollectTruckVO;
 import com.clx.performance.vo.feign.FreightEstimateVO;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
 import com.clx.performance.vo.pc.OwnerAccountAllVO;
+import com.clx.performance.vo.pc.OwnerAccountArrearsVO;
 import com.clx.performance.vo.pc.OwnerLoanAccountVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRuleVO;
 import com.msl.common.result.Result;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Set;
 
@@ -115,4 +117,9 @@ public interface PerformanceFeign {
     @GetMapping(value = {"clx-performance/feign/owner/loanAccount"})
     Result<OwnerLoanAccountVO> loanAccount(@RequestParam Long userNo);
 
+    @GetMapping(value = {"clx-performance/feign/owner/accountArrearsInfo"})
+    Result<OwnerAccountArrearsVO> accountArrearsInfo(@RequestParam(value = "userNo") Long userNo,
+                                                     @RequestParam(value = "prepaidArrearsOrder") BigDecimal prepaidArrearsOrder,
+                                                     @RequestParam(value = "marginArrearsOrder") BigDecimal marginArrearsOrder);
+
 }

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

+package com.clx.performance.vo.pc;
+
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@Builder
+public class OwnerAccountArrearsVO {
+
+    @ApiModelProperty("当前预付账户未支付订单金额")
+    private BigDecimal prepaidArrearsOrderSumMoney;
+
+    @ApiModelProperty("当前保证金账户未支付订单金额")
+    private BigDecimal marginArrearsOrderSumMoney;
+
+    @ApiModelProperty("货主用户编码")
+    private Long userNo;
+}

performance-web/src/main/java/com/clx/performance/controller/feign/OwnerAccountFeignController.java

@@ -5,6 +5,7 @@ import com.clx.performance.param.pc.owner.FrozenAccountParam;
 import com.clx.performance.param.pc.owner.ThawAccountParam;
 import com.clx.performance.service.OwnerAccountService;
 import com.clx.performance.vo.pc.OwnerAccountAllVO;
+import com.clx.performance.vo.pc.OwnerAccountArrearsVO;
 import com.clx.performance.vo.pc.OwnerLoanAccountVO;
 import com.msl.common.result.Result;
 import io.swagger.annotations.ApiOperation;
@@ -13,6 +14,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+
 @Slf4j
 @RestController
 @RequestMapping("/feign/owner")
@@ -50,4 +53,14 @@ public class OwnerAccountFeignController {
     public Result<OwnerLoanAccountVO> loanAccount(@RequestParam Long userNo) {
         return Result.ok(ownerAccountService.loanAccount(userNo));
     }
+
+
+    @ApiOperation(value = "查询用户预付运费和保证金账户", notes = "<br>By:胡宇帆")
+    @GetMapping("/accountArrearsInfo")
+    public Result<OwnerAccountArrearsVO> accountArrearsInfo(@RequestParam(value = "userNo") Long userNo,
+                                                            @RequestParam(value = "prepaidArrearsOrder") BigDecimal prepaidArrearsOrder,
+                                                            @RequestParam(value = "marginArrearsOrder") BigDecimal marginArrearsOrder
+                                                            ) {
+        return Result.ok(ownerAccountService.accountArrearsInfo(userNo, prepaidArrearsOrder, marginArrearsOrder));
+    }
 }

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

@@ -13,14 +13,12 @@ import com.clx.performance.param.pc.*;
 import com.clx.performance.param.pc.owner.CreteAccountParam;
 import com.clx.performance.param.pc.owner.FrozenAccountParam;
 import com.clx.performance.param.pc.owner.ThawAccountParam;
-import com.clx.performance.vo.pc.OwnerAccountAllVO;
-import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
-import com.clx.performance.vo.pc.OwnerAccountVO;
-import com.clx.performance.vo.pc.OwnerLoanAccountVO;
+import com.clx.performance.vo.pc.*;
 import com.clx.user.param.pc.owner.UpdateOwnerBindCardFeignParam;
 import com.clx.user.vo.pc.owner.OwnerBindCardVO;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -106,4 +104,6 @@ public interface OwnerAccountService {
     OwnerLoanAccountVO loanAccount(Long userNo);
 
     OwnerAccountAllVO accountAllInfo(Long userNo);
+
+    OwnerAccountArrearsVO accountArrearsInfo(Long userNo, BigDecimal prepaidArrearsOrder, BigDecimal marginArrearsOrder);
 }

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

@@ -43,6 +43,7 @@ import com.clx.performance.utils.excel.ExcelData;
 import com.clx.performance.utils.excel.ExcelField;
 import com.clx.performance.utils.excel.ExcelSheet;
 import com.clx.performance.utils.excel.ExcelUtil;
+import com.clx.performance.vo.pc.*;
 import com.clx.performance.vo.feign.OwnerInfoVO;
 import com.clx.performance.vo.pc.OwnerAccountAllVO;
 import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
@@ -1271,4 +1272,22 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         return ownerAccountAllVO;
     }
 
+    @Override
+    public OwnerAccountArrearsVO accountArrearsInfo(Long userNo, BigDecimal prepaidArrearsOrder, BigDecimal marginArrearsOrder) {
+        List<OwnerAccount> accountList = ownerAccountDao.listByField(OwnerAccount::getOwnerUserNo, userNo);
+        OwnerAccountArrearsVO build = OwnerAccountArrearsVO.builder().build();
+        //查询保证金和预付运费欠多少金额
+        for (OwnerAccount ownerAccount : accountList) {
+            if (ownerAccount.getAccountType().equals(OwnerAccountEnum.AccountTypeStatus.MARGIN_ACCOUNT.getCode())) {
+                build.setMarginArrearsOrderSumMoney(ownerAccount.getUsableBalance().subtract(marginArrearsOrder));
+            }
+            if (ownerAccount.getAccountType().equals(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode())) {
+                build.setPrepaidArrearsOrderSumMoney(ownerAccount.getUsableBalance().subtract(prepaidArrearsOrder));
+            }
+        }
+
+
+        return build;
+    }
+
 }