aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'develop' (#221) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/221
This commit is contained in:
heyu 2025-11-06 11:18:32 +08:00
commit 0f49654590
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
View File

@ -1355,6 +1355,10 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
ratioQuery.setSalesSupport(salesSupport); ratioQuery.setSalesSupport(salesSupport);
ratioQuery.setSalesExecutive(salesExecutive); ratioQuery.setSalesExecutive(salesExecutive);
ratioQuery.setStatus("1"); ratioQuery.setStatus("1");
// 添加运单寄件日期条件，查询运单寄件日期在计提表有效期内的比例配置
if (waybill.getSendDate() != null) {
ratioQuery.getParams().put("sendDate", waybill.getSendDate());
}
List<EmisSalesCommissionRatio> ratioList = emisSalesCommissionRatioMapper List<EmisSalesCommissionRatio> ratioList = emisSalesCommissionRatioMapper
.selectEmisSalesCommissionRatioList(ratioQuery); .selectEmisSalesCommissionRatioList(ratioQuery);
if (!CollectionUtils.isEmpty(ratioList)) { if (!CollectionUtils.isEmpty(ratioList)) {

4
emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml
View File

@ -38,6 +38,10 @@
<if test="params.endDateAfterNow != null and params.endDateAfterNow == true"> <if test="params.endDateAfterNow != null and params.endDateAfterNow == true">
and end_date &gt;= NOW() and end_date &gt;= NOW()
</if> </if>
<!-- 查询运单寄件日期在计提表有效期内的记录 -->
<if test="params.sendDate != null">
and start_date &lt;= #{params.sendDate} and end_date &gt;= #{params.sendDate}
</if>
</where> </where>
ORDER BY id DESC ORDER BY id DESC
</select> </select>