记得上下班打卡 | git大法好,push需谨慎

Commit 021eabba authored by 胡佳晨's avatar 胡佳晨

提交 如果为开启代理权限的时候 代理购票

parent adb40dfd
...@@ -476,6 +476,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -476,6 +476,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
userData.setCityName(smileUser.getCity()); userData.setCityName(smileUser.getCity());
userData.setType(smileUser.getType()); userData.setType(smileUser.getType());
userData.setPhone(smileUser.getPhone()); userData.setPhone(smileUser.getPhone());
userData.setState(smileUser.getState());
//判断用户是否为总代 //判断用户是否为总代
if (userData.getType() == 1) { if (userData.getType() == 1) {
userData.setAgentName(smileUser.getName()); userData.setAgentName(smileUser.getName());
......
...@@ -178,7 +178,8 @@ ...@@ -178,7 +178,8 @@
su.type, su.type,
su.city, su.city,
su.phone, su.phone,
su.agent_id su.agent_id,
su.state
FROM smile_user AS su FROM smile_user AS su
INNER JOIN (SELECT kotr.agent_id, kotr.agent_id_master INNER JOIN (SELECT kotr.agent_id, kotr.agent_id_master
FROM kylin_order_ticket_relations AS kotr FROM kylin_order_ticket_relations AS kotr
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment