补齐字段

src/main/java/com/gxwebsoft/shop/entity/ShopGift.java

@@ -26,6 +26,7 @@ public class ShopGift implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @Schema(description = "礼品卡名称")
     private String name;
 
     @Schema(description = "秘钥")
@@ -34,13 +35,35 @@ public class ShopGift implements Serializable {
     @Schema(description = "商品ID")
     private Integer goodsId;
 
+    @Schema(description = "商品名称")
+    @TableField(exist = false)
+    private String goodsName;
+
+    @Schema(description = "商品图片")
+    @TableField(exist = false)
+    private String goodsImage;
+
+    @Schema(description = "使用地点")
+    private String useLocation;
+
     @Schema(description = "领取时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime takeTime;
 
-    @Schema(description = "操作人")
+    @Schema(description = "核销时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime verificationTime;
+
+    @Schema(description = "操作人ID")
     private Integer operatorUserId;
 
+    @Schema(description = "操作人")
+    @TableField(exist = false)
+    private String operatorUserName;
+
+    @Schema(description = "操作备注")
+    private String operatorRemarks;
+
     @Schema(description = "是否展示")
     private Boolean isShow;
 
@@ -56,6 +79,10 @@ public class ShopGift implements Serializable {
     @Schema(description = "用户ID")
     private Integer userId;
 
+    @Schema(description = "昵称")
+    @TableField(exist = false)
+    private String nickName;
+
     @Schema(description = "是否删除, 0否, 1是")
     @TableLogic
     private Integer deleted;

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGiftMapper.xml

@@ -4,8 +4,11 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*
+        SELECT a.*,b.name as goodsName,b.image as goodsImage,c.nickname, u.nickname as operatorUserName
         FROM shop_gift a
+        LEFT JOIN shop_goods b ON a.goods_id = b.goods_id
+        LEFT JOIN gxwebsoft_core.sys_user c ON a.user_id = c.user_id
+        LEFT JOIN gxwebsoft_core.sys_user u ON a.operator_user_id = u.user_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/shop/param/ShopGiftParam.java

@@ -41,11 +41,14 @@ public class ShopGiftParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer operatorUserId;
 
+    @Schema(description = "核销时间")
+    private String verificationTime;
+
     @Schema(description = "是否展示")
     @QueryField(type = QueryType.EQ)
     private Boolean isShow;
 
-    @Schema(description = "状态, 0上架 1待上架 2待审核 3审核不通过")
+    @Schema(description = "状态, 0未使用 1已使用 2失效")
     @QueryField(type = QueryType.EQ)
     private Integer status;