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

demand: 联调bug修复， TMS系统 - 员工提成方案配置 - 启用状态优化

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-07-28 14:02:14 +08:00
parent 2949a3a511
commit e06791ed28
5 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java
View File

@ -65,7 +65,7 @@ public class EmisCommissionQuote extends BaseEntity
private String postType;
/* 快递类型:emis_biz_shipping_method */
private String transType;
/* 启用状态 1-启用 0-停用 */
/* 启用状态 1-启用 0-停用 2-启用已过期 3-启用未过期 */
private String blOpen;
/* 员工编号 */
private String empCode;

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSalesCommissionRatioServiceImpl.java
View File

@ -29,7 +29,7 @@ public class EmisSalesCommissionRatioServiceImpl implements IEmisSalesCommission
*/
@Override
public EmisSalesCommissionRatio selectEmisSalesCommissionRatioById(Long id) {
return emisSalesCommissionRatioMapper.selectById(id);
return emisSalesCommissionRatioMapper.selectEmisSalesCommissionRatioById(id);
}
/**

8
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -987,6 +987,14 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
if (CollectionUtil.isEmpty(salesmenUsers)) {
throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "销售联系人不支持回款");
}
// SysUser payeeUser = getEmisStaffByEmpName(emisWaybillSave.getPayee());
// if (Objects.isNull(payeeUser)) {
// throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "回款联系人不支持回款");
// }
// SysUser salesUser = getEmisStaffByEmpName(emisWaybillSave.getSalesmen());
// if (Objects.isNull(salesUser)) {
// throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "销售联系人不支持回款");
// }
// 包装类型
String packTypeStr = emisWaybillSave.getPackType();

12
emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
View File

@ -60,7 +60,17 @@
<if test="calcWeightType != null and calcWeightType != ''"> and calc_weight_type=#{calcWeightType}</if>
<if test="postType != null and postType != ''"> and post_type=#{postType}</if>
<if test="transType != null and transType != ''"> and ( FIND_IN_SET(#{transType},trans_type) )</if>
<if test="blOpen != null and blOpen != ''"> and bl_open=#{blOpen}</if>
<!-- blOpen=2: 启用且已过期，blOpen=3: 启用且未过期，其他按原逻辑 -->
<if test="blOpen == '2'">
and bl_open = '1'
and end_date &lt; NOW()
</if>
<if test="blOpen == '3'">
and bl_open = '1'
and end_date &gt;= NOW()
</if>
<if test="blOpen != null and blOpen != '' and blOpen != '2' and blOpen != '3'">
and bl_open=#{blOpen}</if>
<if test="empCode != null and empCode != ''"> and ( FIND_IN_SET(#{empCode},emp_code) or emp_code='-1')</if>
<if test="empName != null and empName != ''"> and ( FIND_IN_SET(#{empName},emp_name) or emp_name='全部') </if>

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

@ -21,6 +21,7 @@
<select id="selectEmisSalesCommissionRatioList" parameterType="com.xdadan.erp.emis.domain.EmisSalesCommissionRatio" resultMap="EmisSalesCommissionRatioResult">
<include refid="selectEmisSalesCommissionRatioVo"/>
<where>
del_flag='0'
<if test="salesExecutive != null and salesExecutive != ''">AND sales_executive like concat('%', #{salesExecutive}, '%')</if>
<if test="salesmen != null and salesmen != ''">AND salesmen like concat('%', #{salesmen}, '%')</if>
<if test="salesSupport != null and salesSupport != ''">AND sales_support like concat('%', #{salesSupport}, '%')</if>
@ -33,7 +34,7 @@
<!-- 主键查询 -->
<select id="selectEmisSalesCommissionRatioById" parameterType="long" resultMap="EmisSalesCommissionRatioResult">
<include refid="selectEmisSalesCommissionRatioVo"/>
where id = #{id}
where del_flag='0' and id = #{id}
</select>
<!-- 新增 -->