获取结算平台收款账号

performance-api/src/main/java/com/clx/performance/enums/settle/SettlementOwnerEnum.java

@@ -49,7 +49,7 @@ public enum SettlementOwnerEnum {
     @Getter
     @AllArgsConstructor
     public enum Status {
-        TO_BE_OCKED(1, "待锁定"),
+        TO_BE_LOCKED(1, "待锁定"),
         TO_BE_ACCOUNT(2, "待对账"),
         OWNER_TO_BE_CONFIRMED(3, "待货主确认"),
         SHIPPER_TO_PAYMENT (4, "待货主付款"),

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/SettlementPlatformAccountVO.java

+package com.clx.performance.vo.pc.owner.settle;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class SettlementPlatformAccountVO {
+
+    @ApiModelProperty(value = "收款人", example = "收款人")
+    private String payee;
+
+    @ApiModelProperty(value = "收款银行", example = "浙江银行")
+    private String payeeBankName;
+
+    @ApiModelProperty(value = "收款银行卡卡号", example = "62213545878787")
+    private String payeeBankCardNo;
+
+    @ApiModelProperty(value = "付款银行", example = "浙江银行")
+    private String paymentBankName;
+
+    @ApiModelProperty(value = "付款银行卡卡号", example = "62213545878787")
+    private String paymentBankCardNo;
+
+
+}
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package com.clx.performance.controller.pc.owner;
 import com.clx.performance.param.pc.owner.OwnerConfirmSettlementParam;
 import com.clx.performance.service.settle.SettlementOwnerService;
 import com.clx.performance.vo.pc.carrier.settle.CarrierSettlementOwnerDetailVO;
+import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
@@ -41,5 +42,11 @@ public class OwnerSettlementOwnerController {
         return Result.ok();
     }
 
+    @ApiOperation(value = "获取结算平台收款账号",notes = "<br>By:李瑞新")
+    @GetMapping("/getSettlementPlatformAccount")
+    public Result<SettlementPlatformAccountVO> getSettlementPlatformAccount() {
+        return Result.ok(settlementOwnerService.getSettlementPlatformAccount());
+    }
+
 
 }

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

@@ -3,6 +3,9 @@ package com.clx.performance.dao;
 import com.clx.performance.mapper.OwnerBindCardRecordMapper;
 import com.clx.performance.model.OwnerBindCardRecord;
 import com.msl.common.dao.BaseDao;
+import org.apache.ibatis.annotations.Param;
 
 public interface OwnerBindCardRecordDao extends BaseDao<OwnerBindCardRecordMapper, OwnerBindCardRecord, Integer> {
+
+    OwnerBindCardRecord getOwnerBindCardByUserNo(@Param("userNo")Long userNo);
 }

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

@@ -8,4 +8,11 @@ import org.springframework.stereotype.Repository;
 
 @Repository
 public class OwnerBindCardRecordDaoImpl extends BaseDaoImpl<OwnerBindCardRecordMapper, OwnerBindCardRecord, Integer> implements OwnerBindCardRecordDao {
+    @Override
+    public OwnerBindCardRecord getOwnerBindCardByUserNo(Long userNo) {
+        return super.getOne(lQrWrapper()
+                .eq(OwnerBindCardRecord ::getOwnerUserNo,userNo)
+                .last("limit 1")
+        );
+    }
 }

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

 package com.clx.performance.dao.impl.settle;
 
 import com.clx.performance.dao.settle.SettlementDriverDao;
-import com.clx.performance.mapper.SettlementDriverMapper;
-import com.clx.performance.model.SettlementDriver;
+import com.clx.performance.mapper.settle.SettlementDriverMapper;
+import com.clx.performance.model.settle.SettlementDriver;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 

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

 package com.clx.performance.dao.impl.settle;
 
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
-import com.clx.performance.mapper.SettlementDriverDetailMapper;
-import com.clx.performance.model.SettlementDriverDetail;
+import com.clx.performance.mapper.settle.SettlementDriverDetailMapper;
+import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 

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

 package com.clx.performance.dao.impl.settle;
 
 import com.clx.performance.dao.settle.SettlementLogDao;
-import com.clx.performance.mapper.SettlementLogMapper;
-import com.clx.performance.model.SettlementLog;
+import com.clx.performance.mapper.settle.SettlementLogMapper;
+import com.clx.performance.model.settle.SettlementLog;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+
 /**
  * @Author: aiqinguo
  * @Description: 结算单日志

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

@@ -2,13 +2,14 @@ package com.clx.performance.dao.impl.settle;
 
 import com.clx.performance.dao.settle.SettlementOwnerDao;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
-import com.clx.performance.mapper.SettlementOwnerMapper;
-import com.clx.performance.model.SettlementOwner;
+import com.clx.performance.mapper.settle.SettlementOwnerMapper;
+import com.clx.performance.model.settle.SettlementOwner;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+
 /**
  * @Author: aiqinguo
  * @Description: 货主结算单

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

 package com.clx.performance.dao.impl.settle;
 
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
-import com.clx.performance.mapper.SettlementOwnerDetailMapper;
-import com.clx.performance.model.SettlementOwnerDetail;
+import com.clx.performance.mapper.settle.SettlementOwnerDetailMapper;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 

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

+package com.clx.performance.dao.impl.settle;
+
+
+import com.clx.performance.dao.settle.SettlementPlatformAccountDao;
+import com.clx.performance.mapper.settle.SettlementPlatformAccountMapper;
+import com.clx.performance.model.settle.SettlementPlatformAccount;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author liruixin
+ * Date 2023-10-13
+ * Time 13:55
+ */
+@Repository
+public class SettlementPlatformAccountDaoImpl extends BaseDaoImpl<SettlementPlatformAccountMapper, SettlementPlatformAccount, Integer> implements SettlementPlatformAccountDao {
+
+    @Override
+    public SettlementPlatformAccount getSettlementPlatformAccount() {
+        return super.getOne(lQrWrapper()
+                .eq(SettlementPlatformAccount::getStatus,0)
+                .orderByDesc(SettlementPlatformAccount::getId)
+                .last("limit 1")
+        );
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementDriverDao.java

 package com.clx.performance.dao.settle;
 
-import com.clx.performance.mapper.SettlementDriverMapper;
-import com.clx.performance.model.SettlementDriver;
+import com.clx.performance.mapper.settle.SettlementDriverMapper;
+import com.clx.performance.model.settle.SettlementDriver;
 import com.msl.common.dao.BaseDao;
 
 /**

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementDriverDetailDao.java

 package com.clx.performance.dao.settle;
 
-import com.clx.performance.mapper.SettlementDriverDetailMapper;
-import com.clx.performance.model.SettlementDriverDetail;
+import com.clx.performance.mapper.settle.SettlementDriverDetailMapper;
+import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.msl.common.dao.BaseDao;
 
 /**

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementLogDao.java

 package com.clx.performance.dao.settle;
 
-import com.clx.performance.mapper.SettlementLogMapper;
-import com.clx.performance.model.SettlementLog;
-import com.clx.performance.model.SettlementOwner;
+import com.clx.performance.mapper.settle.SettlementLogMapper;
+import com.clx.performance.model.settle.SettlementLog;
 import com.msl.common.dao.BaseDao;
 
 import java.util.List;
 
+
 /**
  * @Author: aiqinguo
  * @Description: 结算单日志

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDao.java

 package com.clx.performance.dao.settle;
 
-import com.clx.performance.mapper.SettlementOwnerMapper;
-import com.clx.performance.model.SettlementOwner;
+import com.clx.performance.mapper.settle.SettlementOwnerMapper;
+import com.clx.performance.model.settle.SettlementOwner;
 import com.msl.common.dao.BaseDao;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 
 public interface SettlementOwnerDao extends BaseDao<SettlementOwnerMapper, SettlementOwner, Integer> {
 
-    List<SettlementOwner> getMergeSettlementNos(String settlementNo);
+    List<SettlementOwner> getMergeSettlementNos(@Param("settlementNo")String settlementNo);
 
-    boolean updateStatusBySettlementNo(String settlementNo, Integer status);
+    boolean updateStatusBySettlementNo(@Param("settlementNo")String settlementNo, @Param("status")Integer status);
 
 }

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDetailDao.java

 package com.clx.performance.dao.settle;
 
-import com.clx.performance.mapper.SettlementOwnerDetailMapper;
-import com.clx.performance.model.SettlementOwnerDetail;
+import com.clx.performance.mapper.settle.SettlementOwnerDetailMapper;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.msl.common.dao.BaseDao;
 
+
 /**
  * @Author: aiqinguo
  * @Description: 货主运单计费明细

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementPlatformAccountDao.java

+package com.clx.performance.dao.settle;
+
+
+import com.clx.performance.mapper.settle.SettlementPlatformAccountMapper;
+import com.clx.performance.model.settle.SettlementPlatformAccount;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @author liruixin
+ * Date 2023-10-13
+ * Time 13:55
+ */
+public interface SettlementPlatformAccountDao extends BaseDao<SettlementPlatformAccountMapper, SettlementPlatformAccount, Integer> {
+
+    SettlementPlatformAccount getSettlementPlatformAccount();
+}

performance-web/src/main/java/com/clx/performance/mapper/SettlementDriverDetailMapper.java → performance-web/src/main/java/com/clx/performance/mapper/settle/SettlementDriverDetailMapper.java

-package com.clx.performance.mapper;
+package com.clx.performance.mapper.settle;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.clx.performance.model.SettlementDriverDetail;
+import com.clx.performance.model.settle.SettlementDriverDetail;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

performance-web/src/main/java/com/clx/performance/mapper/SettlementDriverMapper.java → performance-web/src/main/java/com/clx/performance/mapper/settle/SettlementDriverMapper.java

-package com.clx.performance.mapper;
+package com.clx.performance.mapper.settle;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.clx.performance.model.SettlementDriver;
+import com.clx.performance.model.settle.SettlementDriver;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

performance-web/src/main/java/com/clx/performance/mapper/SettlementLogMapper.java → performance-web/src/main/java/com/clx/performance/mapper/settle/SettlementLogMapper.java

-package com.clx.performance.mapper;
+package com.clx.performance.mapper.settle;
+
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.clx.performance.model.SettlementLog;
+import com.clx.performance.model.settle.SettlementLog;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

performance-web/src/main/java/com/clx/performance/mapper/SettlementOwnerDetailMapper.java → performance-web/src/main/java/com/clx/performance/mapper/settle/SettlementOwnerDetailMapper.java

-package com.clx.performance.mapper;
+package com.clx.performance.mapper.settle;
+
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.clx.performance.model.SettlementOwnerDetail;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

performance-web/src/main/java/com/clx/performance/mapper/SettlementOwnerMapper.java → performance-web/src/main/java/com/clx/performance/mapper/settle/SettlementOwnerMapper.java

-package com.clx.performance.mapper;
+package com.clx.performance.mapper.settle;
+
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.clx.performance.model.SettlementOwner;
+import com.clx.performance.model.settle.SettlementOwner;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

performance-web/src/main/java/com/clx/performance/mapper/settle/SettlementPlatformAccountMapper.java

+package com.clx.performance.mapper.settle;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.settle.SettlementPlatformAccount;
+
+/**
+ * @author liruixin
+ * Date 2023-10-13
+ * Time 13:55
+ */
+public interface SettlementPlatformAccountMapper extends BaseMapper<SettlementPlatformAccount> {
+}

performance-web/src/main/java/com/clx/performance/model/SettlementDriver.java → performance-web/src/main/java/com/clx/performance/model/settle/SettlementDriver.java

-package com.clx.performance.model;
+package com.clx.performance.model.settle;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

performance-web/src/main/java/com/clx/performance/model/SettlementDriverDetail.java → performance-web/src/main/java/com/clx/performance/model/settle/SettlementDriverDetail.java

-package com.clx.performance.model;
+package com.clx.performance.model.settle;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

performance-web/src/main/java/com/clx/performance/model/SettlementLog.java → performance-web/src/main/java/com/clx/performance/model/settle/SettlementLog.java

-package com.clx.performance.model;
+package com.clx.performance.model.settle;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

performance-web/src/main/java/com/clx/performance/model/SettlementOwner.java → performance-web/src/main/java/com/clx/performance/model/settle/SettlementOwner.java

-package com.clx.performance.model;
+package com.clx.performance.model.settle;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

performance-web/src/main/java/com/clx/performance/model/SettlementOwnerDetail.java → performance-web/src/main/java/com/clx/performance/model/settle/SettlementOwnerDetail.java

-package com.clx.performance.model;
+package com.clx.performance.model.settle;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

performance-web/src/main/java/com/clx/performance/model/settle/SettlementPlatformAccount.java

+package com.clx.performance.model.settle;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * @author liruixin
+ * Date 2023-10-13
+ * Time 13:55
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("settlement_platform_account")
+public class SettlementPlatformAccount  implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("card_holder")
+    @ApiModelProperty("持卡人")
+    private String cardHolder;
+
+    @TableField("bank_name")
+    @ApiModelProperty("银行名称")
+    private String bankName;
+
+    @TableField("bank_card_no")
+    @ApiModelProperty("银行卡卡号")
+    private String bankCardNo;
+
+    @TableField("status")
+    @ApiModelProperty("启用禁用状态 0-启用，1-禁用")
+    private Integer status;
+
+    @TableField("create_time")
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @TableField("modified_time")
+    @ApiModelProperty("修改时间")
+    private LocalDateTime modifiedTime;
+
+    @Override
+    @KeyColumn("id")
+    public Integer gainKey() {
+    return this.id;
+    }
+}

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

 package com.clx.performance.service.impl.settle;
 
 import com.clx.performance.dao.settle.SettlementLogDao;
-import com.clx.performance.model.SettlementLog;
+import com.clx.performance.model.settle.SettlementLog;
 import com.clx.performance.service.settle.SettlementLogService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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

 package com.clx.performance.service.impl.settle;
 
+import com.clx.performance.dao.OwnerBindCardRecordDao;
 import com.clx.performance.dao.settle.SettlementLogDao;
 import com.clx.performance.dao.settle.SettlementOwnerDao;
+import com.clx.performance.dao.settle.SettlementPlatformAccountDao;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
-import com.clx.performance.model.SettlementLog;
-import com.clx.performance.model.SettlementOwner;
+import com.clx.performance.model.OwnerBindCardRecord;
+import com.clx.performance.model.settle.SettlementLog;
+import com.clx.performance.model.settle.SettlementOwner;
+import com.clx.performance.model.settle.SettlementPlatformAccount;
 import com.clx.performance.service.settle.SettlementOwnerService;
 import com.clx.performance.struct.settle.SettlementLogStruct;
 import com.clx.performance.struct.settle.SettlementOwnerStruct;
 import com.clx.performance.vo.pc.carrier.settle.CarrierSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.carrier.settle.SettlementLogVO;
+import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
 import com.msl.common.exception.ServiceSystemException;
+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;
@@ -37,6 +44,10 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
 
     private final SettlementLogStruct settlementLogStruct;
 
+    private final SettlementPlatformAccountDao settlementPlatformAccountDao;
+
+    private final OwnerBindCardRecordDao ownerBindCardRecordDao;
+
 
     @Override
     public CarrierSettlementOwnerDetailVO getCarrierSettlementOwnerDetail(Integer id) {
@@ -68,4 +79,26 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         //更新状态为待货主付款
         settlementOwnerDao.updateStatusBySettlementNo(settlementOwner.getSettlementNo(),SettlementOwnerEnum.Status.SHIPPER_TO_PAYMENT.getCode());
     }
+
+    @Override
+    public SettlementPlatformAccountVO getSettlementPlatformAccount() {
+        //平台账号
+        SettlementPlatformAccount platformAccount = settlementPlatformAccountDao.getSettlementPlatformAccount();
+        //返回对象
+        SettlementPlatformAccountVO vo = new SettlementPlatformAccountVO();
+        if(Objects.nonNull(platformAccount)){
+            vo.setPayee(platformAccount.getCardHolder());
+            vo.setPayeeBankCardNo(platformAccount.getBankCardNo());
+            vo.setPayeeBankName(platformAccount.getBankName());
+        }
+
+        //当前账号
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        OwnerBindCardRecord card = ownerBindCardRecordDao.getOwnerBindCardByUserNo(loginUserInfo.getUserNo());
+        if(Objects.nonNull(card)){
+            vo.setPaymentBankCardNo(card.getBankCardNumber());
+            vo.setPaymentBankName(card.getAccountBankName());
+        }
+        return vo;
+    }
 }

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

+package com.clx.performance.service.impl.settle;
+
+import com.clx.performance.service.settle.SettlementPlatformAccountService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author liruixin
+ * Date 2023-10-13
+ * Time 13:55
+ */
+@Service
+public class SettlementPlatformAccountServiceImpl  implements SettlementPlatformAccountService {
+}

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

@@ -2,6 +2,7 @@ package com.clx.performance.service.settle;
 
 
 import com.clx.performance.vo.pc.carrier.settle.CarrierSettlementOwnerDetailVO;
+import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
 
 /**
  * @author liruixin
@@ -13,4 +14,6 @@ public interface SettlementOwnerService {
     CarrierSettlementOwnerDetailVO getCarrierSettlementOwnerDetail(Integer id);
 
     void updateConfirmSettlement(Integer id);
+
+    SettlementPlatformAccountVO getSettlementPlatformAccount();
 }

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

+package com.clx.performance.service.settle;
+
+
+
+/**
+ * @author liruixin
+ * Date 2023-10-13
+ * Time 13:55
+ */
+public interface SettlementPlatformAccountService {
+}

performance-web/src/main/java/com/clx/performance/struct/settle/SettlementLogStruct.java

 package com.clx.performance.struct.settle;
 
-import com.clx.performance.model.SettlementLog;
+
+import com.clx.performance.model.settle.SettlementLog;
 import com.clx.performance.vo.pc.carrier.settle.SettlementLogVO;
 import com.msl.common.utils.DateStructUtil;
 import com.msl.common.utils.DateUtils;

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

 package com.clx.performance.struct.settle;
 
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
-import com.clx.performance.model.SettlementOwner;
+import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.vo.pc.carrier.settle.CarrierSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.carrier.settle.SettlementMergeVO;
 import com.msl.common.utils.DateStructUtil;