From 8479629099ebbe431d644580ab2843eb16dc59d1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 02 十一月 2023 10:34:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java | 3 +
cloud-server-activity/src/main/java/com/dsh/activity/entity/TStudent.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/account/StudentClient.java | 3 +
cloud-server-activity/src/main/resources/mapper/CouponMapper.xml | 1
4 files changed, 113 insertions(+), 3 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/TStudent.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/TStudent.java
new file mode 100644
index 0000000..694503d
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/TStudent.java
@@ -0,0 +1,109 @@
+package com.dsh.activity.entity;
+
+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.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 学员信息
+ * </p>
+ *
+ * @author administrator
+ * @since 2023-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_student")
+public class TStudent {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户id
+ */
+ @TableField("appUserId")
+ private Integer appUserId;
+ /**
+ * 学员姓名
+ */
+ @TableField("name")
+ private String name;
+ /**
+ * 学员电话
+ */
+ @TableField("phone")
+ private String phone;
+ /**
+ * 生日
+ */
+ @TableField("birthday")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthday;
+ /**
+ * 性别（1=男，2=女）
+ */
+ @TableField("sex")
+ private Integer sex;
+ /**
+ * 身高
+ */
+ @TableField("height")
+ private Double height;
+ /**
+ * 体重
+ */
+ @TableField("weight")
+ private Double weight;
+ /**
+ * bmi健康值
+ */
+ @TableField("bmi")
+ private Double bmi;
+ /**
+ * 身份证号
+ */
+ @TableField("idCard")
+ private String idCard;
+ /**
+ * 体侧表
+ */
+ @TableField("lateralSurface")
+ private String lateralSurface;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ @TableField("state")
+ private Integer state;
+ /**
+ * 添加时间
+ */
+ @TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date insertTime;
+ /**
+ * 头像
+ */
+ @TableField("headImg")
+ private String headImg;
+ /**
+ * 是否默认 1默认 2不是默认
+ */
+ @TableField("isDefault")
+ private Integer isDefault;
+
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/account/StudentClient.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/account/StudentClient.java
index af6ce71..c9c11fe 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/account/StudentClient.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/account/StudentClient.java
@@ -1,5 +1,6 @@
package com.dsh.activity.feignclient.account;
+import com.dsh.activity.entity.TStudent;
import com.dsh.activity.feignclient.account.model.Student;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -20,5 +21,5 @@
* @return
*/
@PostMapping("/student/queryStudentList")
- List<Student> queryStudentList(Integer appUserId);
+ List<TStudent> queryStudentList(Integer appUserId);
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
index bdda5f5..c998d48 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.activity.entity.Coupon;
+import com.dsh.activity.entity.TStudent;
import com.dsh.activity.feignclient.account.AppUserClient;
import com.dsh.activity.feignclient.account.StudentClient;
import com.dsh.activity.feignclient.account.model.AppUser;
@@ -59,7 +60,7 @@
if (1 == appUser.getIsVip()) {
userPopulation.add(2);//年度会员
}
- List<Student> students = studentClient.queryStudentList(uid);
+ List<TStudent> students = studentClient.queryStudentList(uid);
if (students.size() > 0) {
userPopulation.add(3);//已有学员用户
}
diff --git a/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml b/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
index 7ecd817..5b1f523 100644
--- a/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
@@ -35,7 +35,6 @@
<if test="objType == 1">
and auditStatus =2
</if>
- where 1=1
<if test="operatorId != null">
and cityManagerId = #{operatorId}
</if>
--
Gitblit v1.7.1