bonus
/
Bonus-Cloud-Houqin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:8332089a7a0a26c128cabbcad202172b693b1055
Branches Tags
bonus:master
bonus:ah-sbd-h5
bonus:coupon0519
bonus:test0515
bonus:drptest0429
bonus:test0315
bonus:oauthdev0315
bonus:oauth0313
bonus:replace_table
bonus:health0312
bonus:dgw
bonus:tag-202502
..
compare: bonus:f3d4bdb3a8c85e72c790f4bc1fd4d64593d470b5
Branches Tags
bonus:ah-sbd-h5
bonus:coupon0519
bonus:test0515
bonus:drptest0429
bonus:master
bonus:test0315
bonus:oauthdev0315
bonus:oauth0313
bonus:replace_table
bonus:health0312
bonus:dgw
bonus:tag-202502

2 Commits
8332089a7a ... f3d4bdb3a8

Author SHA1 Message Date
gaowdong f3d4bdb3a8 Merge remote-tracking branch 'origin/master' 2025-03-14 16:46:56 +08:00
gaowdong 85e3ce7fc0 修改注释 2025-03-14 16:46:49 +08:00
14 changed files with 138 additions and 126 deletions
Show Stats Expand all files Collapse all files

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccExceptionRecordMapper.xml
View File

@ -36,7 +36,7 @@
t2.nick_name as cust_name, t2.nick_name as cust_name,
t2.cust_num, t2.cust_num,
t2.phonenumber as mobile, t2.phonenumber as mobile,
# t2.org_full_name, <!-- t2.org_full_name, -->
t4.order_id, t4.order_id,
t4.mac_order_id, t4.mac_order_id,
t4.order_time, t4.order_time,
@ -88,7 +88,7 @@
and (t2.cust_num LIKE CONCAT('%', #{param.keyword},'%') and (t2.cust_num LIKE CONCAT('%', #{param.keyword},'%')
or t2.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} or t2.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler}
or t2.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} or t2.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler}
# or t2.mobile_suffix = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} <!-- or t2.mobile_suffix = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} -->
or t2.nick_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') or t2.nick_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%')
) )
</if> </if>

6
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrRoleCanteenMapper.xml
View File

@ -14,9 +14,9 @@
<when test="'3'.toString() == authPO.roleType.toString()"> <when test="'3'.toString() == authPO.roleType.toString()">
SELECT id, parent_id, tree_name, tree_type, biz_type SELECT id, parent_id, tree_name, tree_type, biz_type
FROM (select data_id FROM (select data_id
# ,half_select <!-- ,half_select -->
from (SELECT r.data_id from (SELECT r.data_id
# , r.half_select <!-- , r.half_select -->
FROM sys_role_canteen r FROM sys_role_canteen r
LEFT JOIN sys_role o ON o.role_id = r.role_id LEFT JOIN sys_role o ON o.role_id = r.role_id
LEFT JOIN sys_user_role u ON r.role_id = u.role_id LEFT JOIN sys_user_role u ON r.role_id = u.role_id
@ -110,7 +110,7 @@
SELECT mrc.role_id SELECT mrc.role_id
FROM sys_role_canteen mrc FROM sys_role_canteen mrc
WHERE mrc.data_id = #{dataId} WHERE mrc.data_id = #{dataId}
# AND mrc.half_select = #{excludeMiddle} <!-- AND mrc.half_select = #{excludeMiddle} -->
<if test="roleId != null"> <if test="roleId != null">
AND mrc.role_id != #{roleId} AND mrc.role_id != #{roleId}
</if> </if>

150
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustInfoMapper.xml
View File

@ -63,83 +63,91 @@
ci.phonenumber as mobile, ci.phonenumber as mobile,
ci.email, ci.email,
ci.sex, ci.sex,
-- ci.age, <!-- ci.age, -->
ci.id_card, ci.id_card,
ci.birthday, ci.birthday,
ci.face_url as cust_photo_url, ci.face_url as cust_photo_url,
ci.dept_id as org_id, ci.dept_id as org_id,
# ci.cust_third_id, <!--
# ci.org_num, ci.cust_third_id,
# ci.org_full_name, ci.org_num,
# ci.place_id, ci.org_full_name,
# place.place_num, ci.place_id,
# place.place_full_name, place.place_num,
ci.psn_type, place.place_full_name,
ci.psn_type_name, -->
ci.home_addr, ci.psn_type,
# ci.qq, ci.psn_type_name,
# ci.wechat, ci.home_addr,
# ci.company_wechat, <!--
# ci.dingtalk, ci.qq,
# ci.emer_contact_person, ci.wechat,
# ci.emer_contact_num, ci.company_wechat,
# ci.emer_contact_card, ci.dingtalk,
# ci.job, ci.emer_contact_person,
# ci.job_rank, ci.emer_contact_num,
# ci.job_level, ci.emer_contact_card,
# ci.job_title, ci.job,
# ci.job_title_rank, ci.job_rank,
# ci.auth_strength, ci.job_level,
# ci.entry_date, ci.job_title,
# ci.signing_date, ci.job_title_rank,
# ci.expiry_date, ci.auth_strength,
# ci.cust_type, ci.entry_date,
ci.signing_date,
ci.expiry_date,
ci.cust_type,
-->
ci.birthday ci.birthday
# cd.label_ids, <!--
# cd.label_names, cd.label_ids,
# cd.taste_ids, cd.label_names,
# cd.taste_names, cd.taste_ids,
# ai.end_date accEndDate, cd.taste_names,
# ci.doctor_num, ai.end_date accEndDate,
# ci.hospital_num ci.doctor_num,
</sql> ci.hospital_num
-->
</sql>
<select id="queryCustInfoDetail" resultType="com.bonus.canteen.core.customer.vo.CustInfoVo"> <select id="queryCustInfoDetail" resultType="com.bonus.canteen.core.customer.vo.CustInfoVo">
select select
<include refid="detailInfo"/> <include refid="detailInfo"/>
, ,
# ci.marital_status, <!--
# ci.cost_center_id, ci.marital_status,
# A.name costCenterName, ci.cost_center_id,
# ci.ethnicity_code, A.name costCenterName,
# ci.native_place, ci.ethnicity_code,
# ci.position, ci.native_place,
# ci.bank_card_num, ci.position,
# ci.head_portrait_url, ci.bank_card_num,
# ci.extend_date, ci.head_portrait_url,
# ci.extend_date_time, ci.extend_date,
# ci.extend_str1, ci.extend_date_time,
# ci.extend_str2, ci.extend_str1,
cc.openid ci.extend_str2,-->
from sys_user ci cc.openid
left join cust_diet_like cd on ci.cust_id = cd.cust_id and cd.if_del = 2 from sys_user ci
left join acc_info ai on ci.cust_id = ai.cust_id left join cust_diet_like cd on ci.cust_id = cd.cust_id and cd.if_del = 2
# LEFT JOIN cust_place place ON ci.place_id = place.place_id left join acc_info ai on ci.cust_id = ai.cust_id
# LEFT JOIN cust_cost_center A ON A.cost_center_id = ci.cost_center_id <!--
LEFT JOIN cust_casual cc on ci.cust_id = cc.cust_id LEFT JOIN cust_place place ON ci.place_id = place.place_id
where ci.cust_id = #{info.custId} LEFT JOIN cust_cost_center A ON A.cost_center_id = ci.cost_center_id -->
and ci.status = #{info.custState} LEFT JOIN cust_casual cc on ci.cust_id = cc.cust_id
</select> where ci.cust_id = #{info.custId}
and ci.status = #{info.custState}
</select>
<!-- 查询用户详细信息 --> <!-- 查询用户详细信息 -->
<select id="queryCustInfo" resultType="com.bonus.canteen.core.customer.vo.CustInfoVo"> <select id="queryCustInfo" resultType="com.bonus.canteen.core.customer.vo.CustInfoVo">
select select
# ci.cust_limit_id, <!-- ci.cust_limit_id,-->
<if test="info.serialNum != null and info.serialNum != ''"> <if test="info.serialNum != null and info.serialNum != ''">
ac.serial_num, ac.serial_num,
ac.card_status, ac.card_status,
</if> </if>
# ci.alipay_contract_num, <!-- ci.alipay_contract_num, -->
<include refid="detailInfo"/> <include refid="detailInfo"/>
from sys_user ci from sys_user ci
left join cust_diet_like cd on ci.cust_id = cd.cust_id and cd.if_del = 2 left join cust_diet_like cd on ci.cust_id = cd.cust_id and cd.if_del = 2
@ -148,7 +156,7 @@
left join acc_card ac on ci.cust_id = ac.cust_id and ac.card_status in(1,4) left join acc_card ac on ci.cust_id = ac.cust_id and ac.card_status in(1,4)
</if> </if>
# LEFT JOIN cust_place place ON ci.place_id = place.place_id <!-- LEFT JOIN cust_place place ON ci.place_id = place.place_id -->
where 1 = 1 where 1 = 1
<if test="info.custId != null"> <if test="info.custId != null">
and ci.cust_id = #{info.custId} and ci.cust_id = #{info.custId}
@ -223,13 +231,17 @@
a.psn_type, a.psn_type,
a.psn_type_name, a.psn_type_name,
a.dept_id as org_id, a.dept_id as org_id,
# a.org_num, <!--
# a.cust_third_id, a.org_num,
# a.alipay_contract_num, a.cust_third_id,
a.alipay_contract_num,
-->
a.status as cust_state, a.status as cust_state,
a.cust_num, a.cust_num,
a.nick_name as cust_name, a.nick_name as cust_name,
# a.org_full_name, <!--
a.org_full_name,
-->
a.face_url as cust_photo_url, a.face_url as cust_photo_url,
a.avatar as head_portrait_url, a.avatar as head_portrait_url,
a.phonenumber as mobile, a.phonenumber as mobile,

8
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthBodyRecordMapper.xml
View File

@ -18,7 +18,7 @@
h.cust_id, h.cust_id,
c.nick_name as cust_name, c.nick_name as cust_name,
c.phonenumber as mobile, c.phonenumber as mobile,
# co.org_full_name, <!-- co.org_full_name, -->
h.health_info_source, h.health_info_source,
c.sex c.sex
FROM FROM
@ -37,7 +37,7 @@
c.cust_num = #{param.keyword} c.cust_num = #{param.keyword}
OR c.nick_name = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} OR c.nick_name = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler}
OR c.phonenumber = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} OR c.phonenumber = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler}
# or c.mobile_suffix = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} <!-- or c.mobile_suffix = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} -->
) )
</if> </if>
<if test="param.queryDate != null"> <if test="param.queryDate != null">
@ -70,7 +70,7 @@
h.cust_id, h.cust_id,
c.nick_name as cust_name, c.nick_name as cust_name,
c.phonenumber as mobile, c.phonenumber as mobile,
# co.org_full_name, <!-- co.org_full_name, -->
h.health_info_source, h.health_info_source,
c.sex c.sex
FROM FROM
@ -89,7 +89,7 @@
c.cust_num = #{param.keyword} c.cust_num = #{param.keyword}
OR c.nick_name = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} OR c.nick_name = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler}
OR c.phonenumber = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} OR c.phonenumber = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler}
# OR c.mobile_suffix = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} <!-- OR c.mobile_suffix = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} -->
) )
</if> </if>
<if test="param.queryDate != null"> <if test="param.queryDate != null">

24
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthInfoMapper.xml
View File

@ -7,8 +7,8 @@
SELECT a.cust_id, SELECT a.cust_id,
a.cust_num, a.cust_num,
a.nick_name as cust_name, a.nick_name as cust_name,
# a.org_full_name, <!-- a.org_full_name,
# cp.place_full_name, cp.place_full_name, -->
a.phonenumber as mobile, a.phonenumber as mobile,
a.face_url as cust_photo_url, a.face_url as cust_photo_url,
a.birthday, a.birthday,
@ -23,7 +23,7 @@
GROUP_CONCAT(c.chronic_name ORDER BY c.chronic_id desc) AS chronic_names, GROUP_CONCAT(c.chronic_name ORDER BY c.chronic_id desc) AS chronic_names,
GROUP_CONCAT(c.chronic_id ORDER BY c.chronic_id desc) AS chronic_ids GROUP_CONCAT(c.chronic_id ORDER BY c.chronic_id desc) AS chronic_ids
from sys_user a from sys_user a
# left join cust_place cp on a.place_id = cp.place_id <!-- left join cust_place cp on a.place_id = cp.place_id -->
left join health_info b on a.cust_id = b.cust_id left join health_info b on a.cust_id = b.cust_id
left join health_info_chronic c on a.cust_id = c.cust_id left join health_info_chronic c on a.cust_id = c.cust_id
left join health_body_record d on a.cust_id = d.cust_id and d.if_latest = 1 left join health_body_record d on a.cust_id = d.cust_id and d.if_latest = 1
@ -32,8 +32,8 @@
group by a.cust_id, group by a.cust_id,
a.cust_num, a.cust_num,
a.nick_name, a.nick_name,
# a.org_full_name, <!-- a.org_full_name,
# cp.place_full_name, cp.place_full_name, -->
a.phonenumber, a.phonenumber,
a.face_url, a.face_url,
a.birthday, a.birthday,
@ -54,11 +54,11 @@
a.phonenumber as mobile, a.phonenumber as mobile,
a.sex, a.sex,
a.dept_id as org_id, a.dept_id as org_id,
# a.org_full_name, <!-- a.org_full_name, -->
a.psn_type, a.psn_type,
a.psn_type_name, a.psn_type_name,
# a.place_id, <!-- a.place_id,
# cp.place_full_name, cp.place_full_name, -->
a.birthday, a.birthday,
b.marital_status, b.marital_status,
b.pregnant_status, b.pregnant_status,
@ -91,7 +91,7 @@
GROUP_CONCAT(d.chronic_name ORDER BY d.chronic_id desc) AS chronic_names, GROUP_CONCAT(d.chronic_name ORDER BY d.chronic_id desc) AS chronic_names,
GROUP_CONCAT(d.chronic_id ORDER BY d.chronic_id desc) AS chronic_ids GROUP_CONCAT(d.chronic_id ORDER BY d.chronic_id desc) AS chronic_ids
from sys_user a from sys_user a
# left join cust_place cp on a.place_id = cp.place_id <!-- left join cust_place cp on a.place_id = cp.place_id -->
left join health_info b on a.cust_id = b.cust_id left join health_info b on a.cust_id = b.cust_id
left join health_body_record c on a.cust_id = c.cust_id and c.if_latest = 1 left join health_body_record c on a.cust_id = c.cust_id and c.if_latest = 1
left join health_info_chronic d on a.cust_id = d.cust_id left join health_info_chronic d on a.cust_id = d.cust_id
@ -102,11 +102,11 @@
a.phonenumber, a.phonenumber,
a.sex, a.sex,
a.dept_id, a.dept_id,
# a.org_full_name, <!-- a.org_full_name, -->
a.psn_type, a.psn_type,
a.psn_type_name, a.psn_type_name,
# a.place_id, <!-- a.place_id,
# cp.place_full_name, cp.place_full_name, -->
a.birthday, a.birthday,
b.marital_status, b.marital_status,
b.pregnant_status, b.pregnant_status,

14
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrdAppInfoMapper.xml
View File

@ -93,7 +93,7 @@
oai.*, oai.*,
ci.cust_num custNum, ci.cust_num custNum,
ci.nick_name custName, ci.nick_name custName,
# ci.org_full_name orgFullName, <!-- ci.org_full_name orgFullName, -->
ci.psn_type psnType, ci.psn_type psnType,
cp.psn_type_name psnTypeName cp.psn_type_name psnTypeName
@ -139,7 +139,7 @@
ci.nick_name = #{ordParam.keywords,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} ci.nick_name = #{ordParam.keywords,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler}
OR ci.cust_num = #{ordParam.keywords,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} OR ci.cust_num = #{ordParam.keywords,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler}
OR ci.phonenumber = #{ordParam.keywords,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} OR ci.phonenumber = #{ordParam.keywords,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler}
# OR ci.mobile_suffix = #{ordParam.keywords,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} <!-- OR ci.mobile_suffix = #{ordParam.keywords,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} -->
) )
</if> </if>
<if test="ordParam.psnTypeList != null and ordParam.psnTypeList.size() > 0"> <if test="ordParam.psnTypeList != null and ordParam.psnTypeList.size() > 0">
@ -251,7 +251,7 @@
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0 WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode} AND it2.role_key = #{authPO.roleCode}
# AND it1.half_select = 1 <!-- AND it1.half_select = 1 -->
AND it3.user_id = #{authPO.userId} AND it3.user_id = #{authPO.userId}
AND ci.dept_id = it1.dept_id AND ci.dept_id = it1.dept_id
) )
@ -264,7 +264,7 @@
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0 WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode} AND it2.role_key = #{authPO.roleCode}
# AND it1.half_select = 1 <!-- AND it1.half_select = 1 -->
AND it3.user_id = #{authPO.userId} AND it3.user_id = #{authPO.userId}
AND (oai.stall_id = it1.data_id or oai.canteen_id = it1.data_id) AND (oai.stall_id = it1.data_id or oai.canteen_id = it1.data_id)
) )
@ -286,7 +286,7 @@
t2.nick_name as cust_name, t2.nick_name as cust_name,
t2.cust_num, t2.cust_num,
t2.phonenumber as mobile t2.phonenumber as mobile
# t2.org_full_name <!-- t2.org_full_name -->
FROM order_info t1 FROM order_info t1
LEFT JOIN sys_user t2 ON t1.cust_id = t2.cust_id LEFT JOIN sys_user t2 ON t1.cust_id = t2.cust_id
<where> <where>
@ -323,7 +323,7 @@
t2.nick_name as cust_name, t2.nick_name as cust_name,
t2.cust_num, t2.cust_num,
t2.phonenumber as mobile t2.phonenumber as mobile
# t2.org_full_name <!-- t2.org_full_name -->
FROM order_info t1 FROM order_info t1
LEFT JOIN sys_user t2 ON t1.cust_id = t2.cust_id LEFT JOIN sys_user t2 ON t1.cust_id = t2.cust_id
WHERE WHERE
@ -530,7 +530,7 @@
oi.remark, oi.remark,
ci.cust_num AS custNum, ci.cust_num AS custNum,
ci.nick_name AS custName, ci.nick_name AS custName,
# ci.org_full_name AS orgFullName, <!-- ci.org_full_name AS orgFullName, -->
ci.psn_type AS psnType, ci.psn_type AS psnType,
ci.psn_type_name AS psnTypeName ci.psn_type_name AS psnTypeName
FROM order_info oi FROM order_info oi

14
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml
View File

@ -254,7 +254,7 @@
OR ci.nick_name_like LIKE CONCAT('%',#{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') OR ci.nick_name_like LIKE CONCAT('%',#{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%')
OR ci.cust_num = #{param.custSearchInfo} OR ci.cust_num = #{param.custSearchInfo}
OR ci.phonenumber = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} OR ci.phonenumber = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler}
# OR ci.mobile_suffix = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} <!-- OR ci.mobile_suffix = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} -->
) )
) )
</if> </if>
@ -275,7 +275,7 @@
OR ci.nick_name_like LIKE CONCAT('%',#{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') OR ci.nick_name_like LIKE CONCAT('%',#{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%')
OR ci.cust_num = #{param.buffetSearchInfo} OR ci.cust_num = #{param.buffetSearchInfo}
OR ci.phonenumber = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} OR ci.phonenumber = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler}
# OR ci.mobile_suffix = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} <!-- OR ci.mobile_suffix = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} -->
) )
) OR EXISTS( ) OR EXISTS(
SELECT 1 FROM mac_plateid_bind_serial mpbs SELECT 1 FROM mac_plateid_bind_serial mpbs
@ -315,7 +315,7 @@
OR ci.nick_name_like LIKE CONCAT('%',#{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') OR ci.nick_name_like LIKE CONCAT('%',#{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%')
OR ci.cust_num = #{param.buffetSearchInfo} OR ci.cust_num = #{param.buffetSearchInfo}
OR ci.phonenumber = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} OR ci.phonenumber = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler}
# OR ci.mobile_suffix = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} <!-- OR ci.mobile_suffix = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} -->
) )
) OR oi.order_id like concat('%', #{param.orderSearchInfo}, '%') ) OR oi.order_id like concat('%', #{param.orderSearchInfo}, '%')
) )
@ -330,7 +330,7 @@
OR ci.nick_name_like LIKE CONCAT('%',#{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') OR ci.nick_name_like LIKE CONCAT('%',#{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%')
OR ci.cust_num = #{param.buffetSearchInfo} OR ci.cust_num = #{param.buffetSearchInfo}
OR ci.phonenumber = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} OR ci.phonenumber = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler}
# OR ci.mobile_suffix = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} <!-- OR ci.mobile_suffix = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} -->
) )
) OR oi.room_name like concat('%', #{param.roomSearchInfo}, '%') ) OR oi.room_name like concat('%', #{param.roomSearchInfo}, '%')
) )
@ -541,7 +541,7 @@
OR ci.nick_name_like LIKE CONCAT('%',#{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') OR ci.nick_name_like LIKE CONCAT('%',#{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%')
OR ci.cust_num = #{param.custSearchInfo} OR ci.cust_num = #{param.custSearchInfo}
OR ci.phonenumber = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} OR ci.phonenumber = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler}
# OR ci.mobile_suffix = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} <!-- OR ci.mobile_suffix = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} -->
) )
</if> </if>
) )
@ -617,7 +617,7 @@
OR ci.nick_name_like LIKE CONCAT('%',#{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') OR ci.nick_name_like LIKE CONCAT('%',#{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%')
OR ci.cust_num = #{param.custSearchInfo} OR ci.cust_num = #{param.custSearchInfo}
OR ci.phonenumber = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} OR ci.phonenumber = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler}
# OR ci.mobile_suffix = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} <!-- OR ci.mobile_suffix = #{param.custSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} -->
) )
</if> </if>
) )
@ -632,7 +632,7 @@
OR ci.nick_name_like LIKE CONCAT('%',#{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') OR ci.nick_name_like LIKE CONCAT('%',#{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%')
OR ci.cust_num = #{param.buffetSearchInfo} OR ci.cust_num = #{param.buffetSearchInfo}
OR ci.phonenumber = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} OR ci.phonenumber = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler}
# OR ci.mobile_suffix = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} <!-- OR ci.mobile_suffix = #{param.buffetSearchInfo,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} -->
) )
) OR EXISTS( ) OR EXISTS(
SELECT 1 FROM mac_plateid_bind_serial mpbs SELECT 1 FROM mac_plateid_bind_serial mpbs

6
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderPreBookMapper.xml
View File

@ -18,8 +18,8 @@
ci.nick_name as cust_name, ci.nick_name as cust_name,
ci.cust_num, ci.cust_num,
ci.phonenumber as mobile, ci.phonenumber as mobile,
# ci.cust_type, <!-- ci.cust_type,
# ci.org_full_name, ci.org_full_name, -->
ci.face_url as cust_photo_url, ci.face_url as cust_photo_url,
ci.psn_type, ci.psn_type,
ci.psn_type_name ci.psn_type_name
@ -34,7 +34,7 @@
ci.cust_num = #{param.custSearchInfo} ci.cust_num = #{param.custSearchInfo}
OR ci.nick_name = #{param.custSearchInfo,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} OR ci.nick_name = #{param.custSearchInfo,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler}
OR ci.phonenumber = #{param.custSearchInfo,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} OR ci.phonenumber = #{param.custSearchInfo,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler}
# OR ci.mobile_suffix = #{param.custSearchInfo,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} <!-- OR ci.mobile_suffix = #{param.custSearchInfo,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} -->
) )
</if> </if>
<if test="param.orgIdList != null and param.orgIdList.size() > 0"> <if test="param.orgIdList != null and param.orgIdList.size() > 0">

16
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/ReportSumMachineMapper.xml
View File

@ -11,7 +11,7 @@
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0 WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode} AND it2.role_key = #{authPO.roleCode}
# AND it1.half_select = 1 <!-- AND it1.half_select = 1 -->
AND it3.user_id = #{authPO.userId} AND it3.user_id = #{authPO.userId}
AND a.org_id = it1.dept_id AND a.org_id = it1.dept_id
) )
@ -25,7 +25,7 @@
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0 WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode} AND it2.role_key = #{authPO.roleCode}
# AND it1.half_select = 1 <!-- AND it1.half_select = 1 -->
AND it3.user_id = #{authPO.userId} AND it3.user_id = #{authPO.userId}
AND (a.canteen_id = it1.data_id) AND (a.canteen_id = it1.data_id)
) )
@ -36,7 +36,7 @@
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0 WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode} AND it2.role_key = #{authPO.roleCode}
# AND it1.half_select = 1 <!-- AND it1.half_select = 1 -->
AND it3.user_id = #{authPO.userId} AND it3.user_id = #{authPO.userId}
AND (a.stall_id = it1.data_id) AND (a.stall_id = it1.data_id)
) )
@ -50,7 +50,7 @@
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0 WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode} AND it2.role_key = #{authPO.roleCode}
# AND it1.half_select = 1 <!-- AND it1.half_select = 1 -->
AND it3.user_id = #{authPO.userId} AND it3.user_id = #{authPO.userId}
AND c.area_id = it1.area_id AND c.area_id = it1.area_id
) )
@ -119,7 +119,7 @@
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0 WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode} AND it2.role_key = #{authPO.roleCode}
# AND it1.half_select = 1 <!-- AND it1.half_select = 1 -->
AND it3.user_id = #{authPO.userId} AND it3.user_id = #{authPO.userId}
AND o.org_id = it1.dept_id AND o.org_id = it1.dept_id
) )
@ -133,7 +133,7 @@
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0 WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode} AND it2.role_key = #{authPO.roleCode}
# AND it1.half_select = 1 <!-- AND it1.half_select = 1 -->
AND it3.user_id = #{authPO.userId} AND it3.user_id = #{authPO.userId}
AND (o.canteen_id = it1.data_id) AND (o.canteen_id = it1.data_id)
) )
@ -144,7 +144,7 @@
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0 WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode} AND it2.role_key = #{authPO.roleCode}
# AND it1.half_select = 1 <!-- AND it1.half_select = 1 -->
AND it3.user_id = #{authPO.userId} AND it3.user_id = #{authPO.userId}
AND (o.stall_id = it1.data_id) AND (o.stall_id = it1.data_id)
) )
@ -164,7 +164,7 @@
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0 WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode} AND it2.role_key = #{authPO.roleCode}
# AND it1.half_select = 1 <!-- AND it1.half_select = 1 -->
AND it3.user_id = #{authPO.userId} AND it3.user_id = #{authPO.userId}
AND c.area_id = it1.area_id AND c.area_id = it1.area_id
) )

6
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/ReportAnalysisDishesSaleMapper.xml
View File

@ -12,7 +12,7 @@
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0 WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode} AND it2.role_key = #{authPO.roleCode}
# AND it1.half_select = 1 <!-- AND it1.half_select = 1 -->
AND it3.user_id = #{authPO.userId} AND it3.user_id = #{authPO.userId}
AND (a.stall_id = it1.data_id) AND (a.stall_id = it1.data_id)
) )
@ -23,7 +23,7 @@
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0 WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode} AND it2.role_key = #{authPO.roleCode}
# AND it1.half_select = 1 <!-- AND it1.half_select = 1 -->
AND it3.user_id = #{authPO.userId} AND it3.user_id = #{authPO.userId}
AND (a.canteen_id = it1.data_id) AND (a.canteen_id = it1.data_id)
) )
@ -43,7 +43,7 @@
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0 WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode} AND it2.role_key = #{authPO.roleCode}
# AND it1.half_select = 1 <!-- AND it1.half_select = 1 -->
AND it3.user_id = #{authPO.userId} AND it3.user_id = #{authPO.userId}
AND ac.area_id = it1.area_id AND ac.area_id = it1.area_id
) )

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleAreaMapper.xml
View File

@ -28,7 +28,7 @@
SELECT mra.role_id SELECT mra.role_id
FROM sys_role_area mra FROM sys_role_area mra
WHERE mra.area_id = #{dataId} WHERE mra.area_id = #{dataId}
# AND mra.half_select = #{excludeMiddle} <!-- AND mra.half_select = #{excludeMiddle} -->
<if test="roleIdList != null and roleIdList.size() != 0"> <if test="roleIdList != null and roleIdList.size() != 0">
AND mra.role_id NOT IN AND mra.role_id NOT IN
<foreach collection="roleIdList" item="roleId" index="index" open="(" close=")" separator=","> <foreach collection="roleIdList" item="roleId" index="index" open="(" close=")" separator=",">

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleOrgMapper.xml
View File

@ -98,7 +98,7 @@
SELECT mro.role_id SELECT mro.role_id
FROM sys_role_dept mro FROM sys_role_dept mro
WHERE mro.dept_id = #{orgId} WHERE mro.dept_id = #{orgId}
# AND mro.half_select = #{excludeMiddle} <!-- AND mro.half_select = #{excludeMiddle} -->
<if test="roleId != null"> <if test="roleId != null">
AND mro.role_id != #{roleId} AND mro.role_id != #{roleId}
</if> </if>

10
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccInfoMapper.xml
View File

@ -243,7 +243,7 @@
t2.cust_num, t2.cust_num,
t2.nick_name as cust_name, t2.nick_name as cust_name,
t2.phonenumber as mobile, t2.phonenumber as mobile,
# t2.org_full_name, <!-- t2.org_full_name,-->
t2.psn_type, t2.psn_type,
cpt.psn_type_name cpt.psn_type_name
FROM acc_info ai FROM acc_info ai
@ -313,7 +313,7 @@
t2.cust_num, t2.cust_num,
t2.nick_name as cust_name, t2.nick_name as cust_name,
t2.phonenumber as mobile, t2.phonenumber as mobile,
# t2.org_full_name, <!-- t2.org_full_name, -->
t2.psn_type, t2.psn_type,
t7.psn_type_name, t7.psn_type_name,
t1.acc_status, t1.acc_status,
@ -605,7 +605,7 @@
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0 WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode} AND it2.role_key = #{authPO.roleCode}
# AND it1.half_select = 1 <!-- AND it1.half_select = 1 -->
AND it3.user_id = #{authPO.userId} AND it3.user_id = #{authPO.userId}
AND it1.dept_id = ci.dept_id AND it1.dept_id = ci.dept_id
) )
@ -619,7 +619,7 @@
t2.cust_num, t2.cust_num,
t2.nick_name as cust_name, t2.nick_name as cust_name,
t2.phonenumber as mobile, t2.phonenumber as mobile,
# t2.org_full_name, <!-- t2.org_full_name, -->
t2.psn_type, t2.psn_type,
t5.psn_type_name, t5.psn_type_name,
t1.acc_status, t1.acc_status,
@ -687,7 +687,7 @@
and (t2.cust_num LIKE CONCAT('%', #{infoParam.keyword},'%') and (t2.cust_num LIKE CONCAT('%', #{infoParam.keyword},'%')
or t2.nick_name = #{infoParam.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} or t2.nick_name = #{infoParam.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler}
or t2.phonenumber = #{infoParam.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} or t2.phonenumber = #{infoParam.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler}
# or t2.mobile_suffix = #{infoParam.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} <!-- or t2.mobile_suffix = #{infoParam.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} -->
or t2.nick_name_like LIKE CONCAT('%',#{infoParam.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') or t2.nick_name_like LIKE CONCAT('%',#{infoParam.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%')
) )
</sql> </sql>

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccTradeMapper.xml
View File

@ -48,7 +48,7 @@
ci.nick_name as cust_name, ci.nick_name as cust_name,
atr.org_id, atr.org_id,
co.dept_name as org_name, co.dept_name as org_name,
# co.org_full_name, <!-- co.org_full_name, -->
atr.psn_type, atr.psn_type,
cpt.psn_type_name, cpt.psn_type_name,
atr.amount AS flowAmount, atr.amount AS flowAmount,