fix

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/WalletPayableBalanceController.java

@@ -45,7 +45,7 @@ public class WalletPayableBalanceController  {
     @PostMapping("/list")
     public BaseResult<PageDataResult<WalletPayableBalanceRes>> list(@RequestBody @Validated WalletPayableBalanceQuery query) {
         PageInfo<WalletPayableBalanceRes> list = new PageInfo<>(Collections.emptyList());
-        String entTypes = LoginEntHolder.get().getEntTypes();
+        String entTypes = LoginEntHolder.getEntTypes();
         if(EntTypeEnum.consign(entTypes)){
             query.setFreightType(1);
         } else if (EntTypeEnum.carrier(entTypes)) {

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/WalletPayableController.java

@@ -110,7 +110,7 @@ public class WalletPayableController  {
     @Operation(summary =  "人工录入")
     @PostMapping("/manualEntry")
     public BaseResult<Object> manualEntry(@RequestBody @Validated WalletPayableManualDto payableManualDto) {
-        String entTypes = LoginEntHolder.get().getEntTypes();
+        String entTypes = LoginEntHolder.getEntTypes();
         if(!entTypes.contains(String.valueOf(EntTypeEnum.LOGISTIC.getCode()))) {
             return BaseResult.failed("当前用户非物流商，无法进行此操作");
         }

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

@@ -92,13 +92,6 @@ public interface IWalletPrepaidService {
      */
     int deleteWalletPrepaidByIds(List<Long> idList);
 
-    /**
-     * 批量逻辑删除预付清单
-     *
-     * @param idList 预付清单主键id列表
-     * @return 结果数据
-     */
-    int deleteWalletPrepaidLogicByIds(List<Long> idList);
 
     WalletPrepaidSummary selectWalletPrepaidSummary(WalletPrepaidQuery query);
 

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

@@ -45,7 +45,7 @@ public class WalletPayableBalanceServiceImpl implements IWalletPayableBalanceSer
     @Override
     public PageInfo<WalletPayableBalanceRes> selectWalletPayableBalanceList(WalletPayableBalanceQuery query) {
         PageInfo<WalletPayableBalanceRes> pageInfo = new PageInfo<>(new ArrayList<>());
-        query.setCurEntId(LoginUserHolder.getUserId());
+        query.setCurEntId(LoginUserHolder.getEntId());
         PageUtils.startPage(query);
         List<WalletPayableBalance> payableBalances = walletPayableBalanceMapper.selectWalletPayableBalanceList(query);
         if(!CollectionUtils.isEmpty(payableBalances)){

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

@@ -102,7 +102,7 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
     @Override
     public PageInfo<WalletPrepaidRes> selectWalletPrepaidList(WalletPrepaidQuery query) {
         PageInfo<WalletPrepaidRes> pageInfo = new PageInfo<>(new ArrayList<>());
-        query.setCurEntId(LoginUserHolder.get().getEntId());
+        query.setCurEntId(LoginUserHolder.getEntId());
         PageUtils.startPage(query);
         List<WalletPrepaid> walletPrepaids = walletPrepaidMapper.selectWalletPrepaidList(query);
         if (!CollectionUtils.isEmpty(walletPrepaids)) {
@@ -251,11 +251,6 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
         return walletPrepaidMapper.deleteWalletPrepaidByIds(idList);
     }
 
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int deleteWalletPrepaidLogicByIds(List<Long> idList) {
-        return walletPrepaidMapper.deleteWalletPrepaidLogicByIds(idList, LoginUserHolder.get().getId());
-    }
 
     @Override
     public WalletPrepaidSummary selectWalletPrepaidSummary(WalletPrepaidQuery query) {
@@ -558,7 +553,7 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
         }
 
         query.setEntType(EntTypeEnum.SUPPLIER.getCode());
-        query.setCurEntId(LoginUserHolder.get().getEntId());
+        query.setCurEntId(LoginUserHolder.getEntId());
 
         String startTime = query.getStartTime();
         String endTime = query.getEndTime();
@@ -661,7 +656,7 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
     public List<TradeEntInfoResVo> queryPrepaidTradeEntIds() {
         TradeEntListQueryFeignDto queryFeignDto = new TradeEntListQueryFeignDto();
         queryFeignDto.setCurEntId(LoginEntHolder.getEntId());
-        String entTypes = LoginEntHolder.get().getEntTypes();
+        String entTypes = LoginEntHolder.getEntTypes();
         if (entTypes.contains(String.valueOf(EntTypeEnum.SUPPLIER.getCode()))) {
             queryFeignDto.setTradeEntType(EntTypeEnum.PURCHASER.getCode());
         } else if (entTypes.contains(String.valueOf(EntTypeEnum.PURCHASER.getCode()))) {