autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 19:45:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into merge_adapay

Browse Source 
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
This commit is contained in:
autumn.g@foxmail.com
2023-08-29 17:03:24 +08:00
parent ae578eada7 a90fc4f9f3
commit 90539edf60
26 changed files with 468 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingBillInfoMapper.java
View File

@@ -1,6 +1,9 @@
package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.ClearingBillInfo;
import com.jsowell.pile.dto.GetClearingBillDTO;
import com.jsowell.pile.vo.web.ClearingBillVO;
import com.jsowell.pile.vo.web.MerchantClearingBillVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -57,4 +60,11 @@ public interface ClearingBillInfoMapper {
List<ClearingBillInfo> selectByMerchantId(@Param("merchantId") String merchantId, @Param("billStatus") String billStatus);
void updateStatus(@Param("clearingBillIds") List<Integer> clearingBillIds, @Param("billStatus") String billStatus);
/**
* 后管用 查询运营商账单列表
* @param dto
* @return
*/
List<MerchantClearingBillVO> getMerchantClearingBillList(GetClearingBillDTO dto);
}