xucaiqin преди 6 дни
родител
ревизия
c4835e4e07
променени са 19 файла, в които са добавени 30 реда и са изтрити 943 реда
  1. 0 1
      sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/WalletBusinessFileController.java
  2. 0 69
      sckw-modules/sckw-payment/src/main/java/com/sckw/payment/mapper/WalletBusinessFileMapper.java
  3. 3 41
      sckw-modules/sckw-payment/src/main/java/com/sckw/payment/mapper/WalletPayableApplyMapper.java
  4. 2 40
      sckw-modules/sckw-payment/src/main/java/com/sckw/payment/mapper/WalletPayableBalanceMapper.java
  5. 0 49
      sckw-modules/sckw-payment/src/main/java/com/sckw/payment/mapper/WalletPayableMapper.java
  6. 0 24
      sckw-modules/sckw-payment/src/main/java/com/sckw/payment/mapper/WalletPrepaidBalanceMapper.java
  7. 0 34
      sckw-modules/sckw-payment/src/main/java/com/sckw/payment/mapper/WalletPrepaidMapper.java
  8. 0 61
      sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/IWalletBusinessFileService.java
  9. 0 45
      sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/IWalletPayableBalanceService.java
  10. 0 49
      sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/impl/WalletBusinessFileServiceImpl.java
  11. 1 35
      sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/impl/WalletPayableBalanceServiceImpl.java
  12. 17 17
      sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/impl/WalletPayableServiceImpl.java
  13. 7 6
      sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/impl/WalletPrepaidServiceImpl.java
  14. 0 138
      sckw-modules/sckw-payment/src/main/resources/mapper/WalletBusinessFileMapper.xml
  15. 0 82
      sckw-modules/sckw-payment/src/main/resources/mapper/WalletPayableApplyMapper.xml
  16. 0 97
      sckw-modules/sckw-payment/src/main/resources/mapper/WalletPayableBalanceMapper.xml
  17. 0 93
      sckw-modules/sckw-payment/src/main/resources/mapper/WalletPayableMapper.xml
  18. 0 26
      sckw-modules/sckw-payment/src/main/resources/mapper/WalletPrepaidBalanceMapper.xml
  19. 0 36
      sckw-modules/sckw-payment/src/main/resources/mapper/WalletPrepaidMapper.xml

+ 0 - 1
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/WalletBusinessFileController.java

@@ -28,7 +28,6 @@ public class WalletBusinessFileController  {
     @Autowired
     private IWalletBusinessFileService walletBusinessFileService;
 
-
     /**
      * 查询凭证图片地址接口
      *

+ 0 - 69
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/mapper/WalletBusinessFileMapper.java

@@ -15,75 +15,6 @@ import java.util.List;
  */
 @Mapper
 public interface WalletBusinessFileMapper extends BaseMapper<WalletBusinessFile> {
-    /**
-     * 分页查询钱包_业务文件列表
-     *
-     * @param walletBusinessFile 钱包_业务文件
-     * @return 钱包_业务文件列表
-     */
-    List<WalletBusinessFile> selectWalletBusinessFileList(WalletBusinessFile walletBusinessFile);
-
-    /**
-     * 根据主键ID查询钱包_业务文件
-     *
-     * @param id 主键
-     * @return 钱包_业务文件
-     */
-    WalletBusinessFile selectWalletBusinessFileById(@Param("id") Long id);
-
-    /**
-     * 根据主键ID列表查询钱包_业务文件列表
-     *
-     * @param idList 主键列表
-     * @return 列表数据
-     */
-    List<WalletBusinessFile> selectWalletBusinessFileByIds(@Param("idList") List<Long> idList);
-
-    /**
-     * 新增钱包_业务文件
-     *
-     * @param walletBusinessFile 钱包_业务文件
-     * @return 结果数据
-     */
-    int insertWalletBusinessFile(WalletBusinessFile walletBusinessFile);
-
-    /**
-     * @desc: 批量插入
-     */
-    void insertBatch(@Param(value = "list") List<WalletBusinessFile> list);
-
-    /**
-     * 修改钱包_业务文件
-     *
-     * @param walletBusinessFile 钱包_业务文件
-     * @return 结果数据
-     */
-    int updateWalletBusinessFile(WalletBusinessFile walletBusinessFile);
-
-    /**
-     * 删除钱包_业务文件
-     *
-     * @param id 主键
-     * @return 结果数据
-     */
-    int deleteWalletBusinessFileById(@Param("id") Long id);
-
-    /**
-     * 批量删除钱包_业务文件
-     *
-     * @param idList 主键列表
-     * @return 结果数据
-     */
-    int deleteWalletBusinessFileByIds(@Param("idList") List<Long> idList);
-
-    /**
-     * 批量逻辑删除钱包_业务文件
-     *
-     * @param idList 主键列表
-     * @param loginName 登录用户名
-     * @return 结果数据
-     */
-    int deleteWalletBusinessFileLogicByIds(@Param("idList") List<Long> idList, @Param("loginName") String loginName);
 
     List<String> selectFileByBusinessId(@Param("businessId") String businessId);
 }

+ 3 - 41
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/mapper/WalletPayableApplyMapper.java

@@ -1,5 +1,6 @@
 package com.sckw.payment.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.payment.entity.WalletPayableApply;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -10,10 +11,10 @@ import java.util.List;
  * 运费申请付款记录Mapper接口
  *
  * @author tangys
- * @since  2026-01-19 16:13:22
+ * @since 2026-01-19 16:13:22
  */
 @Mapper
-public interface WalletPayableApplyMapper {
+public interface WalletPayableApplyMapper extends BaseMapper<WalletPayableApply> {
     /**
      * 分页查询运费申请付款记录列表
      *
@@ -48,44 +49,5 @@ public interface WalletPayableApplyMapper {
      */
     List<WalletPayableApply> selectPayableApplyByPayableId(@Param("payableId") Long payableId);
 
-    /**
-     * 新增运费申请记录
-     *
-     * @param walletPayableApply 运费申请记录
-     * @return 结果数据
-     */
-    int insertWalletPayableApply(WalletPayableApply walletPayableApply);
-
-    /**
-     * 修改运费申请记录
-     *
-     * @param walletPayableApply 运费申请记录
-     * @return 结果数据
-     */
-    int updateWalletPayableApply(WalletPayableApply walletPayableApply);
 
-    /**
-     * 删除运费申请记录
-     *
-     * @param id 运费申请记录主键id
-     * @return 结果数据
-     */
-    int deleteWalletPayableApplyById(@Param("id") Long id);
-
-    /**
-     * 批量删除运费申请记录
-     *
-     * @param idList 运费申请记录主键id列表
-     * @return 结果数据
-     */
-    int deleteWalletPayableApplyByIds(@Param("idList") List<Long> idList);
-
-    /**
-     * 批量逻辑删除运费申请记录
-     *
-     * @param idList 运费申请记录主键id列表
-     * @param loginName 登录用户名
-     * @return 结果数据
-     */
-    int deleteWalletPayableApplyLogicByIds(@Param("idList") List<Long> idList, @Param("loginName") String loginName);
 }

+ 2 - 40
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/mapper/WalletPayableBalanceMapper.java

@@ -1,5 +1,6 @@
 package com.sckw.payment.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.payment.entity.WalletPayableBalance;
 import com.sckw.payment.pojo.vo.req.WalletPayableBalanceQuery;
 import com.sckw.payment.pojo.vo.req.WalletPayableDto;
@@ -15,7 +16,7 @@ import java.util.List;
  * @since  2026-01-12 16:24:22
  */
 @Mapper
-public interface WalletPayableBalanceMapper {
+public interface WalletPayableBalanceMapper extends BaseMapper<WalletPayableBalance> {
     /**
      * 分页查询托运企业待付运费余额明细列表
      *
@@ -41,44 +42,5 @@ public interface WalletPayableBalanceMapper {
      */
     List<WalletPayableBalance> selectWalletPayableBalanceByIds(@Param("idList") List<Long> idList);
 
-    /**
-     * 新增托运企业待付运费余额明细
-     *
-     * @param walletPayableBalance 托运企业待付运费余额明细
-     * @return 结果数据
-     */
-    int insertWalletPayableBalance(WalletPayableBalance walletPayableBalance);
 
-    /**
-     * 修改托运企业待付运费余额明细
-     *
-     * @param walletPayableBalance 托运企业待付运费余额明细
-     * @return 结果数据
-     */
-    int updateWalletPayableBalance(WalletPayableBalance walletPayableBalance);
-
-    /**
-     * 删除托运企业待付运费余额明细
-     *
-     * @param id 待付运费余额明细主键id
-     * @return 结果数据
-     */
-    int deleteWalletPayableBalanceById(@Param("id") Long id);
-
-    /**
-     * 批量删除托运企业待付运费余额明细
-     *
-     * @param idList 待付运费余额明细主键id列表
-     * @return 结果数据
-     */
-    int deleteWalletPayableBalanceByIds(@Param("idList") List<Long> idList);
-
-    /**
-     * 批量逻辑删除托运企业待付运费余额明细
-     *
-     * @param idList 待付运费余额明细主键id列表
-     * @param loginName 登录用户名
-     * @return 结果数据
-     */
-    int deleteWalletPayableBalanceLogicByIds(@Param("idList") List<Long> idList, @Param("loginName") String loginName);
 }

+ 0 - 49
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/mapper/WalletPayableMapper.java

@@ -25,14 +25,6 @@ public interface WalletPayableMapper extends BaseMapper<WalletPayable> {
      */
     List<WalletPayable> selectWalletPayableList(WalletPayableQuery query);
 
-    /**
-     * 根据主键ID查询待付运费清单
-     *
-     * @param id 待付运费清单主键id
-     * @return 待付运费清单
-     */
-    WalletPayable selectWalletPayableById(@Param("id") Long id);
-
     /**
      * 根据主键ID列表查询待付运费清单列表
      *
@@ -41,47 +33,6 @@ public interface WalletPayableMapper extends BaseMapper<WalletPayable> {
      */
     List<WalletPayable> selectWalletPayableByIds(@Param("idList") List<Long> idList);
 
-    /**
-     * 新增待付运费清单
-     *
-     * @param walletPayable 待付运费清单
-     * @return 结果数据
-     */
-    int insertWalletPayable(WalletPayable walletPayable);
-
-    /**
-     * 修改待付运费清单
-     *
-     * @param walletPayable 待付运费清单
-     * @return 结果数据
-     */
-    int updateWalletPayable(WalletPayable walletPayable);
-
-    /**
-     * 删除待付运费清单
-     *
-     * @param id 待付运费清单主键id
-     * @return 结果数据
-     */
-    int deleteWalletPayableById(@Param("id") Long id);
-
-    /**
-     * 批量删除待付运费清单
-     *
-     * @param idList 待付运费清单主键id列表
-     * @return 结果数据
-     */
-    int deleteWalletPayableByIds(@Param("idList") List<Long> idList);
-
-    /**
-     * 批量逻辑删除待付运费清单
-     *
-     * @param idList   待付运费清单主键id列表
-     * @param updateBy 登录用户名
-     * @return 结果数据
-     */
-    int deleteWalletPayableLogicByIds(@Param("idList") List<Long> idList, @Param("updateBy") Long updateBy);
-
     WalletPayable selectByConsignAndCarrier(@Param("consignEntId") Long consignEntId, @Param("carrierEntId") Long carrierEntId);
 
     WalletPayableSummary selectPayableSummary(WalletPayableQuery query);

+ 0 - 24
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/mapper/WalletPrepaidBalanceMapper.java

@@ -44,28 +44,4 @@ public interface WalletPrepaidBalanceMapper extends BaseMapper<WalletPrepaidBala
     List<WalletPrepaidBalance> selectWalletPrepaidBalanceByIds(@Param("idList") List<Long> idList);
 
 
-    /**
-     * 删除采购企业预付余额明细
-     *
-     * @param id 预付余额明细主键id
-     * @return 结果数据
-     */
-    int deleteWalletPrepaidBalanceById(@Param("id") Long id);
-
-    /**
-     * 批量删除采购企业预付余额明细
-     *
-     * @param idList 预付余额明细主键id列表
-     * @return 结果数据
-     */
-    int deleteWalletPrepaidBalanceByIds(@Param("idList") List<Long> idList);
-
-    /**
-     * 批量逻辑删除采购企业预付余额明细
-     *
-     * @param idList 预付余额明细主键id列表
-     * @param updateBy 登录用户名
-     * @return 结果数据
-     */
-    int deleteWalletPrepaidBalanceLogicByIds(@Param("idList") List<Long> idList, @Param("updateBy") Long updateBy);
 }

+ 0 - 34
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/mapper/WalletPrepaidMapper.java

@@ -35,14 +35,6 @@ public interface WalletPrepaidMapper extends BaseMapper<WalletPrepaid> {
      */
     BigDecimal selectAllSupplierPrepaidSummary();
 
-    /**
-     * 根据主键ID查询预付清单
-     *
-     * @param id 预付清单主键id
-     * @return 预付清单
-     */
-    WalletPrepaid selectWalletPrepaidById(@Param("id") Long id);
-
     WalletPrepaid selectByProEntIdAndSupEntId(@Param("proEntId") Long proEntId, @Param("supEntId") Long supEntId);
 
     /**
@@ -52,30 +44,4 @@ public interface WalletPrepaidMapper extends BaseMapper<WalletPrepaid> {
      * @return 列表数据
      */
     List<WalletPrepaid> selectWalletPrepaidByIds(@Param("idList") List<Long> idList);
-
-
-    /**
-     * 删除预付清单
-     *
-     * @param id 预付清单主键id
-     * @return 结果数据
-     */
-    int deleteWalletPrepaidById(@Param("id") Long id);
-
-    /**
-     * 批量删除预付清单
-     *
-     * @param idList 预付清单主键id列表
-     * @return 结果数据
-     */
-    int deleteWalletPrepaidByIds(@Param("idList") List<Long> idList);
-
-    /**
-     * 批量逻辑删除预付清单
-     *
-     * @param idList 预付清单主键id列表
-     * @param updateBy 登录用户名
-     * @return 结果数据
-     */
-    int deleteWalletPrepaidLogicByIds(@Param("idList") List<Long> idList, @Param("updateBy") Long updateBy);
 }

+ 0 - 61
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/IWalletBusinessFileService.java

@@ -3,7 +3,6 @@ package com.sckw.payment.service;
 import com.sckw.payment.entity.WalletBusinessFile;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 钱包_业务文件Service接口
@@ -12,69 +11,9 @@ import java.util.Map;
  * @since  2026-01-12 14:11:22
  */
 public interface IWalletBusinessFileService {
-    /**
-     * 分页查询钱包_业务文件列表
-     *
-     * @param walletBusinessFile 钱包_业务文件
-     * @return 钱包_业务文件列表
-     */
-    List<WalletBusinessFile> selectWalletBusinessFileList(WalletBusinessFile walletBusinessFile);
 
     List<String> selectFileByBusinessId(String businessId);
 
-    /**
-     * 查询钱包_业务文件
-     *
-     * @param id 主键
-     * @return 钱包_业务文件
-     */
-    WalletBusinessFile selectWalletBusinessFileById(Long id);
 
-    /**
-     * 根据主键ID列表查询钱包_业务文件列表
-     *
-     * @param idList 主键列表
-     * @return 列表数据
-     */
-    List<WalletBusinessFile> selectWalletBusinessFileByIds(List<Long> idList);
 
-    /**
-     * 根据主键ID列表查询钱包_业务文件集合
-     *
-     * @param idList 主键列表
-     * @return Map<主键, 钱包_业务文件>
-     */
-    Map<Long, WalletBusinessFile> mapWalletBusinessFileByIds(List<Long> idList);
-
-    /**
-     * 新增钱包_业务文件
-     *
-     * @param walletBusinessFile 钱包_业务文件
-     * @return 结果数据
-     */
-    int insertWalletBusinessFile(WalletBusinessFile walletBusinessFile);
-
-    /**
-     * 修改钱包_业务文件
-     *
-     * @param walletBusinessFile 钱包_业务文件
-     * @return 结果数据
-     */
-    int updateWalletBusinessFile(WalletBusinessFile walletBusinessFile);
-
-    /**
-     * 删除钱包_业务文件
-     *
-     * @param id 主键
-     * @return 结果数据
-     */
-    int deleteWalletBusinessFileById(Long id);
-
-    /**
-     * 批量删除钱包_业务文件
-     *
-     * @param idList 主键列表
-     * @return 结果数据
-     */
-    int deleteWalletBusinessFileByIds(List<Long> idList);
 }

+ 0 - 45
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/IWalletPayableBalanceService.java

@@ -23,13 +23,6 @@ public interface IWalletPayableBalanceService {
      */
     PageInfo<WalletPayableBalanceRes> selectWalletPayableBalanceList(WalletPayableBalanceQuery query);
 
-    /**
-     * 查询托运企业待付运费余额明细
-     *
-     * @param id 待付运费余额明细主键id
-     * @return 托运企业待付运费余额明细
-     */
-    WalletPayableBalance selectWalletPayableBalanceById(Long id);
 
     /**
      * 根据主键ID列表查询托运企业待付运费余额明细列表
@@ -39,44 +32,6 @@ public interface IWalletPayableBalanceService {
      */
     List<WalletPayableBalance> selectWalletPayableBalanceByIds(List<Long> idList);
 
-    /**
-     * 根据主键ID列表查询托运企业待付运费余额明细集合
-     *
-     * @param idList 待付运费余额明细主键id列表
-     * @return Map<待付运费余额明细主键id, 托运企业待付运费余额明细>
-     */
-    Map<Long, WalletPayableBalance> mapWalletPayableBalanceByIds(List<Long> idList);
-
-    /**
-     * 新增托运企业待付运费余额明细
-     *
-     * @param walletPayableBalance 托运企业待付运费余额明细
-     * @return 结果数据
-     */
-    int insertWalletPayableBalance(WalletPayableBalance walletPayableBalance);
 
-    /**
-     * 修改托运企业待付运费余额明细
-     *
-     * @param walletPayableBalance 托运企业待付运费余额明细
-     * @return 结果数据
-     */
-    int updateWalletPayableBalance(WalletPayableBalance walletPayableBalance);
-
-    /**
-     * 删除托运企业待付运费余额明细
-     *
-     * @param id 待付运费余额明细主键id
-     * @return 结果数据
-     */
-    int deleteWalletPayableBalanceById(Long id);
-
-    /**
-     * 批量删除托运企业待付运费余额明细
-     *
-     * @param idList 待付运费余额明细主键id列表
-     * @return 结果数据
-     */
-    int deleteWalletPayableBalanceByIds(List<Long> idList);
 
 }

+ 0 - 49
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/impl/WalletBusinessFileServiceImpl.java

@@ -24,60 +24,11 @@ public class WalletBusinessFileServiceImpl implements IWalletBusinessFileService
     @Autowired
     private WalletBusinessFileMapper walletBusinessFileMapper;
 
-    @Override
-    public List<WalletBusinessFile> selectWalletBusinessFileList(WalletBusinessFile walletBusinessFile) {
-        return walletBusinessFileMapper.selectWalletBusinessFileList(walletBusinessFile);
-    }
 
     @Override
     public List<String> selectFileByBusinessId(String businessId) {
         return walletBusinessFileMapper.selectFileByBusinessId(businessId);
     }
 
-    @Override
-    public WalletBusinessFile selectWalletBusinessFileById(Long id) {
-        return walletBusinessFileMapper.selectWalletBusinessFileById(id);
-    }
 
-    @Override
-    public List<WalletBusinessFile> selectWalletBusinessFileByIds(List<Long> idList) {
-        idList = Optional.ofNullable(idList).orElse(Collections.emptyList()).stream().filter(Objects::nonNull).distinct().collect(Collectors.toList());
-        if (CollUtil.isEmpty(idList)) {
-            return Collections.emptyList();
-        }
-        return walletBusinessFileMapper.selectWalletBusinessFileByIds(idList);
-    }
-
-    @Override
-    public Map<Long, WalletBusinessFile> mapWalletBusinessFileByIds(List<Long> idList) {
-        List<WalletBusinessFile> list = selectWalletBusinessFileByIds(idList);
-        return Optional.ofNullable(list).orElse(Collections.emptyList()).stream().collect(Collectors.toMap(WalletBusinessFile::getId, WalletBusinessFile -> WalletBusinessFile));
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int insertWalletBusinessFile(WalletBusinessFile walletBusinessFile) {
-        return walletBusinessFileMapper.insertWalletBusinessFile(walletBusinessFile);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int updateWalletBusinessFile(WalletBusinessFile walletBusinessFile) {
-        return walletBusinessFileMapper.updateWalletBusinessFile(walletBusinessFile);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int deleteWalletBusinessFileById(Long id) {
-        return walletBusinessFileMapper.deleteWalletBusinessFileById(id);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int deleteWalletBusinessFileByIds(List<Long> idList) {
-        if (CollUtil.isEmpty(idList)) {
-            return 0;
-        }
-        return walletBusinessFileMapper.deleteWalletBusinessFileByIds(idList);
-    }
 }

+ 1 - 35
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/impl/WalletPayableBalanceServiceImpl.java

@@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
@@ -81,10 +80,7 @@ public class WalletPayableBalanceServiceImpl implements IWalletPayableBalanceSer
         return pageInfo;
     }
 
-    @Override
-    public WalletPayableBalance selectWalletPayableBalanceById(Long id) {
-        return walletPayableBalanceMapper.selectWalletPayableBalanceById(id);
-    }
+
 
     @Override
     public List<WalletPayableBalance> selectWalletPayableBalanceByIds(List<Long> idList) {
@@ -95,36 +91,6 @@ public class WalletPayableBalanceServiceImpl implements IWalletPayableBalanceSer
         return walletPayableBalanceMapper.selectWalletPayableBalanceByIds(idList);
     }
 
-    @Override
-    public Map<Long, WalletPayableBalance> mapWalletPayableBalanceByIds(List<Long> idList) {
-        List<WalletPayableBalance> list = selectWalletPayableBalanceByIds(idList);
-        return Optional.ofNullable(list).orElse(Collections.emptyList()).stream().collect(Collectors.toMap(WalletPayableBalance::getId, WalletPayableBalance -> WalletPayableBalance));
-    }
 
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int insertWalletPayableBalance(WalletPayableBalance walletPayableBalance) {
-        return walletPayableBalanceMapper.insertWalletPayableBalance(walletPayableBalance);
-    }
 
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int updateWalletPayableBalance(WalletPayableBalance walletPayableBalance) {
-        return walletPayableBalanceMapper.updateWalletPayableBalance(walletPayableBalance);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int deleteWalletPayableBalanceById(Long id) {
-        return walletPayableBalanceMapper.deleteWalletPayableBalanceById(id);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int deleteWalletPayableBalanceByIds(List<Long> idList) {
-        if (CollUtil.isEmpty(idList)) {
-            return 0;
-        }
-        return walletPayableBalanceMapper.deleteWalletPayableBalanceByIds(idList);
-    }
 }

+ 17 - 17
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/impl/WalletPayableServiceImpl.java

@@ -125,18 +125,18 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
         int result = manualEntryFreight(payable, payableManualDto);
         //2.保存待付/代收运费明细
         WalletPayableBalance payableBalance = buildWalletManualPayableBalance(payable, payableManualDto);
-        walletPayableBalanceMapper.insertWalletPayableBalance(payableBalance);
+        walletPayableBalanceMapper.insert(payableBalance);
         //3.保存凭证相关文件
         List<String> voucherFiles = payableManualDto.getVoucherFiles();
         if (!CollectionUtils.isEmpty(voucherFiles)) {
-            List<WalletBusinessFile> list = new ArrayList<>(voucherFiles.size());
             voucherFiles.forEach(e -> {
                 WalletBusinessFile file = new WalletBusinessFile();
                 file.setBusinessId(payableBalance.getId());
                 file.setFilePath(e);
-                list.add(file);
+                file.setCreateBy(LoginUserHolder.getUserId());
+                file.setCreateTime(LocalDateTime.now());
+                businessFileMapper.insert(file);
             });
-            businessFileMapper.insertBatch(list);
         }
         return result;
     }
@@ -154,7 +154,7 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
                 //付款中运费
                 existedPayable.setPayingFreight(existedPayable.getPayingFreight().add(payableManualDto.getTradeAmount()));
             }
-            result = walletPayableMapper.updateWalletPayable(existedPayable);
+            result = walletPayableMapper.updateById(existedPayable);
             BeanUtils.copyProperties(existedPayable, payable);
         } else {
             // 如果不存在,则新增一条待履约/预付数据
@@ -165,7 +165,7 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
                 payable.setFreight(payableManualDto.getTradeAmount());
                 payable.setTradingFreight(BigDecimal.ZERO);
                 payable.setPayingFreight(BigDecimal.ZERO);
-                result = walletPayableMapper.insertWalletPayable(payable);
+                result = walletPayableMapper.insert(payable);
             }
         }
         return result;
@@ -201,7 +201,7 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
             payable.setFreight(payableAddDto.getTradeAmount());
             payable.setTradingFreight(payableAddDto.getTradeAmount());
             payable.setPayingFreight(payableAddDto.getTradeAmount());
-            result = walletPayableMapper.insertWalletPayable(payable);
+            result = walletPayableMapper.insert(payable);
         }
         return result;
     }
@@ -243,9 +243,9 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
             //其他
             throw new BusinessException("交易类型不支持");
         }
-        result = walletPayableMapper.updateWalletPayable(existedPayable);
+        result = walletPayableMapper.updateById(existedPayable);
         WalletPayableBalance payableBalance = buildWalletUpdatePayableBalance(existedPayable, payableUpdateDto);
-        walletPayableBalanceMapper.insertWalletPayableBalance(payableBalance);
+        walletPayableBalanceMapper.insert(payableBalance);
         return result;
     }
 
@@ -271,7 +271,7 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
     public int applyPay(WalletPayableApplyPayDto applyPayDto) {
         //todo 校验验证码
         //根据运费清单查询待付代收运费记录
-        WalletPayable walletPayable = walletPayableMapper.selectWalletPayableById(applyPayDto.getPayableId());
+        WalletPayable walletPayable = walletPayableMapper.selectById(applyPayDto.getPayableId());
         //非空校验
         if (walletPayable == null) {
             throw new BusinessException("待付/代收运费清单不存在");
@@ -282,14 +282,14 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
         }
         walletPayable.setFreight(walletPayable.getFreight().subtract(applyPayDto.getApplyAmount()));
         walletPayable.setPayingFreight(walletPayable.getPayingFreight().add(applyPayDto.getApplyAmount()));
-        walletPayableMapper.updateWalletPayable(walletPayable);
+        walletPayableMapper.updateById(walletPayable);
         //构建申请付款记录
         WalletPayableApply payableApply = buildWalletPayableApply(walletPayable, applyPayDto);
         //新增待付代收运费明细
         WalletPayableBalance payableBalance = buildWalletApplyPayableBalance(walletPayable, payableApply);
-        walletPayableBalanceMapper.insertWalletPayableBalance(payableBalance);
+        walletPayableBalanceMapper.insert(payableBalance);
         //插入申请付款记录
-        return walletPayableApplyMapper.insertWalletPayableApply(payableApply);
+        return walletPayableApplyMapper.insert(payableApply);
     }
 
     private WalletPayableBalance buildWalletApplyPayableBalance(WalletPayable payable, WalletPayableApply freightApply) {
@@ -343,7 +343,7 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
         walletPayablePayMapper.insert(walletPayablePay);
         //修改申请记录
         payableApply.setPayingAmount(walletPayablePay.getApplyAmount());
-        walletPayableApplyMapper.updateWalletPayableApply(payableApply);
+        walletPayableApplyMapper.updateById(payableApply);
         WalletPayAddRes walletPayAddRes = new WalletPayAddRes();
         PayRes data = JSONObject.parseObject(walletPayablePay.getData(), PayRes.class);
         walletPayAddRes.setId(walletPayablePay.getId());
@@ -488,12 +488,12 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
         if (payableApply.getApplyAmount().compareTo(payableApply.getReceivedAmount()) == 0) {
             payableApply.setStatus(1);
         }
-        walletPayableApplyMapper.updateWalletPayableApply(payableApply);
+        walletPayableApplyMapper.updateById(payableApply);
         //5.运费清单付款中金额扣减
         walletPayable.setPayingFreight(walletPayable.getPayingFreight().subtract(receivedCallbackDto.getTranAmt()));
-        walletPayableMapper.updateWalletPayable(walletPayable);
+        walletPayableMapper.updateById(walletPayable);
         //6.运费明细插入记录
-        walletPayableBalanceMapper.insertWalletPayableBalance(buildWalletReceivedPayableBalance(walletPayable, walletPayablePay));
+        walletPayableBalanceMapper.insert(buildWalletReceivedPayableBalance(walletPayable, walletPayablePay));
     }
 
 

+ 7 - 6
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/impl/WalletPrepaidServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sckw.payment.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONObject;
@@ -149,14 +150,14 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
         //3.保存凭证相关文件
         List<String> voucherFiles = manualEntryDto.getVoucherFiles();
         if (!CollectionUtils.isEmpty(voucherFiles)) {
-            List<WalletBusinessFile> list = new ArrayList<>(voucherFiles.size());
             voucherFiles.forEach(e -> {
                 WalletBusinessFile file = new WalletBusinessFile();
                 file.setBusinessId(prepaidBalance.getId());
                 file.setFilePath(e);
-                list.add(file);
+                file.setCreateBy(LoginUserHolder.getUserId());
+                file.setCreateTime(LocalDateTime.now());
+                businessFileMapper.insert(file);
             });
-            businessFileMapper.insertBatch(list);
         }
         return result;
     }
@@ -187,7 +188,7 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
 
     private WalletPrepaidBalance buildManualPrepaidBalance(WalletPrepaid walletPrepaid, WalletPrepaidManualDto manualEntryDto) {
         WalletPrepaidBalance prepaidBalance = new WalletPrepaidBalance();
-        prepaidBalance.setOrderNo("p" + System.currentTimeMillis());
+        prepaidBalance.setOrderNo(IdUtil.getSnowflakeNextIdStr());
         prepaidBalance.setOrderType(OrderTypeEnum.PREPAYMENT_ORDER.getCode());
         prepaidBalance.setSupEntId(LoginUserHolder.getEntId());
         prepaidBalance.setProEntId(manualEntryDto.getTradeEntId());
@@ -253,7 +254,7 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public BaseResult<WalletPayAddRes> insertWalletPrepaidRecord(WalletPrepaidAddDto prepaidAddDto) {
-        WalletPrepaid prepaid = walletPrepaidMapper.selectWalletPrepaidById(prepaidAddDto.getPrepaidId());
+        WalletPrepaid prepaid = walletPrepaidMapper.selectById(prepaidAddDto.getPrepaidId());
         if (prepaid == null) {
             return BaseResult.failed("预付清单不存在");
         }
@@ -321,7 +322,7 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
             log.error("预付记录不存在");
             throw new BusinessException("预付记录不存在");
         }
-        WalletPrepaid walletPrepaid = walletPrepaidMapper.selectWalletPrepaidById(walletPrepaidRecord.getPrepaidId());
+        WalletPrepaid walletPrepaid = walletPrepaidMapper.selectById(walletPrepaidRecord.getPrepaidId());
 
         CustomSettleDto customSettleDto = new CustomSettleDto();
 

+ 0 - 138
sckw-modules/sckw-payment/src/main/resources/mapper/WalletBusinessFileMapper.xml

@@ -23,144 +23,6 @@
         wbf.id, wbf.business_id, wbf.file_path, wbf.remark, wbf.status, wbf.del_flag, wbf.create_by,
         wbf.create_time, wbf.update_by, wbf.update_time
     </sql>
-    <!-- This code was generated by TableGo tools, mark 1 end. -->
-
-    <!-- 分页查询钱包_业务文件列表 -->
-    <select id="selectWalletBusinessFileList" resultMap="walletBusinessFileMap">
-        SELECT
-            <include refid="allColumns" />
-        FROM wallet_business_file wbf WHERE wbf.DEL_FLAG = '0'
-        <if test="businessId != null">
-            AND wbf.business_id = #{businessId}
-        </if>
-        <if test="filePath != null and filePath != ''">
-            AND wbf.file_path LIKE CONCAT('%', #{filePath}, '%')
-        </if>
-    </select>
-
-    <!-- 根据主键ID查询钱包_业务文件 -->
-    <select id="selectWalletBusinessFileById" resultMap="walletBusinessFileMap">
-        SELECT
-            <include refid="allColumns" />
-        FROM wallet_business_file wbf WHERE wbf.id = #{id}
-    </select>
-
-    <!-- 根据主键ID列表查询钱包_业务文件列表 -->
-    <select id="selectWalletBusinessFileByIds" resultMap="walletBusinessFileMap">
-        SELECT
-            <include refid="allColumns" />
-        FROM wallet_business_file wbf WHERE wbf.id IN
-        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>
-
-    <!-- This code was generated by TableGo tools, mark 2 begin. -->
-    <!-- 新增钱包_业务文件 -->
-    <insert id="insertWalletBusinessFile" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        INSERT INTO wallet_business_file
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="businessId != null">business_id,</if>
-            <if test="filePath != null">file_path,</if>
-            <if test="remark != null">remark,</if>
-            <if test="status != null">status,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time</if>
-        </trim>
-        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="businessId != null">#{businessId},</if>
-            <if test="filePath != null">#{filePath},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="status != null">#{status},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime}</if>
-        </trim>
-    </insert>
-
-    <insert id="insertBatch">
-        insert into wallet_business_file
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            id,
-            business_id,
-            file_path,
-            remark,
-            status,
-            create_by,
-            create_time,
-            update_by,
-            update_time,
-            del_flag
-        </trim>
-        values
-        <foreach collection="list" item="item" separator=",">
-            <trim prefix="(" suffix=")" suffixOverrides=",">
-                #{item.id,jdbcType=BIGINT},
-                #{item.businessId,jdbcType=BIGINT},
-                #{item.filePath,jdbcType=VARCHAR},
-                #{item.remark,jdbcType=VARCHAR},
-                #{item.status,jdbcType=INTEGER},
-                #{item.createBy,jdbcType=BIGINT},
-                #{item.createTime,jdbcType=TIMESTAMP},
-                #{item.updateBy,jdbcType=BIGINT},
-                #{item.updateTime,jdbcType=TIMESTAMP},
-                #{item.delFlag,jdbcType=INTEGER}
-            </trim>
-        </foreach>
-    </insert>
-
-    <!-- 修改钱包_业务文件 -->
-    <update id="updateWalletBusinessFile">
-        UPDATE wallet_business_file
-        <set>
-            <if test="businessId != null">business_id = #{businessId},</if>
-            <if test="filePath != null">file_path = #{filePath},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime}</if>
-        </set>
-        WHERE id = #{id}
-    </update>
-    <!-- This code was generated by TableGo tools, mark 2 end. -->
-
-    <!-- 删除钱包_业务文件 -->
-    <delete id="deleteWalletBusinessFileById">
-        DELETE FROM wallet_business_file WHERE id = #{id}
-    </delete>
-
-    <!-- 批量删除钱包_业务文件 -->
-    <delete id="deleteWalletBusinessFileByIds">
-        DELETE FROM wallet_business_file WHERE id IN
-        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <!-- 批量逻辑删除钱包_业务文件 -->
-    <update id="deleteWalletBusinessFileLogicByIds">
-        UPDATE wallet_business_file
-        <set>
-            DEL_FLAG = '2',
-            UPDATE_TIME = NOW(),
-            <if test="loginName != null and loginName != ''">UPDATE_BY = #{loginName}</if>
-        </set>
-        WHERE DEL_FLAG = '0' AND id IN
-        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
-
 
     <!-- 根据主键ID查询钱包_业务文件 -->
     <select id="selectFileByBusinessId" resultType="String">

+ 0 - 82
sckw-modules/sckw-payment/src/main/resources/mapper/WalletPayableApplyMapper.xml

@@ -75,87 +75,5 @@
         order by wpa.create_time DESC
     </select>
 
-    <!-- This code was generated by TableGo tools, mark 2 begin. -->
-    <!-- 新增运费申请记录 -->
-    <insert id="insertWalletPayableApply" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        INSERT INTO wallet_payable_apply
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="payableId != null">payable_id,</if>
-            <if test="orderNo != null">order_no,</if>
-            <if test="applyAmount != null">apply_amount,</if>
-            <if test="payingAmount != null">paying_amount,</if>
-            <if test="receivedAmount != null">received_amount,</if>
-            <if test="status != null">status,</if>
-            <if test="remark != null">remark,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time</if>
-        </trim>
-        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="payableId != null">#{payableId},</if>
-            <if test="orderNo != null">#{orderNo},</if>
-            <if test="applyAmount != null">#{applyAmount},</if>
-            <if test="payingAmount != null">#{payingAmount},</if>
-            <if test="receivedAmount != null">#{receivedAmount},</if>
-            <if test="status != null">#{status},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime}</if>
-        </trim>
-    </insert>
 
-    <!-- 修改运费申请记录 -->
-    <update id="updateWalletPayableApply">
-        UPDATE wallet_payable_apply
-        <set>
-            <if test="payableId != null">payable_id = #{payableId},</if>
-            <if test="orderNo != null">order_no = #{orderNo},</if>
-            <if test="applyAmount != null">apply_amount = #{applyAmount},</if>
-            <if test="payingAmount != null">paying_amount = #{payingAmount},</if>
-            <if test="receivedAmount != null">received_amount = #{receivedAmount},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime}</if>
-        </set>
-        WHERE id = #{id}
-    </update>
-    <!-- This code was generated by TableGo tools, mark 2 end. -->
-
-    <!-- 删除运费申请记录 -->
-    <delete id="deleteWalletPayableApplyById">
-        DELETE FROM wallet_payable_apply WHERE id = #{id}
-    </delete>
-
-    <!-- 批量删除运费申请记录 -->
-    <delete id="deleteWalletPayableApplyByIds">
-        DELETE FROM wallet_payable_apply WHERE id IN
-        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <!-- 批量逻辑删除运费申请记录 -->
-    <update id="deleteWalletPayableApplyLogicByIds">
-        UPDATE wallet_payable_apply
-        <set>
-            DEL_FLAG = '2',
-            UPDATE_TIME = NOW(),
-            <if test="loginName != null and loginName != ''">UPDATE_BY = #{loginName}</if>
-        </set>
-        WHERE DEL_FLAG = '0' AND id IN
-        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
 </mapper>

+ 0 - 97
sckw-modules/sckw-payment/src/main/resources/mapper/WalletPayableBalanceMapper.xml

@@ -110,102 +110,5 @@
         </foreach>
     </select>
 
-    <!-- This code was generated by TableGo tools, mark 2 begin. -->
-    <!-- 新增托运企业待付运费余额明细 -->
-    <insert id="insertWalletPayableBalance" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        INSERT INTO wallet_payable_balance
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="orderNo != null">order_no,</if>
-            <if test="orderType != null">order_type,</if>
-            <if test="consignEntId != null">consign_ent_id,</if>
-            <if test="carrierEntId != null">carrier_ent_id,</if>
-            <if test="tradeType != null">trade_type,</if>
-            <if test="tradeAmount != null">trade_amount,</if>
-            <if test="freight != null">freight,</if>
-            <if test="tradingFreight != null">trading_freight,</if>
-            <if test="payingFreight != null">paying_freight,</if>
-            <if test="status != null">status,</if>
-            <if test="remark != null">remark,</if>
-            <if test="voucherFlag != null">voucher_flag,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time</if>
-        </trim>
-        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="orderNo != null">#{orderNo},</if>
-            <if test="orderType != null">#{orderType},</if>
-            <if test="consignEntId != null">#{consignEntId},</if>
-            <if test="carrierEntId != null">#{carrierEntId},</if>
-            <if test="tradeType != null">#{tradeType},</if>
-            <if test="tradeAmount != null">#{tradeAmount},</if>
-            <if test="freight != null">#{freight},</if>
-            <if test="tradingFreight != null">#{tradingFreight},</if>
-            <if test="payingFreight != null">#{payingFreight},</if>
-            <if test="status != null">#{status},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="voucherFlag != null">#{voucherFlag},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime}</if>
-        </trim>
-    </insert>
 
-    <!-- 修改托运企业待付运费余额明细 -->
-    <update id="updateWalletPayableBalance">
-        UPDATE wallet_payable_balance
-        <set>
-            <if test="orderNo != null">order_no = #{orderNo},</if>
-            <if test="orderType != null">order_type = #{orderType},</if>
-            <if test="consignEntId != null">consign_ent_id = #{consignEntId},</if>
-            <if test="carrierEntId != null">carrier_ent_id = #{carrierEntId},</if>
-            <if test="tradeType != null">trade_type = #{tradeType},</if>
-            <if test="tradeAmount != null">trade_amount = #{tradeAmount},</if>
-            <if test="freight != null">freight = #{freight},</if>
-            <if test="tradingFreight != null">trading_freight = #{tradingFreight},</if>
-            <if test="payingFreight != null">paying_freight = #{payingFreight},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="voucherFlag != null">voucher_flag = #{voucherFlag},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime}</if>
-        </set>
-        WHERE id = #{id}
-    </update>
-    <!-- This code was generated by TableGo tools, mark 2 end. -->
-
-    <!-- 删除托运企业待付运费余额明细 -->
-    <delete id="deleteWalletPayableBalanceById">
-        DELETE FROM wallet_payable_balance WHERE id = #{id}
-    </delete>
-
-    <!-- 批量删除托运企业待付运费余额明细 -->
-    <delete id="deleteWalletPayableBalanceByIds">
-        DELETE FROM wallet_payable_balance WHERE id IN
-        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <!-- 批量逻辑删除托运企业待付运费余额明细 -->
-    <update id="deleteWalletPayableBalanceLogicByIds">
-        UPDATE wallet_payable_balance
-        <set>
-            DEL_FLAG = '2',
-            UPDATE_TIME = NOW(),
-            <if test="loginName != null and loginName != ''">UPDATE_BY = #{loginName}</if>
-        </set>
-        WHERE DEL_FLAG = '0' AND id IN
-        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
 </mapper>

+ 0 - 93
sckw-modules/sckw-payment/src/main/resources/mapper/WalletPayableMapper.xml

@@ -3,7 +3,6 @@
 
 <!-- 待付运费清单(wallet_payable) -->
 <mapper namespace="com.sckw.payment.mapper.WalletPayableMapper">
-    <!-- This code was generated by TableGo tools, mark 1 begin. -->
     <!-- 字段映射 -->
     <resultMap id="walletPayableMap" type="com.sckw.payment.entity.WalletPayable">
         <id     column="id"                    property="id" />
@@ -27,7 +26,6 @@
         wp.id, wp.consign_ent_id, wp.carrier_ent_id, wp.freight, wp.trading_freight, wp.paying_freight, wp.status, wp.remark,
         wp.del_flag, wp.create_by, wp.create_time, wp.update_by, wp.update_time
     </sql>
-    <!-- This code was generated by TableGo tools, mark 1 end. -->
 
     <!-- 分页查询待付运费清单列表 -->
     <select id="selectWalletPayableList" resultMap="walletPayableMap">
@@ -79,13 +77,6 @@
         order by update_time Desc
     </select>
 
-    <!-- 根据主键ID查询待付运费清单 -->
-    <select id="selectWalletPayableById" resultMap="walletPayableMap">
-        SELECT
-            <include refid="allColumns" />
-        FROM wallet_payable wp WHERE wp.id = #{id}
-    </select>
-
     <select id="selectByConsignAndCarrier" resultMap="walletPayableMap">
         SELECT
         <include refid="allColumns" />
@@ -119,88 +110,4 @@
             #{id}
         </foreach>
     </select>
-
-    <!-- This code was generated by TableGo tools, mark 2 begin. -->
-    <!-- 新增待付运费清单 -->
-    <insert id="insertWalletPayable" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        INSERT INTO wallet_payable
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="consignEntId != null">consign_ent_id,</if>
-            <if test="carrierEntId != null">carrier_ent_id,</if>
-            <if test="freight != null">freight,</if>
-            <if test="tradingFreight != null">trading_freight,</if>
-            <if test="payingFreight != null">paying_freight,</if>
-            <if test="status != null">status,</if>
-            <if test="remark != null">remark,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time</if>
-        </trim>
-        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="consignEntId != null">#{consignEntId},</if>
-            <if test="carrierEntId != null">#{carrierEntId},</if>
-            <if test="freight != null">#{freight},</if>
-            <if test="tradingFreight != null">#{tradingFreight},</if>
-            <if test="payingFreight != null">#{payingFreight},</if>
-            <if test="status != null">#{status},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime}</if>
-        </trim>
-    </insert>
-
-    <!-- 修改待付运费清单 -->
-    <update id="updateWalletPayable">
-        UPDATE wallet_payable
-        <set>
-            <if test="consignEntId != null">consign_ent_id = #{consignEntId},</if>
-            <if test="carrierEntId != null">carrier_ent_id = #{carrierEntId},</if>
-            <if test="freight != null">freight = #{freight},</if>
-            <if test="tradingFreight != null">trading_freight = #{tradingFreight},</if>
-            <if test="payingFreight != null">paying_freight = #{payingFreight},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime}</if>
-        </set>
-        WHERE id = #{id}
-    </update>
-    <!-- This code was generated by TableGo tools, mark 2 end. -->
-
-    <!-- 删除待付运费清单 -->
-    <delete id="deleteWalletPayableById">
-        DELETE FROM wallet_payable WHERE id = #{id}
-    </delete>
-
-    <!-- 批量删除待付运费清单 -->
-    <delete id="deleteWalletPayableByIds">
-        DELETE FROM wallet_payable WHERE id IN
-        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <!-- 批量逻辑删除待付运费清单 -->
-    <update id="deleteWalletPayableLogicByIds">
-        UPDATE wallet_payable
-        <set>
-            DEL_FLAG = '1',
-            UPDATE_TIME = NOW(),
-            <if test="updateBy != null and updateBy != ''">UPDATE_BY = #{updateBy}</if>
-        </set>
-        WHERE DEL_FLAG = '0' AND id IN
-        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
 </mapper>

+ 0 - 26
sckw-modules/sckw-payment/src/main/resources/mapper/WalletPrepaidBalanceMapper.xml

@@ -110,30 +110,4 @@
     </select>
 
 
-    <!-- 删除采购企业预付余额明细 -->
-    <delete id="deleteWalletPrepaidBalanceById">
-        DELETE FROM wallet_prepaid_balance WHERE id = #{id}
-    </delete>
-
-    <!-- 批量删除采购企业预付余额明细 -->
-    <delete id="deleteWalletPrepaidBalanceByIds">
-        DELETE FROM wallet_prepaid_balance WHERE id IN
-        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <!-- 批量逻辑删除采购企业预付余额明细 -->
-    <update id="deleteWalletPrepaidBalanceLogicByIds">
-        UPDATE wallet_prepaid_balance
-        <set>
-            DEL_FLAG = '2',
-            UPDATE_TIME = NOW(),
-            <if test="updateBy != nul">UPDATE_BY = #{updateBy}</if>
-        </set>
-        WHERE DEL_FLAG = '0' AND id IN
-        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
 </mapper>

+ 0 - 36
sckw-modules/sckw-payment/src/main/resources/mapper/WalletPrepaidMapper.xml

@@ -3,7 +3,6 @@
 
 <!-- 预付清单(wallet_prepaid) -->
 <mapper namespace="com.sckw.payment.mapper.WalletPrepaidMapper">
-    <!-- This code was generated by TableGo tools, mark 1 begin. -->
     <!-- 字段映射 -->
     <resultMap id="walletPrepaidMap" type="com.sckw.payment.entity.WalletPrepaid">
         <id     column="id"                    property="id" />
@@ -25,7 +24,6 @@
         wp.id, wp.pro_ent_id, wp.sup_ent_id, wp.pre_balance, wp.trading_amount, wp.status, wp.remark, wp.del_flag,
         wp.create_by, wp.create_time, wp.update_by, wp.update_time
     </sql>
-    <!-- This code was generated by TableGo tools, mark 1 end. -->
 
     <!-- 分页查询待履约/预付清单列表 -->
     <select id="selectWalletPrepaidList" resultMap="walletPrepaidMap">
@@ -70,20 +68,12 @@
         order by update_time Desc
     </select>
 
-    <!-- 根据主键ID查询预付清单 -->
-    <select id="selectWalletPrepaidById" resultMap="walletPrepaidMap">
-        SELECT
-            <include refid="allColumns" />
-        FROM wallet_prepaid wp WHERE wp.id = #{id}
-    </select>
-
     <select id="selectByProEntIdAndSupEntId" resultMap="walletPrepaidMap">
         SELECT
         <include refid="allColumns" />
         FROM wallet_prepaid wp WHERE wp.pro_ent_id = #{proEntId} AND wp.sup_ent_id = #{supEntId} and wp.del_flag = 0
     </select>
 
-
     <!-- BI大屏查询所有供应商待履约金额汇总 -->
     <select id="selectAllSupplierPrepaidSummary" resultType="java.math.BigDecimal">
         SELECT COALESCE(SUM(wp.pre_balance), 0)
@@ -100,30 +90,4 @@
             #{id}
         </foreach>
     </select>
-    <!-- 删除预付清单 -->
-    <delete id="deleteWalletPrepaidById">
-        DELETE FROM wallet_prepaid WHERE id = #{id}
-    </delete>
-
-    <!-- 批量删除预付清单 -->
-    <delete id="deleteWalletPrepaidByIds">
-        DELETE FROM wallet_prepaid WHERE id IN
-        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <!-- 批量逻辑删除预付清单 -->
-    <update id="deleteWalletPrepaidLogicByIds">
-        UPDATE wallet_prepaid
-        <set>
-            DEL_FLAG = '1',
-            UPDATE_TIME = NOW(),
-            <if test="updateBy != null and updateBy != ''">UPDATE_BY = #{updateBy}</if>
-        </set>
-        WHERE DEL_FLAG = '0' AND id IN
-        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
 </mapper>