From e3d5e1e1f86a26cd81e924873a27c03d6dd6bdee Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 27 Jul 2023 15:56:48 +0800
Subject: [PATCH] 赠送积分更新状态

---
 src/main/java/cc/mrbird/febs/mall/entity/MallMemberClass.java                   |    2 ++
 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java            |    1 +
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |    1 +
 src/main/java/cc/mrbird/febs/mall/entity/MallRollPerk.java                      |   11 +++++++++++
 4 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberClass.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberClass.java
index b2e4604..1e77219 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberClass.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberClass.java
@@ -18,6 +18,8 @@
     private Long orderId;
     //课程名称,即商品名称
     private String className;
+
+    private String classDec;
     //课程图片
     private String classPic;
     //课程链接
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallRollPerk.java b/src/main/java/cc/mrbird/febs/mall/entity/MallRollPerk.java
index 635b8ca..4a769bb 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallRollPerk.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallRollPerk.java
@@ -3,7 +3,10 @@
 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 java.util.Date;
 
 @Data
 @TableName("mall_roll_perk")
@@ -20,4 +23,12 @@
     //1:未使用 2:已使用
     private Integer state;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime = new Date();
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+
+
 }
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index fd055b4..5092660 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -444,6 +444,7 @@
             mallMemberClass.setOrderId(orderId);
             mallMemberClass.setClassName(goodsName);
             mallMemberClass.setClassPic(skuImage);
+            mallMemberClass.setClassDec(mallGoods.getGoodsIntrodution());
             mallMemberClass.setClassUrl(mallGoods.getVideoUrl());
             mallMemberClassMapper.insert(mallMemberClass);
             return;
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 4ba8266..72c3c08 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -387,6 +387,7 @@
                     throw new FebsException("兑换券已使用");
                 }
                 mallRollPerk.setState(2);
+                mallRollPerk.setUpdateTime(DateUtil.date());
                 mallRollPerkMapper.updateById(mallRollPerk);
                 payResultStr = orderInfo.getOrderNo();
 

--
Gitblit v1.9.1