资金管理相关代码

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

-package com.clx.settlement.params;
+package com.clx.performance.param.pc;
 
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModel;

performance-api/src/main/java/com/clx/settlement/params/PageOwnerAccountListParam.java → performance-api/src/main/java/com/clx/performance/param/pc/PageOwnerAccountListParam.java

-package com.clx.settlement.params;
+package com.clx.performance.param.pc;
 
 import com.msl.common.base.PageParam;
 import io.swagger.annotations.ApiModelProperty;

performance-api/src/main/java/com/clx/settlement/params/PageOwnerMarginAccountParam.java → performance-api/src/main/java/com/clx/performance/param/pc/PageOwnerMarginAccountParam.java

-package com.clx.settlement.params;
+package com.clx.performance.param.pc;
 
 import com.msl.common.base.PageParam;
 import io.swagger.annotations.ApiModelProperty;

performance-api/src/main/java/com/clx/settlement/params/PageOwnerPrepaidFreightAccountParam.java → performance-api/src/main/java/com/clx/performance/param/pc/PageOwnerPrepaidFreightAccountParam.java

-package com.clx.settlement.params;
+package com.clx.performance.param.pc;
 
 import com.msl.common.base.PageParam;
 import io.swagger.annotations.ApiModelProperty;

performance-api/src/main/java/com/clx/settlement/vo/pc/CarrierSettlementOwnerDetailVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/CarrierSettlementOwnerDetailVO.java

-package com.clx.settlement.vo.pc;
+package com.clx.performance.vo.pc;
 
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModel;

performance-api/src/main/java/com/clx/settlement/vo/pc/OwnerAccountRunningWaterRecordVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/OwnerAccountRunningWaterRecordVO.java

-package com.clx.settlement.vo.pc;
+package com.clx.performance.vo.pc;
 
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;

performance-api/src/main/java/com/clx/settlement/vo/pc/OwnerAccountVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/OwnerAccountVO.java

-package com.clx.settlement.vo.pc;
+package com.clx.performance.vo.pc;
 
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,7 +7,6 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.apache.poi.hpsf.Decimal;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 

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

 package com.clx.performance.controller.pc;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.PageOwnerAccountListParam;
+import com.clx.performance.param.pc.PageOwnerMarginAccountParam;
+import com.clx.performance.param.pc.PageOwnerPrepaidFreightAccountParam;
 import com.clx.performance.service.OwnerAccountService;
-import com.clx.settlement.params.PageOwnerAccountListParam;
-import com.clx.settlement.vo.pc.OwnerAccountRunningWaterRecordVO;
-import com.clx.settlement.vo.pc.OwnerAccountVO;
-import com.clx.settlement.params.PageOwnerMarginAccountParam;
-import com.clx.settlement.params.PageOwnerPrepaidFreightAccountParam;
+import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
+import com.clx.performance.vo.pc.OwnerAccountVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementOwnerController.java

 package com.clx.performance.controller.pc.carrier;
 
 import com.clx.performance.service.SettlementOwnerService;
-import com.clx.settlement.vo.pc.CarrierSettlementOwnerDetailVO;
+import com.clx.performance.vo.pc.CarrierSettlementOwnerDetailVO;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;

performance-web/src/main/java/com/clx/performance/dao/OwnerAccountDao.java

@@ -3,8 +3,8 @@ package com.clx.performance.dao;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.OwnerAccountMapper;
 import com.clx.performance.model.OwnerAccount;
-import com.clx.settlement.params.PageOwnerAccountListParam;
-import com.clx.settlement.vo.pc.OwnerAccountVO;
+import com.clx.performance.param.pc.PageOwnerAccountListParam;
+import com.clx.performance.vo.pc.OwnerAccountVO;
 import com.msl.common.dao.BaseDao;
 
 import java.util.List;

performance-web/src/main/java/com/clx/performance/dao/OwnerRunningWaterRecordDao.java

@@ -3,9 +3,9 @@ package com.clx.performance.dao;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.OwnerRunningWaterRecordMapper;
 import com.clx.performance.model.OwnerRunningWaterRecord;
-import com.clx.settlement.vo.pc.OwnerAccountRunningWaterRecordVO;
-import com.clx.settlement.params.PageOwnerMarginAccountParam;
-import com.clx.settlement.params.PageOwnerPrepaidFreightAccountParam;
+import com.clx.performance.param.pc.PageOwnerMarginAccountParam;
+import com.clx.performance.param.pc.PageOwnerPrepaidFreightAccountParam;
+import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
 import com.msl.common.dao.BaseDao;
 
 public interface OwnerRunningWaterRecordDao extends BaseDao<OwnerRunningWaterRecordMapper, OwnerRunningWaterRecord, Integer> {

performance-web/src/main/java/com/clx/performance/dao/impl/OwnerAccountDaoImpl.java

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.OwnerAccountDao;
 import com.clx.performance.mapper.OwnerAccountMapper;
 import com.clx.performance.model.OwnerAccount;
+import com.clx.performance.param.pc.PageOwnerAccountListParam;
 import com.clx.performance.struct.OwnerAccountStruct;
-import com.clx.settlement.params.PageOwnerAccountListParam;
-import com.clx.settlement.vo.pc.OwnerAccountVO;
+import com.clx.performance.vo.pc.OwnerAccountVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;

performance-web/src/main/java/com/clx/performance/dao/impl/OwnerRunningWaterRecordDaoImpl.java

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.OwnerRunningWaterRecordDao;
 import com.clx.performance.mapper.OwnerRunningWaterRecordMapper;
 import com.clx.performance.model.OwnerRunningWaterRecord;
-import com.clx.settlement.vo.pc.OwnerAccountRunningWaterRecordVO;
-import com.clx.settlement.params.PageOwnerMarginAccountParam;
-import com.clx.settlement.params.PageOwnerPrepaidFreightAccountParam;
+import com.clx.performance.param.pc.PageOwnerMarginAccountParam;
+import com.clx.performance.param.pc.PageOwnerPrepaidFreightAccountParam;
+import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 

performance-web/src/main/java/com/clx/performance/mapper/OwnerAccountMapper.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.OwnerAccount;
+import com.clx.performance.param.pc.PageOwnerAccountListParam;
 import com.clx.performance.sqlProvider.OwnerAccountSqlProvider;
-import com.clx.settlement.params.PageOwnerAccountListParam;
-import com.clx.settlement.vo.pc.OwnerAccountVO;
+import com.clx.performance.vo.pc.OwnerAccountVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.SelectProvider;
 

performance-web/src/main/java/com/clx/performance/mapper/OwnerRunningWaterRecordMapper.java

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.OwnerRunningWaterRecord;
+import com.clx.performance.param.pc.PageOwnerMarginAccountParam;
+import com.clx.performance.param.pc.PageOwnerPrepaidFreightAccountParam;
 import com.clx.performance.sqlProvider.OwnerRunningWaterRecordSqlProvider;
-import com.clx.settlement.vo.pc.OwnerAccountRunningWaterRecordVO;
-import com.clx.settlement.params.PageOwnerMarginAccountParam;
-import com.clx.settlement.params.PageOwnerPrepaidFreightAccountParam;
+import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.SelectProvider;
 

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

 package com.clx.performance.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.settlement.params.PageOwnerAccountListParam;
-import com.clx.settlement.vo.pc.OwnerAccountRunningWaterRecordVO;
-import com.clx.settlement.vo.pc.OwnerAccountVO;
-import com.clx.settlement.params.PageOwnerMarginAccountParam;
-import com.clx.settlement.params.PageOwnerPrepaidFreightAccountParam;
+import com.clx.performance.param.pc.PageOwnerAccountListParam;
+import com.clx.performance.param.pc.PageOwnerMarginAccountParam;
+import com.clx.performance.param.pc.PageOwnerPrepaidFreightAccountParam;
+import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
+import com.clx.performance.vo.pc.OwnerAccountVO;
 
 import java.util.List;
 

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

 package com.clx.performance.service;
 
 
-import com.clx.settlement.vo.pc.CarrierSettlementOwnerDetailVO;
+import com.clx.performance.vo.pc.CarrierSettlementOwnerDetailVO;
 
 /**
  * @author liruixin

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

@@ -3,12 +3,12 @@ package com.clx.performance.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.OwnerAccountDao;
 import com.clx.performance.dao.OwnerRunningWaterRecordDao;
+import com.clx.performance.param.pc.PageOwnerAccountListParam;
+import com.clx.performance.param.pc.PageOwnerMarginAccountParam;
+import com.clx.performance.param.pc.PageOwnerPrepaidFreightAccountParam;
 import com.clx.performance.service.OwnerAccountService;
-import com.clx.settlement.params.PageOwnerAccountListParam;
-import com.clx.settlement.vo.pc.OwnerAccountRunningWaterRecordVO;
-import com.clx.settlement.vo.pc.OwnerAccountVO;
-import com.clx.settlement.params.PageOwnerMarginAccountParam;
-import com.clx.settlement.params.PageOwnerPrepaidFreightAccountParam;
+import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
+import com.clx.performance.vo.pc.OwnerAccountVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -8,7 +8,7 @@ import com.clx.performance.model.SettlementOwner;
 import com.clx.performance.service.SettlementOwnerService;
 import com.clx.performance.struct.SettlementLogStruct;
 import com.clx.performance.struct.SettlementOwnerStruct;
-import com.clx.settlement.vo.pc.CarrierSettlementOwnerDetailVO;
+import com.clx.performance.vo.pc.CarrierSettlementOwnerDetailVO;
 import com.clx.settlement.vo.pc.SettlementLogVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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

 package com.clx.performance.sqlProvider;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.clx.settlement.params.PageOwnerAccountListParam;
+import com.clx.performance.param.pc.PageOwnerAccountListParam;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;

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

@@ -2,8 +2,8 @@ package com.clx.performance.sqlProvider;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.clx.performance.enums.OwnerAccountTypeEnum;
-import com.clx.settlement.params.PageOwnerMarginAccountParam;
-import com.clx.settlement.params.PageOwnerPrepaidFreightAccountParam;
+import com.clx.performance.param.pc.PageOwnerMarginAccountParam;
+import com.clx.performance.param.pc.PageOwnerPrepaidFreightAccountParam;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;

performance-web/src/main/java/com/clx/performance/struct/OwnerAccountStruct.java

 package com.clx.performance.struct;
 
-import com.clx.order.vo.feign.FeignAddressVO;
 import com.clx.performance.model.OwnerAccount;
-import com.clx.settlement.vo.pc.OwnerAccountVO;
+import com.clx.performance.vo.pc.OwnerAccountVO;
 import com.msl.common.utils.DateStructUtil;
 import com.msl.common.utils.DateUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
 
 import java.util.List;
 

performance-web/src/main/java/com/clx/performance/struct/SettlementOwnerStruct.java

@@ -2,7 +2,7 @@ package com.clx.performance.struct;
 
 import com.clx.performance.enums.SettlementOwnerEnum;
 import com.clx.performance.model.SettlementOwner;
-import com.clx.settlement.vo.pc.CarrierSettlementOwnerDetailVO;
+import com.clx.performance.vo.pc.CarrierSettlementOwnerDetailVO;
 import com.clx.settlement.vo.pc.SettlementMergeVO;
 import com.msl.common.utils.DateStructUtil;
 import com.msl.common.utils.DateUtils;