diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java index 167af1fa0..ab48a4e98 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java @@ -1,14 +1,13 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.PileMerchantInfo; - -import java.util.List; - import com.jsowell.pile.dto.QueryMerchantInfoDTO; import com.jsowell.pile.vo.web.MerchantSettleInfoVO; import com.jsowell.pile.vo.web.PileMerchantInfoVO; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface PileMerchantInfoMapper { int deleteByPrimaryKey(Integer id); @@ -162,4 +161,10 @@ public interface PileMerchantInfoMapper { * @return */ PileMerchantInfoVO queryMerchantInfoByStationId(String stationId); -} \ No newline at end of file + + /** + * 查询自动提现的运营商信息 + * @return + */ + List selectAutoWithdrawalMerchantInfoList(); +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMerchantInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMerchantInfoService.java index 6629150f8..d5fffdba7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMerchantInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMerchantInfoService.java @@ -192,4 +192,10 @@ public interface PileMerchantInfoService { MerchantWithdrawalTypeVO queryWithdrawalType(QueryMerchantInfoDTO dto); int updateWithdrawalType(MerchantWithdrawalTypeVO dto); + + /** + * 查询设置自动提现的运营商列表 + * @return + */ + List selectAutoWithdrawalMerchantInfoList(); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index 5685300b0..f0953b055 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -670,4 +670,10 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService { return pileMerchantInfoMapper.updateByPrimaryKeySelective(merchantInfo); } + @Override + public List selectAutoWithdrawalMerchantInfoList() { + List list = pileMerchantInfoMapper.selectAutoWithdrawalMerchantInfoList(); + return list; + } + } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml index 9f707a76a..f5616b831 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml @@ -1246,4 +1246,13 @@ AND t1.id = #{stationId,jdbcType=VARCHAR} + diff --git a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java index 8597b11c0..c51b97e42 100644 --- a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java +++ b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java @@ -255,7 +255,8 @@ public class JsowellTask { */ public void automaticPayouts() { // TODO 查询开启自动提现运营商列表 - List pileMerchantInfos = pileMerchantInfoService.selectPileMerchantInfoList(null); + // List pileMerchantInfos = pileMerchantInfoService.selectPileMerchantInfoList(null); + List pileMerchantInfos = pileMerchantInfoService.selectAutoWithdrawalMerchantInfoList(); if (CollectionUtils.isEmpty(pileMerchantInfos)) { log.info("定时任务,自动提现, 未查询到运营商列表,直接返回"); return;