From 1aa309700fb7e12d85f98bed22a45bdac448ec1c Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期六, 16 九月 2023 11:18:46 +0800
Subject: [PATCH] app 2.0
---
cloud-server-account/src/main/java/com/dsh/account/service/TAppGiftService.java | 19 ++
cloud-server-course/src/main/java/com/dsh/course/feignclient/account/model/TCourseInfoRecord.java | 68 +++++++++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoredValueConfigController.java | 2
cloud-server-account/src/main/java/com/dsh/account/entity/TCourseInfoRecord.java | 67 +++++++++
cloud-server-account/src/main/java/com/dsh/account/mapper/TAppGiftMapper.java | 16 ++
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppGiftServiceImpl.java | 31 ++++
cloud-server-account/src/main/java/com/dsh/account/entity/TAppGift.java | 49 +++++++
cloud-server-account/src/main/resources/mapper/TAppGiftMapper.xml | 6
cloud-server-activity/src/main/java/com/dsh/activity/model/SendCouponReq.java | 14 ++
cloud-server-management/src/main/webapp/WEB-INF/view/system/storeValueConfig/StoreValueConfig.html | 2
cloud-server-account/src/main/resources/mapper/TCourseInfoRecordMapper.xml | 6
cloud-server-competition/src/main/java/com/dsh/competition/model/PayCourseRes.java | 14 ++
cloud-server-account/src/main/java/com/dsh/account/mapper/TCourseInfoRecordMapper.java | 17 ++
cloud-server-account/src/main/java/com/dsh/account/service/TCourseInfoRecordService.java | 16 ++
cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/model/SendCouponReq.java | 14 ++
cloud-server-account/src/main/java/com/dsh/account/service/impl/TCourseInfoRecordServiceImpl.java | 20 ++
16 files changed, 359 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/TAppGift.java b/cloud-server-account/src/main/java/com/dsh/account/entity/TAppGift.java
new file mode 100644
index 0000000..5eb6ddc
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/TAppGift.java
@@ -0,0 +1,49 @@
+package com.dsh.account.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 介绍有礼记录表
+ * </p>
+ *
+ * @author administrator
+ * @since 2023-09-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_app_gift")
+public class TAppGift extends Model<TAppGift> {
+
+ private static final long serialVersionUID=1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 用户id
+ */
+ @TableField("userId")
+ private Integer userId;
+
+ /**
+ * 未分配课时数
+ */
+ private Integer num;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/TCourseInfoRecord.java b/cloud-server-account/src/main/java/com/dsh/account/entity/TCourseInfoRecord.java
new file mode 100644
index 0000000..644942e
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/TCourseInfoRecord.java
@@ -0,0 +1,67 @@
+package com.dsh.account.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 续课 体验购课 报名假期班 换课 课时转移 赠课 退费 课时记录表
+ * </p>
+ *
+ * @author administrator
+ * @since 2023-09-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_course_info_record")
+public class TCourseInfoRecord extends Model<TCourseInfoRecord> {
+
+ private static final long serialVersionUID=1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 用户id
+ */
+ @TableField("userId")
+ private Integer userId;
+
+ /**
+ * 课包id
+ */
+ @TableField("courseId")
+ private Integer courseId;
+
+ /**
+ * 类型名称
+ */
+ private String name;
+
+ /**
+ * 课时数
+ */
+ private Integer num;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date time;
+
+ private Integer type;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/mapper/TAppGiftMapper.java b/cloud-server-account/src/main/java/com/dsh/account/mapper/TAppGiftMapper.java
new file mode 100644
index 0000000..e8110a4
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/mapper/TAppGiftMapper.java
@@ -0,0 +1,16 @@
+package com.dsh.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsh.account.entity.TAppGift;
+
+/**
+ * <p>
+ * 介绍有礼记录表 Mapper 接口
+ * </p>
+ *
+ * @author administrator
+ * @since 2023-09-12
+ */
+public interface TAppGiftMapper extends BaseMapper<TAppGift> {
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/mapper/TCourseInfoRecordMapper.java b/cloud-server-account/src/main/java/com/dsh/account/mapper/TCourseInfoRecordMapper.java
new file mode 100644
index 0000000..66428d8
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/mapper/TCourseInfoRecordMapper.java
@@ -0,0 +1,17 @@
+package com.dsh.account.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsh.account.entity.TCourseInfoRecord;
+
+/**
+ * <p>
+ * 续课 体验购课 报名假期班 换课 课时转移 赠课 退费 课时记录表 Mapper 接口
+ * </p>
+ *
+ * @author administrator
+ * @since 2023-09-14
+ */
+public interface TCourseInfoRecordMapper extends BaseMapper<TCourseInfoRecord> {
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TAppGiftService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TAppGiftService.java
new file mode 100644
index 0000000..c283d2a
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TAppGiftService.java
@@ -0,0 +1,19 @@
+package com.dsh.account.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.account.entity.TAppGift;
+
+/**
+ * <p>
+ * 介绍有礼记录表 服务类
+ * </p>
+ *
+ * @author administrator
+ * @since 2023-09-12
+ */
+public interface TAppGiftService extends IService<TAppGift> {
+
+ Boolean weeksOfAddHours(Integer packetId,Integer appUserId,Integer num);
+
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TCourseInfoRecordService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TCourseInfoRecordService.java
new file mode 100644
index 0000000..ebd781a
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TCourseInfoRecordService.java
@@ -0,0 +1,16 @@
+package com.dsh.account.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.account.entity.TCourseInfoRecord;
+
+/**
+ * <p>
+ * 续课 体验购课 报名假期班 换课 课时转移 赠课 退费 课时记录表 服务类
+ * </p>
+ *
+ * @author administrator
+ * @since 2023-09-14
+ */
+public interface TCourseInfoRecordService extends IService<TCourseInfoRecord> {
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppGiftServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppGiftServiceImpl.java
new file mode 100644
index 0000000..60fe644
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppGiftServiceImpl.java
@@ -0,0 +1,31 @@
+package com.dsh.account.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.account.entity.TAppGift;
+import com.dsh.account.feignclient.course.CourseListClient;
+import com.dsh.account.feignclient.course.CoursePaymentClient;
+import com.dsh.account.mapper.TAppGiftMapper;
+import com.dsh.account.service.TAppGiftService;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 介绍有礼记录表 服务实现类
+ * </p>
+ *
+ * @author administrator
+ * @since 2023-09-12
+ */
+@Service
+public class TAppGiftServiceImpl extends ServiceImpl<TAppGiftMapper, TAppGift> implements TAppGiftService {
+ @Autowired
+ private CoursePaymentClient coursePaymentClient;
+
+ @Override
+ public Boolean weeksOfAddHours(Integer packetId,Integer appUserId,Integer num) {
+ Boolean b = coursePaymentClient.sendHours(packetId+"_"+appUserId+"_"+num);
+ return b;
+ }
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TCourseInfoRecordServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TCourseInfoRecordServiceImpl.java
new file mode 100644
index 0000000..2b4dba1
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TCourseInfoRecordServiceImpl.java
@@ -0,0 +1,20 @@
+package com.dsh.account.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.account.mapper.TCourseInfoRecordMapper;
+import com.dsh.account.entity.TCourseInfoRecord;
+import com.dsh.account.service.TCourseInfoRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 续课 体验购课 报名假期班 换课 课时转移 赠课 退费 课时记录表 服务实现类
+ * </p>
+ *
+ * @author administrator
+ * @since 2023-09-14
+ */
+@Service
+public class TCourseInfoRecordServiceImpl extends ServiceImpl<TCourseInfoRecordMapper, TCourseInfoRecord> implements TCourseInfoRecordService {
+
+}
diff --git a/cloud-server-account/src/main/resources/mapper/TAppGiftMapper.xml b/cloud-server-account/src/main/resources/mapper/TAppGiftMapper.xml
new file mode 100644
index 0000000..f830c3f
--- /dev/null
+++ b/cloud-server-account/src/main/resources/mapper/TAppGiftMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsh.account.mapper.TAppGiftMapper">
+
+
+</mapper>
diff --git a/cloud-server-account/src/main/resources/mapper/TCourseInfoRecordMapper.xml b/cloud-server-account/src/main/resources/mapper/TCourseInfoRecordMapper.xml
new file mode 100644
index 0000000..060a198
--- /dev/null
+++ b/cloud-server-account/src/main/resources/mapper/TCourseInfoRecordMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsh.account.mapper.TCourseInfoRecordMapper">
+
+
+</mapper>
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/SendCouponReq.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/SendCouponReq.java
new file mode 100644
index 0000000..ad32ade
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/SendCouponReq.java
@@ -0,0 +1,14 @@
+ package com.dsh.activity.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SendCouponReq {
+ private Integer userId;
+
+ private String couponIds;
+}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/model/PayCourseRes.java b/cloud-server-competition/src/main/java/com/dsh/competition/model/PayCourseRes.java
new file mode 100644
index 0000000..998f882
--- /dev/null
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/model/PayCourseRes.java
@@ -0,0 +1,14 @@
+package com.dsh.competition.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PayCourseRes {
+ @ApiModelProperty(value = "课包id")
+ private Long id;
+ @ApiModelProperty(value = "课包可用课时")
+ private Integer courseNum;
+ @ApiModelProperty(value = "课包名称")
+ private String name;
+}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/account/model/TCourseInfoRecord.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/account/model/TCourseInfoRecord.java
new file mode 100644
index 0000000..bc0bcd1
--- /dev/null
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/account/model/TCourseInfoRecord.java
@@ -0,0 +1,68 @@
+package com.dsh.course.feignclient.account.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 续课 体验购课 报名假期班 换课 课时转移 赠课 退费 课时记录表
+ * </p>
+ *
+ * @author administrator
+ * @since 2023-09-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_course_info_record")
+public class TCourseInfoRecord extends Model<TCourseInfoRecord> {
+
+ private static final long serialVersionUID=1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 用户id
+ */
+ @TableField("userId")
+ private Integer userId;
+
+ /**
+ * 课包id
+ */
+ @TableField("courseId")
+ private Integer courseId;
+
+ /**
+ * 类型名称
+ */
+ private String name;
+
+ /**
+ * 课时数
+ */
+ private Integer num;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date time;
+
+ // 1加 2减
+ private Integer type;
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/model/SendCouponReq.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/model/SendCouponReq.java
new file mode 100644
index 0000000..a04a4d0
--- /dev/null
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/model/SendCouponReq.java
@@ -0,0 +1,14 @@
+package com.dsh.course.feignclient.activity.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SendCouponReq {
+ private Integer userId;
+
+ private String couponIds;
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoredValueConfigController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoredValueConfigController.java
index 3218661..4cb4650 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoredValueConfigController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoredValueConfigController.java
@@ -41,7 +41,7 @@
// 解析json串 获取时间
JSONObject jsonObject = new JSONObject(storeValueConfig.getContent());
JSONArray timeRulesArray = jsonObject.getJSONArray("time_rules");
- model.addAttribute("content",jsonObject);
+ model.addAttribute("content",jsonObject.toString());
if (timeRulesArray.length() > 0) {
JSONObject timeRule = timeRulesArray.getJSONObject(0);
String startTime = timeRule.getString("startTime");
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/storeValueConfig/StoreValueConfig.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/storeValueConfig/StoreValueConfig.html
index c51cda2..f4405c1 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/storeValueConfig/StoreValueConfig.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/storeValueConfig/StoreValueConfig.html
@@ -13,7 +13,7 @@
<div class="ibox-title">
<h5>储值管理</h5>
</div>
- <input type="hidden" id="content" value="${content}">
+ <input type="hidden" id="content" value='${content}'>
<!-- <input type="hidden" id="description" value="${description}">-->
<!-- <input type="hidden" id="time" value="${time}">-->
--
Gitblit v1.7.1