Merge #111 into master from cc_20260417_bonus

fix:工资奖金

* cc_20260417_bonus: (28 commits squashed)

  - feat:工资奖金发放

  - fix:工资奖金发放

  - fix:工资奖金发放

  - fix:工资奖金发放

  - fix:工资奖金发放

  - fix:门店实收相关接口

  - fix:新品销售门店级接口

  - fix:新品销售菜品列表接口;规则新增返回id

  - fix:新品销售菜品详情接口

  - fix:新品销售菜品接口补充

  - fix:小程序接口补充

  - fix

  - fix:新增实收、新品销售测试接口

  - fix:新增实收、新品销售测试接口

  - fix

  - fix:新增门店菜品列表接口

  - fix:同规则下无法新增相同菜品规则;新增小程序门店列表接口

  - fix

  - fix:小程序用户获取来源修改

  - fix:实收规则新增上月日均实收字段

  - fix:规则限制

  - fix:小程序上月日均实收

  - fix:查询异常

  - fix:查询异常

  - fix:菜品员工明细字段赋值异常

  - fix:排序

  - fix:排序

  - fix:员工实收列表新增门店筛选条件

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/111
This commit is contained in:
王非凡
2026-04-27 10:41:08 +00:00
committed by 正新
parent 97f8a8669c
commit 22fcfc6a90
95 changed files with 5466 additions and 8 deletions

View File

@@ -67,6 +67,36 @@
</where>
</select>
<select id="listUserAuthMappingByAuthV2" resultMap="baseResult">
select a.id,a.user_id,mapping_id,a.type from user_auth_mapping_${enterpriseId} a
join enterprise_user_${enterpriseId} e on a.user_id= e.user_id
<where>
e.user_status= '1' and e.active= true
<if test="mappingIdList!=null and mappingIdList.size>0">
<foreach collection="mappingIdList" item="mappingId" open="and a.mapping_id in (" separator="," close=")">
#{mappingId}
</foreach>
</if>
<if test="type!=null and type!=''">
and a.type =#{type}
</if>
<if test="(positionType!=null and positionType!='') or (notRoleAuth!=null and notRoleAuth!='')">
and a.user_id in (
select
distinct(user_id)
from enterprise_user_role_${enterpriseId} ur JOIN sys_role_${enterpriseId} b on ur.role_id=b.id
<where>
<if test="positionType!=null and positionType!=''">
and b.position_type =#{positionType}
</if>
<if test="notRoleAuth!=null and notRoleAuth!=''">
and b.role_auth !=#{notRoleAuth}
</if>
</where>
)
</if>
</where>
</select>
<select id="listUserAuthMappingByUserList" resultMap="baseResult">
select * from user_auth_mapping_${enterpriseId}
<where>