sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -523,17 +523,17 @@ public class KwcContractTradeService {
 
         try {
             log.debug("开始查询供应单位代理属性，supplyEntId: {}", supplyEntId);
-            
+
             // 调用远程系统服务查询企业属性类型列表
             List<EntTypeResDto> entTypeList = remoteSystemService.queryEntTypeByIds(Collections.singleton(supplyEntId));
-            
+
             // 判断是否包含代理属性类型
             boolean isAgent = hasSupplyAgentAttribute(entTypeList, supplyEntId);
             Integer result = isAgent ? Global.YES : Global.NO;
-            
+
             log.debug("供应单位代理属性查询完成，supplyEntId: {}, 结果: {}", supplyEntId, result);
             return result;
-            
+
         } catch (BusinessException e) {
             // 业务异常直接抛出，避免重复包装
             throw e;
@@ -569,7 +569,7 @@ public class KwcContractTradeService {
         if (isMatch) {
             log.debug("检测到供应单位具备代理属性，supplyEntId: {}", supplyEntId);
         }
-        
+
         return isMatch;
     }
 
@@ -2347,7 +2347,7 @@ public class KwcContractTradeService {
                         (x, y) -> x));
         // 判断当前查询的企业类型是否为供应方（供应商）
         if (Objects.equals(contractTradeOrderDto.getEntType(), CooperateTypeEnum.SUPPLIER.getCode())) {
-            log.debug("当前查询类型为供应方，执行销售员签约贸易合同查询逻辑。entId: {}, goodsId: {}", 
+            log.debug("当前查询类型为供应方，执行销售员签约贸易合同查询逻辑。entId: {}, goodsId: {}",
                     contractTradeOrderDto.getEntId(), contractTradeOrderDto.getGoodsId());
             // 调用专用方法查询当前登录用户作为销售员且已签约的贸易合同信息
             return querySalesmanSignedTradeOrder(contractTradeOrderDto, contractIds, conTractTradeUnitMap);
@@ -2408,7 +2408,7 @@ public class KwcContractTradeService {
         // 2. 查询指定合同集合下包含特定商品的合同商品信息
         Long goodsId = contractTradeOrderDto.getGoodsId();
         log.debug("开始查询销售员签约合同，合同IDs数量: {}, 商品ID: {}", contractIds.size(), goodsId);
-        
+
         List<KwcContractTradeGoods> kwcContractGoods = kwcContractTradeGoodsRepository.queryByContractIdsAndGoodsId(contractIds, goodsId);
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwcContractGoods)) {
             log.debug("未找到包含指定商品的合同商品信息，商品ID: {}", goodsId);
@@ -2449,14 +2449,14 @@ public class KwcContractTradeService {
         //    - 组装返回对象：利用之前构建的 map 填充详细信息
         List<ContractTradeOrderInfo> result = kwcContractTrades.stream()
                 .filter(trade -> Objects.equals(trade.getStatus(), ContractStatusEnum.SIGNED.getCode()))
-                .filter(trade -> {
-                    boolean isMySale = Objects.equals(trade.getSalesmanId(), currentUserId);
-                    if (!isMySale) {
-                        log.trace("合同ID: {} 被过滤，因为销售员ID: {} 不匹配当前用户: {}", 
-                                trade.getId(), trade.getSalesmanId(), currentUserId);
-                    }
-                    return isMySale;
-                })
+//                .filter(trade -> {
+//                    boolean isMySale = Objects.equals(trade.getSalesmanId(), currentUserId);
+//                    if (!isMySale) {
+//                        log.trace("合同ID: {} 被过滤，因为销售员ID: {} 不匹配当前用户: {}",
+//                                trade.getId(), trade.getSalesmanId(), currentUserId);
+//                    }
+//                    return isMySale;
+//                })
                 .map(trade -> getContractTradeOrderInfo(trade, conTractTradeUnitMap, contractTradeOrderDto.getEntType(), contractGoodsMap))
                 .collect(Collectors.toList());
 
@@ -2498,7 +2498,7 @@ public class KwcContractTradeService {
                 .collect(Collectors.toList());
 
         log.debug("贸易合同订单关键字过滤完成，过滤后数据量: {}", filteredList.size());
-        
+
         return filteredList;
     }
 

sckw-modules/sckw-payment/deploy.sh

@@ -1 +1,70 @@
-#!/bin/bash

set -e

#echo "USER=$USER"
#echo "HOME=$HOME"

#ls -al ~/.ssh
#cat ~/.ssh/config

# ======================
# 基础配置（每个服务改这里）
# ======================
REMOTE_HOST="test"

DOCKER_NAME="sckw-ng-payment"
SERVICE_NAME="sckw-payment"


PROJECT_DIR="/mnt/d/Desk/Project/sckw-service-platform"
DEPLOY_DIR="/www/wwwroot/sckw-ng-platform"
JAR_NAME="${SERVICE_NAME}-1.1.0.jar"

# ======================
# 1. Maven构建
# ======================
echo "👉 [1/4] Maven build..."

cd ${PROJECT_DIR}

mvn clean package -pl sckw-modules/${SERVICE_NAME} -am -DskipTests -P test

echo "✔ build success"

# ======================
# 2. 找jar包
# ======================
echo "👉 [2/4] locate jar..."

JAR_PATH=${PROJECT_DIR}/sckw-modules/${SERVICE_NAME}/target/${JAR_NAME}

echo "jar: ${JAR_PATH}"

# ======================
# 3. SCP上传
# ======================
echo "👉 [3/4] upload to server..."
ls -lh ${JAR_PATH}

scp ${JAR_PATH} ${REMOTE_HOST}:${DEPLOY_DIR}/${DOCKER_NAME}/

# ======================
# 4. 重启 docker compose
# ======================
echo "👉 [4/4] restart container..."


ssh ${REMOTE_HOST} << EOF
cd ${DEPLOY_DIR}
docker compose up -d --build ${DOCKER_NAME}
EOF

echo "命令执行完毕，等待 2 秒..."
sleep 2

ssh ${REMOTE_HOST} << EOF
docker logs --tail=40 ${DOCKER_NAME}
EOF

echo "🎉 deploy finished: ${SERVICE_NAME}"
+#!/bin/bash
+
+set -e
+
+#echo "USER=$USER"
+#echo "HOME=$HOME"
+
+#ls -al ~/.ssh
+#cat ~/.ssh/config
+
+# ======================
+# 基础配置（每个服务改这里）
+# ======================
+REMOTE_HOST="test"
+
+DOCKER_NAME="sckw-ng-payment"
+SERVICE_NAME="sckw-payment"
+
+
+PROJECT_DIR="/mnt/d/Desk/Project/sckw-service-platform"
+DEPLOY_DIR="/www/wwwroot/sckw-ng-platform"
+JAR_NAME="${SERVICE_NAME}-1.1.0.jar"
+
+# ======================
+# 1. Maven构建
+# ======================
+echo "👉 [1/4] Maven build..."
+
+cd ${PROJECT_DIR}
+
+mvn clean package -pl sckw-modules/${SERVICE_NAME} -am -DskipTests -P test
+
+echo "✔ build success"
+
+# ======================
+# 2. 找jar包
+# ======================
+echo "👉 [2/4] locate jar..."
+
+JAR_PATH=${PROJECT_DIR}/sckw-modules/${SERVICE_NAME}/target/${JAR_NAME}
+
+echo "jar: ${JAR_PATH}"
+
+# ======================
+# 3. SCP上传
+# ======================
+echo "👉 [3/4] upload to server..."
+ls -lh ${JAR_PATH}
+
+scp ${JAR_PATH} ${REMOTE_HOST}:${DEPLOY_DIR}/${DOCKER_NAME}/
+
+# ======================
+# 4. 重启 docker compose
+# ======================
+echo "👉 [4/4] restart container..."
+
+
+ssh ${REMOTE_HOST} << EOF
+cd ${DEPLOY_DIR}
+docker compose up -d --build ${DOCKER_NAME}
+EOF
+
+echo "命令执行完毕，等待 2 秒..."
+sleep 2
+
+ssh ${REMOTE_HOST} << EOF
+docker logs --tail=40 ${DOCKER_NAME}
+EOF
+
+echo "🎉 deploy finished: ${SERVICE_NAME}"

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/mapper/WalletPayablePayMapper.java

@@ -1,5 +1,6 @@
 package com.sckw.payment.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.payment.entity.WalletPayablePay;
 import com.sckw.payment.pojo.vo.req.WalletPayablePayQuery;
 import org.apache.ibatis.annotations.Mapper;
@@ -14,7 +15,7 @@ import java.util.List;
  * @since  2026-01-15 09:32:47
  */
 @Mapper
-public interface WalletPayablePayMapper {
+public interface WalletPayablePayMapper extends BaseMapper<WalletPayablePay> {
     /**
      * 分页查询运费支付记录列表
      *
@@ -23,65 +24,10 @@ public interface WalletPayablePayMapper {
      */
     List<WalletPayablePay> selectWalletPayablePayList(WalletPayablePayQuery query);
 
-    /**
-     * 根据主键ID查询运费支付记录
-     *
-     * @param id 运费支付记录主键id
-     * @return 运费支付记录
-     */
-    WalletPayablePay selectWalletPayablePayById(@Param("id") Long id);
 
     WalletPayablePay selectPayableUnPayById(@Param("id") Long id);
 
 
     WalletPayablePay selectWalletPayablePayByOrderNo(@Param("orderNo") String orderNo);
 
-    /**
-     * 根据主键ID列表查询运费支付记录列表
-     *
-     * @param idList 运费支付记录主键id列表
-     * @return 列表数据
-     */
-    List<WalletPayablePay> selectWalletPayablePayByIds(@Param("idList") List<Long> idList);
-
-    /**
-     * 新增运费支付记录
-     *
-     * @param WalletPayablePay 运费支付记录
-     * @return 结果数据
-     */
-    int insertWalletPayablePay(WalletPayablePay WalletPayablePay);
-
-    /**
-     * 修改运费支付记录
-     *
-     * @param WalletPayablePay 运费支付记录
-     * @return 结果数据
-     */
-    int updateWalletPayablePay(WalletPayablePay WalletPayablePay);
-
-    /**
-     * 删除运费支付记录
-     *
-     * @param id 运费支付记录主键id
-     * @return 结果数据
-     */
-    int deleteWalletPayablePayById(@Param("id") Long id);
-
-    /**
-     * 批量删除运费支付记录
-     *
-     * @param idList 运费支付记录主键id列表
-     * @return 结果数据
-     */
-    int deleteWalletPayablePayByIds(@Param("idList") List<Long> idList);
-
-    /**
-     * 批量逻辑删除运费支付记录
-     *
-     * @param idList 运费支付记录主键id列表
-     * @param loginName 登录用户名
-     * @return 结果数据
-     */
-    int deleteWalletPayablePayLogicByIds(@Param("idList") List<Long> idList, @Param("loginName") String loginName);
 }

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

@@ -43,21 +43,6 @@ public interface WalletPrepaidBalanceMapper extends BaseMapper<WalletPrepaidBala
      */
     List<WalletPrepaidBalance> selectWalletPrepaidBalanceByIds(@Param("idList") List<Long> idList);
 
-    /**
-     * 新增采购企业预付余额明细
-     *
-     * @param walletPrepaidBalance 采购企业预付余额明细
-     * @return 结果数据
-     */
-    int insertWalletPrepaidBalance(WalletPrepaidBalance walletPrepaidBalance);
-
-    /**
-     * 修改采购企业预付余额明细
-     *
-     * @param walletPrepaidBalance 采购企业预付余额明细
-     * @return 结果数据
-     */
-    int updateWalletPrepaidBalance(WalletPrepaidBalance walletPrepaidBalance);
 
     /**
      * 删除采购企业预付余额明细

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

@@ -1,5 +1,6 @@
 package com.sckw.payment.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.payment.entity.WalletPrepaid;
 import com.sckw.payment.pojo.vo.req.WalletPrepaidQuery;
 import com.sckw.payment.pojo.vo.res.WalletPrepaidSummary;
@@ -16,7 +17,7 @@ import java.util.List;
  * @since  2026-01-06 10:30:54
  */
 @Mapper
-public interface WalletPrepaidMapper {
+public interface WalletPrepaidMapper extends BaseMapper<WalletPrepaid> {
     /**
      * 分页查询预付清单列表
      *
@@ -52,21 +53,6 @@ public interface WalletPrepaidMapper {
      */
     List<WalletPrepaid> selectWalletPrepaidByIds(@Param("idList") List<Long> idList);
 
-    /**
-     * 新增预付清单
-     *
-     * @param walletPrepaid 预付清单
-     * @return 结果数据
-     */
-    int insertWalletPrepaid(WalletPrepaid walletPrepaid);
-
-    /**
-     * 修改预付清单
-     *
-     * @param walletPrepaid 预付清单
-     * @return 结果数据
-     */
-    int updateWalletPrepaid(WalletPrepaid walletPrepaid);
 
     /**
      * 删除预付清单

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/mapper/WalletPrepaidRecordMapper.java

@@ -1,5 +1,6 @@
 package com.sckw.payment.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.payment.entity.WalletPrepaidRecord;
 import com.sckw.payment.pojo.vo.req.WalletPrepaidRecordQuery;
 import org.apache.ibatis.annotations.Mapper;
@@ -14,7 +15,7 @@ import java.util.List;
  * @since  2026-01-15 09:32:47
  */
 @Mapper
-public interface WalletPrepaidRecordMapper {
+public interface WalletPrepaidRecordMapper extends BaseMapper<WalletPrepaidRecord> {
     /**
      * 分页查询预付支付记录列表
      *
@@ -41,44 +42,5 @@ public interface WalletPrepaidRecordMapper {
      */
     List<WalletPrepaidRecord> selectWalletPrepaidRecordByIds(@Param("idList") List<Long> idList);
 
-    /**
-     * 新增预付支付记录
-     *
-     * @param walletPrepaidRecord 预付支付记录
-     * @return 结果数据
-     */
-    int insertWalletPrepaidRecord(WalletPrepaidRecord walletPrepaidRecord);
 
-    /**
-     * 修改预付支付记录
-     *
-     * @param walletPrepaidRecord 预付支付记录
-     * @return 结果数据
-     */
-    int updateWalletPrepaidRecord(WalletPrepaidRecord walletPrepaidRecord);
-
-    /**
-     * 删除预付支付记录
-     *
-     * @param id 预付支付记录主键id
-     * @return 结果数据
-     */
-    int deleteWalletPrepaidRecordById(@Param("id") Long id);
-
-    /**
-     * 批量删除预付支付记录
-     *
-     * @param idList 预付支付记录主键id列表
-     * @return 结果数据
-     */
-    int deleteWalletPrepaidRecordByIds(@Param("idList") List<Long> idList);
-
-    /**
-     * 批量逻辑删除预付支付记录
-     *
-     * @param idList 预付支付记录主键id列表
-     * @param loginName 登录用户名
-     * @return 结果数据
-     */
-    int deleteWalletPrepaidRecordLogicByIds(@Param("idList") List<Long> idList, @Param("loginName") String loginName);
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/IWalletPrepaidBalanceService.java

@@ -6,7 +6,6 @@ import com.sckw.payment.pojo.vo.req.WalletPrepaidBalanceQuery;
 import com.sckw.payment.pojo.vo.res.WalletPrepaidBalanceRes;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 采购企业预付余额明细Service接口
@@ -23,13 +22,6 @@ public interface IWalletPrepaidBalanceService {
      */
     PageInfo<WalletPrepaidBalanceRes> selectWalletPrepaidBalanceList(WalletPrepaidBalanceQuery query);
 
-    /**
-     * 查询采购企业预付余额明细
-     *
-     * @param id 预付余额明细主键id
-     * @return 采购企业预付余额明细
-     */
-    WalletPrepaidBalance selectWalletPrepaidBalanceById(Long id);
 
     /**
      * 根据主键ID列表查询采购企业预付余额明细列表
@@ -39,51 +31,4 @@ public interface IWalletPrepaidBalanceService {
      */
     List<WalletPrepaidBalance> selectWalletPrepaidBalanceByIds(List<Long> idList);
 
-    /**
-     * 根据主键ID列表查询采购企业预付余额明细集合
-     *
-     * @param idList 预付余额明细主键id列表
-     * @return Map<预付余额明细主键id, 采购企业预付余额明细>
-     */
-    Map<Long, WalletPrepaidBalance> mapWalletPrepaidBalanceByIds(List<Long> idList);
-
-    /**
-     * 新增采购企业预付余额明细
-     *
-     * @param walletPrepaidBalance 采购企业预付余额明细
-     * @return 结果数据
-     */
-    int insertWalletPrepaidBalance(WalletPrepaidBalance walletPrepaidBalance);
-
-    /**
-     * 修改采购企业预付余额明细
-     *
-     * @param walletPrepaidBalance 采购企业预付余额明细
-     * @return 结果数据
-     */
-    int updateWalletPrepaidBalance(WalletPrepaidBalance walletPrepaidBalance);
-
-    /**
-     * 删除采购企业预付余额明细
-     *
-     * @param id 预付余额明细主键id
-     * @return 结果数据
-     */
-    int deleteWalletPrepaidBalanceById(Long id);
-
-    /**
-     * 批量删除采购企业预付余额明细
-     *
-     * @param idList 预付余额明细主键id列表
-     * @return 结果数据
-     */
-    int deleteWalletPrepaidBalanceByIds(List<Long> idList);
-
-    /**
-     * 批量逻辑删除采购企业预付余额明细
-     *
-     * @param idList 预付余额明细主键id列表
-     * @return 结果数据
-     */
-    int deleteWalletPrepaidBalanceLogicByIds(List<Long> idList);
 }

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

@@ -340,7 +340,7 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
         }
         //插入支付记录
         WalletPayablePay walletPayablePay = buildWalletPayablePay(payableApply);
-        walletPayablePayMapper.insertWalletPayablePay(walletPayablePay);
+        walletPayablePayMapper.insert(walletPayablePay);
         //修改申请记录
         payableApply.setPayingAmount(walletPayablePay.getApplyAmount());
         walletPayableApplyMapper.updateWalletPayableApply(payableApply);
@@ -419,7 +419,7 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
         }
         walletPayablePay.setReceivedAmount(receivedCallbackDto.getTranAmt());
         walletPayablePay.setStatus(1);
-        walletPayablePayMapper.updateWalletPayablePay(walletPayablePay);
+        walletPayablePayMapper.updateById(walletPayablePay);
 
         WalletPayable walletPayable = walletPayableMapper.selectById(walletPayablePay.getPayableId());
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/impl/WalletPrepaidBalanceServiceImpl.java

@@ -81,10 +81,6 @@ public class WalletPrepaidBalanceServiceImpl implements IWalletPrepaidBalanceSer
         return pageInfo;
     }
 
-    @Override
-    public WalletPrepaidBalance selectWalletPrepaidBalanceById(Long id) {
-        return walletPrepaidBalanceMapper.selectWalletPrepaidBalanceById(id);
-    }
 
     @Override
     public List<WalletPrepaidBalance> selectWalletPrepaidBalanceByIds(List<Long> idList) {
@@ -95,42 +91,5 @@ public class WalletPrepaidBalanceServiceImpl implements IWalletPrepaidBalanceSer
         return walletPrepaidBalanceMapper.selectWalletPrepaidBalanceByIds(idList);
     }
 
-    @Override
-    public Map<Long, WalletPrepaidBalance> mapWalletPrepaidBalanceByIds(List<Long> idList) {
-        List<WalletPrepaidBalance> list = selectWalletPrepaidBalanceByIds(idList);
-        return Optional.ofNullable(list).orElse(Collections.emptyList()).stream().collect(Collectors.toMap(WalletPrepaidBalance::getId, WalletPrepaidBalance -> WalletPrepaidBalance));
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int insertWalletPrepaidBalance(WalletPrepaidBalance walletPrepaidBalance) {
-        return walletPrepaidBalanceMapper.insertWalletPrepaidBalance(walletPrepaidBalance);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int updateWalletPrepaidBalance(WalletPrepaidBalance walletPrepaidBalance) {
-        return walletPrepaidBalanceMapper.updateWalletPrepaidBalance(walletPrepaidBalance);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int deleteWalletPrepaidBalanceById(Long id) {
-        return walletPrepaidBalanceMapper.deleteWalletPrepaidBalanceById(id);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int deleteWalletPrepaidBalanceByIds(List<Long> idList) {
-        if (CollUtil.isEmpty(idList)) {
-            return 0;
-        }
-        return walletPrepaidBalanceMapper.deleteWalletPrepaidBalanceByIds(idList);
-    }
 
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int deleteWalletPrepaidBalanceLogicByIds(List<Long> idList) {
-        return walletPrepaidBalanceMapper.deleteWalletPrepaidBalanceLogicByIds(idList, LoginUserHolder.get().getId());
-    }
 }

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

@@ -145,7 +145,7 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
         int result = manualEntryPrepaid(prepaid, manualEntryDto);
         //2.保存待履约/预付余额明细
         WalletPrepaidBalance prepaidBalance = buildManualPrepaidBalance(prepaid, manualEntryDto);
-        prepaidBalanceMapper.insertWalletPrepaidBalance(prepaidBalance);
+        prepaidBalanceMapper.insert(prepaidBalance);
         //3.保存凭证相关文件
         List<String> voucherFiles = manualEntryDto.getVoucherFiles();
         if (!CollectionUtils.isEmpty(voucherFiles)) {
@@ -172,14 +172,14 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
         if (existedPrepaid != null) {
             // 如果存在，则更新待履约/预付金额
             existedPrepaid.setPreBalance(existedPrepaid.getPreBalance().add(manualEntryDto.getTradeAmount()));
-            result = walletPrepaidMapper.updateWalletPrepaid(existedPrepaid);
+            result = walletPrepaidMapper.updateById(existedPrepaid);
             BeanUtils.copyProperties(existedPrepaid, walletPrepaid);
         } else {
             // 如果不存在，则新增一条待履约/预付数据
             walletPrepaid.setSupEntId(LoginUserHolder.getEntId());
             walletPrepaid.setProEntId(manualEntryDto.getTradeEntId());
             walletPrepaid.setPreBalance(manualEntryDto.getTradeAmount());
-            result = walletPrepaidMapper.insertWalletPrepaid(walletPrepaid);
+            result = walletPrepaidMapper.insert(walletPrepaid);
         }
         return result;
     }
@@ -282,7 +282,7 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
         BeanUtils.copyProperties(prepaidAddDto, prepaidRecord);
         prepaidRecord.setOrderNo(payReq.getOrderNo());
         prepaidRecord.setData(JSONObject.toJSONString(pay.getData()));
-        walletPrepaidRecordMapper.insertWalletPrepaidRecord(prepaidRecord);
+        walletPrepaidRecordMapper.insert(prepaidRecord);
         WalletPayAddRes walletPayAddRes = new WalletPayAddRes();
         PayRes data = pay.getData();
         walletPayAddRes.setId(prepaidRecord.getId());
@@ -383,13 +383,13 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
         //修改预付记录
         walletPrepaidRecord.setReceivedAmount(receivedCallbackDto.getTranAmt());
         walletPrepaidRecord.setStatus(PayStatusEnum.PAID.getCode());
-        walletPrepaidRecordMapper.updateWalletPrepaidRecord(walletPrepaidRecord);
+        walletPrepaidRecordMapper.updateById(walletPrepaidRecord);
         //预付清单修改预付余额
         walletPrepaid.setPreBalance(walletPrepaid.getPreBalance().add(walletPrepaidRecord.getReceivedAmount()));
-        walletPrepaidMapper.updateWalletPrepaid(walletPrepaid);
+        walletPrepaidMapper.updateById(walletPrepaid);
         //插入预付明细
         WalletPrepaidBalance prepaidBalance = buildReceivedPrepaidBalance(walletPrepaid, walletPrepaidRecord);
-        prepaidBalanceMapper.insertWalletPrepaidBalance(prepaidBalance);
+        prepaidBalanceMapper.insert(prepaidBalance);
     }
 
     /**
@@ -440,9 +440,9 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
             throw new BusinessException("交易类型不支持");
         }
 
-        result = walletPrepaidMapper.updateWalletPrepaid(existedPrepaid);
+        result = walletPrepaidMapper.updateById(existedPrepaid);
         WalletPrepaidBalance prepaidBalance = buildWalletUpdatePrepaidBalance(existedPrepaid, prepaidDto);
-        prepaidBalanceMapper.insertWalletPrepaidBalance(prepaidBalance);
+        prepaidBalanceMapper.insert(prepaidBalance);
         return result;
     }
 
@@ -459,7 +459,7 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
             walletPrepaid.setSupEntId(prepaidDto.getSupEntId());
             walletPrepaid.setPreBalance(BigDecimal.ZERO);
             walletPrepaid.setTradingAmount(BigDecimal.ZERO);
-            result = walletPrepaidMapper.insertWalletPrepaid(walletPrepaid);
+            result = walletPrepaidMapper.insert(walletPrepaid);
         }
         return result;
     }

sckw-modules/sckw-payment/src/main/resources/mapper/WalletPayablePayMapper.xml

@@ -46,12 +46,7 @@
         order by wpp.create_time DESC
     </select>
 
-    <!-- 根据主键ID查询运费支付记录 -->
-    <select id="selectWalletPayablePayById" resultMap="walletPayablePayMap">
-        SELECT
-            <include refid="allColumns" />
-        FROM wallet_payable_pay wpp WHERE wpp.id = #{id}
-    </select>
+
 
     <!-- 根据主键ID查询运费支付记录 -->
     <select id="selectPayableUnPayById" resultMap="walletPayablePayMap">
@@ -67,97 +62,6 @@
         FROM wallet_payable_pay wpp WHERE wpp.order_no = #{orderNo}
     </select>
 
-    <!-- 根据主键ID列表查询运费支付记录列表 -->
-    <select id="selectWalletPayablePayByIds" resultMap="walletPayablePayMap">
-        SELECT
-            <include refid="allColumns" />
-        FROM wallet_payable_pay wpp WHERE wpp.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="insertWalletPayablePay" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        INSERT INTO wallet_payable_pay
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="payableId != null">payable_id,</if>
-            <if test="applyOrderNo != null">apply_order_no,</if>
-            <if test="orderNo != null">order_no,</if>
-            <if test="applyAmount != null">apply_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="applyOrderNo != null">#{applyOrderNo},</if>
-            <if test="orderNo != null">#{orderNo},</if>
-            <if test="applyAmount != null">#{applyAmount},</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="updateWalletPayablePay">
-        UPDATE wallet_payable_pay
-        <set>
-            <if test="payableId != null">payable_id = #{payableId},</if>
-            <if test="applyOrderNo != null">apply_order_no = #{applyOrderNo},</if>
-            <if test="orderNo != null">order_no = #{orderNo},</if>
-            <if test="applyAmount != null">apply_amount = #{applyAmount},</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="deleteWalletPayablePayById">
-        DELETE FROM wallet_payable_pay WHERE id = #{id}
-    </delete>
 
-    <!-- 批量删除运费支付记录 -->
-    <delete id="deleteWalletPayablePayByIds">
-        DELETE FROM wallet_payable_pay WHERE id IN
-        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
 
-    <!-- 批量逻辑删除运费支付记录 -->
-    <update id="deleteWalletPayablePayLogicByIds">
-        UPDATE wallet_payable_pay
-        <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>

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

@@ -109,74 +109,6 @@
         </foreach>
     </select>
 
-    <!-- This code was generated by TableGo tools, mark 2 begin. -->
-    <!-- 新增采购企业预付余额明细 -->
-    <insert id="insertWalletPrepaidBalance" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        INSERT INTO wallet_prepaid_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="proEntId != null">pro_ent_id,</if>
-            <if test="supEntId != null">sup_ent_id,</if>
-            <if test="tradeType != null">trade_type,</if>
-            <if test="tradeAmount != null">trade_amount,</if>
-            <if test="preBalance != null">pre_balance,</if>
-            <if test="tradingAmount != null">trading_amount,</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="proEntId != null">#{proEntId},</if>
-            <if test="supEntId != null">#{supEntId},</if>
-            <if test="tradeType != null">#{tradeType},</if>
-            <if test="tradeAmount != null">#{tradeAmount},</if>
-            <if test="preBalance != null">#{preBalance},</if>
-            <if test="tradingAmount != null">#{tradingAmount},</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="updateWalletPrepaidBalance">
-        UPDATE wallet_prepaid_balance
-        <set>
-            <if test="orderNo != null">order_no = #{orderNo},</if>
-            <if test="orderType != null">order_type = #{orderType},</if>
-            <if test="proEntId != null">pro_ent_id = #{proEntId},</if>
-            <if test="supEntId != null">sup_ent_id = #{supEntId},</if>
-            <if test="tradeType != null">trade_type = #{tradeType},</if>
-            <if test="tradeAmount != null">trade_amount = #{tradeAmount},</if>
-            <if test="preBalance != null">pre_balance = #{preBalance},</if>
-            <if test="tradingAmount != null">trading_amount = #{tradingAmount},</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="deleteWalletPrepaidBalanceById">

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

@@ -100,61 +100,6 @@
             #{id}
         </foreach>
     </select>
-
-    <!-- This code was generated by TableGo tools, mark 2 begin. -->
-    <!-- 新增预付清单 -->
-    <insert id="insertWalletPrepaid" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        INSERT INTO wallet_prepaid
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="proEntId != null">pro_ent_id,</if>
-            <if test="supEntId != null">sup_ent_id,</if>
-            <if test="preBalance != null">pre_balance,</if>
-            <if test="tradingAmount != null">trading_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="proEntId != null">#{proEntId},</if>
-            <if test="supEntId != null">#{supEntId},</if>
-            <if test="preBalance != null">#{preBalance},</if>
-            <if test="tradingAmount != null">#{tradingAmount},</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="updateWalletPrepaid">
-        UPDATE wallet_prepaid
-        <set>
-            <if test="proEntId != null">pro_ent_id = #{proEntId},</if>
-            <if test="supEntId != null">sup_ent_id = #{supEntId},</if>
-            <if test="preBalance != null">pre_balance = #{preBalance},</if>
-            <if test="tradingAmount != null">trading_amount = #{tradingAmount},</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="deleteWalletPrepaidById">
         DELETE FROM wallet_prepaid WHERE id = #{id}

sckw-modules/sckw-payment/src/main/resources/mapper/WalletPrepaidRecordMapper.xml

@@ -68,87 +68,7 @@
         </foreach>
     </select>
 
-    <!-- This code was generated by TableGo tools, mark 2 begin. -->
-    <!-- 新增预付支付记录 -->
-    <insert id="insertWalletPrepaidRecord" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        INSERT INTO wallet_prepaid_record
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="prepaidId != null">prepaid_id,</if>
-            <if test="orderNo != null">order_no,</if>
-            <if test="prepaidAmount != null">prepaid_amount,</if>
-            <if test="receivedAmount != null">received_amount,</if>
-            <if test="status != null">status,</if>
-            <if test="data != null and data != ''">data,</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="prepaidId != null">#{prepaidId},</if>
-            <if test="orderNo != null">#{orderNo},</if>
-            <if test="prepaidAmount != null">#{prepaidAmount},</if>
-            <if test="receivedAmount != null">#{receivedAmount},</if>
-            <if test="status != null">#{status},</if>
-            <if test="data != null and data != ''">#{data},</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="updateWalletPrepaidRecord">
-        UPDATE wallet_prepaid_record
-        <set>
-            <if test="prepaidId != null">prepaid_id = #{prepaidId},</if>
-            <if test="orderNo != null">order_no = #{orderNo},</if>
-            <if test="prepaidAmount != null">prepaid_amount = #{prepaidAmount},</if>
-            <if test="receivedAmount != null">received_amount = #{receivedAmount},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="data != null and data != ''">data = #{data},</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="deleteWalletPrepaidRecordById">
-        DELETE FROM wallet_prepaid_record WHERE id = #{id}
-    </delete>
 
-    <!-- 批量删除预付支付记录 -->
-    <delete id="deleteWalletPrepaidRecordByIds">
-        DELETE FROM wallet_prepaid_record WHERE id IN
-        <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <!-- 批量逻辑删除预付支付记录 -->
-    <update id="deleteWalletPrepaidRecordLogicByIds">
-        UPDATE wallet_prepaid_record
-        <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>