bugfix

ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/domain/BActivityPoints.java

@@ -126,6 +126,13 @@ public class BActivityPoints extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date timeOfIssuance;
 
+    /**
+     * 收货人名称
+     */
+    @Excel(name = "收货人名称")
+    private String consigneeName;
+
+
     /**
      * 用户昵称
      */

ruoyi-system/src/main/resources/mapper/zhiyuanzhe/BActivityPointsMapper.xml

@@ -8,6 +8,7 @@
         <result property="id" column="id"/>
         <result property="uId" column="u_id"/>
         <result property="userName" column="user_name"/>
+        <result property="consigneeName" column="consignee_name"/>
         <result property="phonenumber" column="phonenumber"/>
         <result property="courierCompanies" column="courier_companies"/>
         <result property="trackingNumber" column="tracking_number"/>
@@ -105,11 +106,12 @@
     <select id="selectBActivityPointsById" parameterType="Long" resultMap="BActivityPointsResult">
         select bap.id,
                bap.u_id,
-               su.consignee_name        as user_name,
-               su.consignee_phonenumber as phonenumber,
+               su.consignee_name,
+               (select nick_name from sys_user where user_id = bap.u_id) as user_name,
+               su.consignee_phonenumber                                  as phonenumber,
                bdr.courier_companies,
                bdr.tracking_number,
-               su.address               as mail_address,
+               su.address                                                as mail_address,
                bdr.type,
                bap.points,
                bap.name,
@@ -129,8 +131,8 @@
                CASE
                    WHEN bdr.id IS NULL THEN 0
                    ELSE 1
-                   END                  AS issuanceStatus,
-               bap.update_time          AS timeOfIssuance
+                   END                                                   AS issuanceStatus,
+               bap.update_time                                           AS timeOfIssuance
         from b_activity_points bap
                  left join b_distribution_records bdr on bap.id = bdr.activity_id
                  left join sys_user su on bap.u_id = su.user_id