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

Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/221

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

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

emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml

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