积分模块相关接口

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbMemberPoints.java

@@ -1,6 +1,7 @@
 package cn.ysk.cashier.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -56,6 +57,7 @@ public class TbMemberPoints {
 	* 最近一次积分变动时间
 	*/
 	@TableField("last_points_change_time")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date lastPointsChangeTime;
 	/**
 	* 最近一次浮动积分

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbMemberPointsLog.java

@@ -3,6 +3,7 @@ package cn.ysk.cashier.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -64,5 +65,6 @@ public class TbMemberPointsLog {
 	/**
 	* 创建时间
 	*/
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 }

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsBasicSetting.java

@@ -3,6 +3,7 @@ package cn.ysk.cashier.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -65,5 +66,6 @@ public class TbPointsBasicSetting {
 	/**
 	* 创建时间
 	*/
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 }

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsExchangeRecord.java

@@ -1,6 +1,7 @@
 package cn.ysk.cashier.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -14,84 +15,86 @@ import java.util.Date;
  * @since 2.0 2024-10-25
  */
 @Data
-@EqualsAndHashCode(callSuper=false)
+@EqualsAndHashCode(callSuper = false)
 @TableName("tb_points_exchange_record")
 public class TbPointsExchangeRecord {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
+    /**
-	* id
+     * id
-	*/
+     */
-	@TableId(type = IdType.AUTO)
+    @TableId(type = IdType.AUTO)
-	private Long id;
+    private Long id;
-	/**
+    /**
-	* 订单编号
+     * 订单编号
-	*/
+     */
-	private String orderNo;
+    private String orderNo;
-	/**
+    /**
-	* 店铺id
+     * 店铺id
-	*/
+     */
-	private Long shopId;
+    private Long shopId;
-	/**
+    /**
-	* 积分商品id
+     * 积分商品id
-	*/
+     */
-	private Long pointsGoodsId;
+    private Long pointsGoodsId;
-	/**
+    /**
-	* 积分商品名称
+     * 积分商品名称
-	*/
+     */
-	private String pointsGoodsName;
+    private String pointsGoodsName;
-	/**
+    /**
-	* 商品图片URL
+     * 商品图片URL
-	*/
+     */
-	private String goodsImageUrl;
+    private String goodsImageUrl;
-	/**
+    /**
-	* 领取方式 self-自取 post-邮寄 
+     * 领取方式 self-自取 post-邮寄
-	*/
+     */
-	private String pickupMethod;
+    private String pickupMethod;
-	/**
+    /**
-	* 会员id
+     * 会员id
-	*/
+     */
-	private Long memberId;
+    private Long memberId;
-	/**
+    /**
-	* 会员名称
+     * 会员名称
-	*/
+     */
-	private String memberName;
+    private String memberName;
-	/**
+    /**
-	* 手机号码
+     * 手机号码
-	*/
+     */
-	private String mobile;
+    private String mobile;
-	/**
+    /**
-	* 会员头像
+     * 会员头像
-	*/
+     */
-	private String avatarUrl;
+    private String avatarUrl;
-	/**
+    /**
-	* 消耗积分
+     * 消耗积分
-	*/
+     */
-	private Integer spendPoints;
+    private Integer spendPoints;
-	/**
+    /**
-	* 额外支付
+     * 额外支付
-	*/
+     */
-	private BigDecimal extraPaymentAmount;
+    private BigDecimal extraPaymentAmount;
-	/**
+    /**
-	* 兑换券券码
+     * 兑换券券码
-	*/
+     */
-	private String couponCode;
+    private String couponCode;
-	/**
+    /**
-	* 状态 waiting-待自取 done-已完成
+     * 状态 waiting-待自取 done-已完成
-	*/
+     */
-	private String status;
+    private String status;
-	/**
+    /**
-	* 创建时间（下单时间）
+     * 创建时间（下单时间）
-	*/
+     */
-	private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	/**
+    private Date createTime;
-	* 更新时间（核销时间）
+    /**
-	*/
+     * 更新时间（核销时间）
-	private Date updateTime;
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 
-	@TableField(value = "count(*)", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    @TableField(value = "count(*)", select = false, insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
-	private Long count;
+    private Long count;
 
-	@TableField(value = "sum(extra_payment_amount)", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    @TableField(value = "sum(extra_payment_amount)", select = false, insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
-	private BigDecimal totalAmount;
+    private BigDecimal totalAmount;
 }

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsGoodsSetting.java

@@ -2,6 +2,7 @@ package cn.ysk.cashier.mybatis.entity;
 
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -74,10 +75,12 @@ public class TbPointsGoodsSetting {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
     /**
      * 逻辑删除标志 1-是 0-否