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

Commit 682645bc authored by GaoHu's avatar GaoHu

bug:演出重复,用户详情uid未返回,特邀代创建异常,

parent 64524962
......@@ -211,6 +211,7 @@ public class SmileUserVo implements Serializable, Cloneable {
public SmileUserVo copy(SmileUser smileUser) {
if (null == smileUser) return this;
this.setId(smileUser.getId());
this.setUid(smileUser.getUid());
this.setImg(smileUser.getImg());
this.setBirthday(smileUser.getBirthday());
this.setAgent(smileUser.getAgent());
......@@ -245,6 +246,7 @@ public class SmileUserVo implements Serializable, Cloneable {
public SmileUserVo copyInvited(SmileUser smileUser) {
if (null == smileUser) return this;
this.setId(smileUser.getId());
this.setName(smileUser.getName());
this.setUid(smileUser.getUid());
this.setPhone(smileUser.getPhone());
this.setDescribe(smileUser.getIntroduce());
......
......@@ -763,6 +763,8 @@ GROUP BY user_mobile,tickets_id;
) AS map ON map.performance_id = kp.performances_id
WHERE
kp.performances_id IN ( SELECT sa.performance_id FROM smile_agent AS sa WHERE sa.del_tag = 0 GROUP BY sa.performance_id )
GROUP BY
sa.performance_id
ORDER BY
kp.COMMENT DESC,
kp.time_start DESC
......@@ -780,7 +782,9 @@ GROUP BY user_mobile,tickets_id;
LEFT JOIN smile_agent AS sa ON sa.performance_id = kp.performances_id
WHERE
kp.performances_id IN ( SELECT sa.performance_id FROM smile_agent AS sa WHERE sa.del_tag = 0 AND sa.type = 0 GROUP BY sa.performance_id )
AND kps.`status` = 6
AND sa.`type` = 0
GROUP BY
sa.performance_id
ORDER BY
kp.COMMENT DESC,
kp.time_start DESC
......
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