瀏覽代碼

bugfix: 1086

ssk 1 月之前
父節點
當前提交
c50999588f

+ 9 - 0
alien-entity/src/main/java/shop/alien/entity/store/vo/ActivityInviteLogVo.java

@@ -35,4 +35,13 @@ public class ActivityInviteLogVo extends ActivityInviteLog {
 
 
     @ApiModelProperty(value = "被邀请人奖励信息")
     @ApiModelProperty(value = "被邀请人奖励信息")
     private String invitedRewardInfo;
     private String invitedRewardInfo;
+
+    @ApiModelProperty(value = "邀请人真实姓名")
+    private String inviteRealName;
+
+    @ApiModelProperty(value = "被邀请人真实姓名")
+    private String invitedRealName;
+
+    @ApiModelProperty(value = "邀请人昵称")
+    private String inviteNickName;
 }
 }

+ 31 - 24
alien-entity/src/main/java/shop/alien/mapper/ActivityInviteLogMapper.java

@@ -17,30 +17,37 @@ import shop.alien.entity.store.vo.ActivityInviteLogVo;
 public interface ActivityInviteLogMapper extends BaseMapper<ActivityInviteLog> {
 public interface ActivityInviteLogMapper extends BaseMapper<ActivityInviteLog> {
 
 
     @Select("SELECT " +
     @Select("SELECT " +
-            "    ail.*, " +
-            "    lu.user_phone AS invitePhone, " +
-            "    lu1.user_phone AS invitedPhone, " +
-            "    lu1.user_image, " +
-            "    lu1.user_name AS invitedNickName, " +
-            "    CASE " +
-            "        WHEN ail.invite_reward_type = 1 AND lc_invite.id IS NOT NULL THEN " +
-            "            CONCAT('优惠券:', lc_invite.name, '(', IFNULL(lc_invite.offprice, lc_invite.price), '元)') " +
-            "        WHEN ail.invite_reward_type = 2 AND ail.invite_reward_point IS NOT NULL THEN " +
-            "            CONCAT('积分:', ail.invite_reward_point, '分') " +
-            "        ELSE '' " +
-            "    END AS inviteRewardInfo, " +
-            "    CASE " +
-            "        WHEN ail.invited_reward_type = 1 AND lc_invited.id IS NOT NULL THEN " +
-            "            CONCAT('优惠券:', lc_invited.name, '(', IFNULL(lc_invited.offprice, lc_invited.price), '元)') " +
-            "        WHEN ail.invited_reward_type = 2 AND ail.invited_reward_point IS NOT NULL THEN " +
-            "            CONCAT('积分:', ail.invited_reward_point, '分') " +
-            "        ELSE '' " +
-            "    END AS invitedRewardInfo " +
-            "FROM activity_invite_log ail " +
-            "LEFT JOIN life_user lu ON lu.id = ail.invite_user_id AND lu.delete_flag = 0 " +
-            "LEFT JOIN life_user lu1 ON lu1.id = ail.invited_user_id AND lu1.delete_flag = 0 " +
-            "LEFT JOIN life_coupon lc_invite ON lc_invite.id = ail.invite_reward_coupon AND lc_invite.delete_flag = 0 " +
-            "LEFT JOIN life_coupon lc_invited ON lc_invited.id = ail.invited_reward_coupon AND lc_invited.delete_flag = 0 " +
+            "  ail.*," +
+            " lud.real_name as invitedRealName," +
+            " lud.user_name as invitedNickName," +
+            " lu.user_phone AS invitePhone," +
+            " lu.real_name as inviteRealName," +
+            " lu.user_name as inviteNickName," +
+            " lu1.user_phone AS invitedPhone," +
+            " lu1.user_image," +
+            " lu1.user_name AS invitedNickName," +
+            " CASE " +
+            " WHEN ail.invite_reward_type = 1 AND lc_invite.id IS NOT NULL THEN " +
+            " CONCAT('优惠券:', lc_invite.name, '(', IFNULL(lc_invite.offprice, lc_invite.price), '元)') " +
+            " WHEN ail.invite_reward_type = 2 AND ail.invite_reward_point IS NOT NULL THEN " +
+            " CONCAT('积分:', ail.invite_reward_point, '分') " +
+            " ELSE '' " +
+            " END AS inviteRewardInfo, " +
+            " CASE " +
+            " WHEN ail.invited_reward_type = 1 AND lc_invited.id IS NOT NULL THEN " +
+            " CONCAT('优惠券:', lc_invited.name, '(', IFNULL(lc_invited.offprice, lc_invited.price), '元)') " +
+            " WHEN ail.invited_reward_type = 2 AND ail.invited_reward_point IS NOT NULL THEN " +
+            " CONCAT('积分:', ail.invited_reward_point, '分') " +
+            " ELSE '' " +
+            " END AS invitedRewardInfo " +
+            " FROM activity_invite_log ail " +
+            " LEFT JOIN life_user lu ON lu.id = ail.invite_user_id " +
+            " AND lu.delete_flag = 0 " +
+            " LEFT JOIN life_user lud ON lud.id = ail.invited_user_id " +
+            " AND lud.delete_flag = 0 " +
+            " LEFT JOIN life_user lu1 ON lu1.id = ail.invited_user_id AND lu1.delete_flag = 0 " +
+            " LEFT JOIN life_coupon lc_invite ON lc_invite.id = ail.invite_reward_coupon AND lc_invite.delete_flag = 0 " +
+            " LEFT JOIN life_coupon lc_invited ON lc_invited.id = ail.invited_reward_coupon AND lc_invited.delete_flag = 0 " +
             "${ew.customSqlSegment}")
             "${ew.customSqlSegment}")
     IPage<ActivityInviteLogVo> getInviteActivityLogList(IPage<ActivityInviteLogVo> iPage, @Param(Constants.WRAPPER) QueryWrapper<ActivityInviteLogVo> wrapper);
     IPage<ActivityInviteLogVo> getInviteActivityLogList(IPage<ActivityInviteLogVo> iPage, @Param(Constants.WRAPPER) QueryWrapper<ActivityInviteLogVo> wrapper);
 }
 }