Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverAccountController.java

 package com.clx.performance.controller.app;
 
+import com.clx.performance.service.settle.NetworkDriverAccountService;
 import com.clx.user.feign.PaymentServiceFeign;
 import com.clx.user.vo.feign.WalletResidueCardVO;
 import com.msl.common.convertor.aspect.UnitCovert;
@@ -23,17 +24,15 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "APP-司机资金管理")
 public class AppDriverAccountController {
 
-
-    private final PaymentServiceFeign paymentServiceFeign;
+    private final NetworkDriverAccountService networkDriverAccountService;
 
 
     @ApiOperation(value = "APP司机账户", notes = "<br>By:胡宇帆")
     @PostMapping("/account")
     @UnitCovert(param = false)
-    public Result<Object> account(@RequestParam(value = "userCode") Integer userCode) {
-        Long userNo = TokenUtil.getLoginUserInfo().getUserNo();
-        Result<WalletResidueCardVO> wallet = paymentServiceFeign.getWallet(userCode);
-        return Result.ok(wallet);
+    public Result<WalletResidueCardVO> account(@RequestParam(value = "userCode") Integer userCode) {
+        WalletResidueCardVO walletResidueCardVO = networkDriverAccountService.account(userCode);
+        return Result.ok(walletResidueCardVO);
     }
 
 }

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

@@ -10,7 +10,12 @@ import com.clx.performance.param.pc.PageNetworkAccountListParam;
 import com.clx.performance.param.pc.driver.NetworkDriverAccountParam;
 import com.clx.performance.service.settle.NetworkDriverAccountService;
 import com.clx.performance.vo.pc.NetworkDriverAccountVO;
+import com.clx.user.feign.PaymentServiceFeign;
+import com.clx.user.vo.feign.WalletResidueCardVO;
 import com.msl.common.base.Optional;
+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.springframework.stereotype.Service;
@@ -31,6 +36,8 @@ public class NetworkDriverAccountServiceImpl implements NetworkDriverAccountServ
 
     private final IdGenerateSnowFlake idGenerateSnowFlake;
 
+    private final PaymentServiceFeign paymentServiceFeign;
+
     @Override
     public IPage<NetworkDriverAccountVO> networkAccountList(PageNetworkAccountListParam param) {
         return networkDriverAccountDao.networkAccountList(param);
@@ -55,4 +62,19 @@ public class NetworkDriverAccountServiceImpl implements NetworkDriverAccountServ
                 .walletCode(walletCode).build();
         networkDriverAccountDao.saveEntity(entity);
     }
+
+    @Override
+    public WalletResidueCardVO account(Integer userCode) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+
+        Result<WalletResidueCardVO> result = paymentServiceFeign.getWallet(userCode);
+        WalletResidueCardVO data = result.getData();
+        NetworkDriverAccount account = networkDriverAccountDao.getOneByField(NetworkDriverAccount::getDriverUserNo, loginUserInfo.getUserNo()).get();
+
+        data.setAssetSum(data.getAssetSum().add(account.getAccountBalance().movePointLeft(2)));
+        data.setFrozen(new BigDecimal(data.getFrozen()).add(account.getFrozenBalance().movePointLeft(2)).longValue());
+        data.setResidue(new BigDecimal(data.getResidue()).add(account.getUsableBalance().movePointLeft(2)).longValue());
+
+        return data;
+    }
 }

performance-web/src/main/java/com/clx/performance/service/settle/NetworkDriverAccountService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.PageNetworkAccountListParam;
 import com.clx.performance.param.pc.driver.NetworkDriverAccountParam;
 import com.clx.performance.vo.pc.NetworkDriverAccountVO;
+import com.clx.user.vo.feign.WalletResidueCardVO;
 
 /**
  * @author kavin
@@ -15,4 +16,6 @@ public interface NetworkDriverAccountService {
     IPage<NetworkDriverAccountVO> networkAccountList(PageNetworkAccountListParam param);
 
     void createNetworkDriverAccount(NetworkDriverAccountParam param);
+
+    WalletResidueCardVO account(Integer userCode);
 }