wuweihua/BMS
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加计费时间的搜索

Browse Source
This commit is contained in:
wuweihua
2026-10-12 16:41:39 +08:00
parent a115926e9f
commit 3456a0bf7f
5 changed files with 63 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/bms-system/src/main/java/com/bms/price/domain/vo/BatchAddIncomeBillFeeRequest.java
+4
View File
@@ -30,6 +30,10 @@ public class BatchAddIncomeBillFeeRequest implements Serializable
private String countryCode;
private String creditArrearsStatus;
/** Billing time range (biz_date), inclusive; format yyyy-MM-dd. */
private String beginBizDate;
private String endBizDate;
/** Surcharge config id (prc_surcharge.sc_id). */
@NotNull(message = "scId required")
private Long scId;
bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java
+15 -1
View File
@@ -595,13 +595,19 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
: request.getCreditArrearsStatus().trim();
String countryCode = StringUtils.isEmpty(request.getCountryCode()) ? null
: request.getCountryCode().trim().toUpperCase();
String beginBizDate = StringUtils.isEmpty(request.getBeginBizDate()) ? null
: request.getBeginBizDate().trim();
String endBizDate = StringUtils.isEmpty(request.getEndBizDate()) ? null
: request.getEndBizDate().trim();
boolean hasFilter = (orderNos != null && !orderNos.isEmpty())
|| (trackingNos != null && !trackingNos.isEmpty())
|| (transferNos != null && !transferNos.isEmpty())
|| (customerCodes != null && !customerCodes.isEmpty())
|| (productCodes != null && !productCodes.isEmpty())
|| StringUtils.isNotEmpty(creditArrearsStatus)
|| StringUtils.isNotEmpty(countryCode);
|| StringUtils.isNotEmpty(countryCode)
|| StringUtils.isNotEmpty(beginBizDate)
|| StringUtils.isNotEmpty(endBizDate);
if (!hasFilter)
{
throw new ServiceException(MessageUtils.message("price.bill.fee.batch.filterRequired"));
@@ -625,6 +631,14 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
query.setProductCodes(productCodes);
query.setCreditArrearsStatus(creditArrearsStatus);
query.setCountryCode(countryCode);
if (beginBizDate != null)
{
query.getParams().put("beginBizDate", beginBizDate);
}
if (endBizDate != null)
{
query.getParams().put("endBizDate", endBizDate);
}
}
// Use self proxy so @DataScope applies
List<PrcOrderBill> list = self.selectBillList(query);
bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml
+6
View File
@@ -314,6 +314,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bizDate != null">
AND p.biz_date = #{bizDate}
</if>
<if test="params.beginBizDate != null and params.beginBizDate != ''">
AND p.biz_date &gt;= #{params.beginBizDate}
</if>
<if test="params.endBizDate != null and params.endBizDate != ''">
AND p.biz_date &lt;= #{params.endBizDate}
</if>
<if test="params.beginTime != null and params.beginTime != ''">
AND date_format(p.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>