Skip to content

T
tanpu-community
Commit b70e6d7c authored by 刘基明's avatar 刘基明
Browse files
Options

增加返回接口参数

parent 1a2f5fdb
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 1464 deletions
community-api/src/main/java/com/tanpu/community/api/beans/qo/ThemeQo.java
View file @ b70e6d7c
...@@ -57,8 +57,16 @@ public class ThemeQo implements Serializable { ...@@ -57,8 +57,16 @@ public class ThemeQo implements Serializable {
@ApiModelProperty(value = "当前用户是否关注该作者") @ApiModelProperty(value = "当前用户是否关注该作者")
public boolean follow; public boolean follow;
@ApiModelProperty(value = "作者认证") @ApiModelProperty("认证标签用-用户等级体系 0 游客 1注册用户 10投资人 20 探普理顾 30 探普专家理顾 40 交易理财师 50 首席投顾")
private Integer authLabel; private Integer levelGrade;
@ApiModelProperty("认证标签用-当levelGrade=10有值 1投资萌新 2投资达人")
private String userInvestorType;
@ApiModelProperty("认证标签用-用户类型 1普通账号 2机构账号 3机构人员")
private Integer userType;
@ApiModelProperty("认证标签用-所属机构id")
private String belongUserOrgId;
@ApiModelProperty("认证标签用-所属机构名")
private String belongUserOrgName;
@ApiModelProperty(value = "认证机构") @ApiModelProperty(value = "认证机构")
private String authOrg; private String authOrg;
......
community-service/src/main/java/com/tanpu/community/controller/ThemeController.java
View file @ b70e6d7c
...@@ -34,8 +34,7 @@ public class ThemeController { ...@@ -34,8 +34,7 @@ public class ThemeController {
@PostMapping(value = "/publish") @PostMapping(value = "/publish")
@ResponseBody @ResponseBody
public CommonResp<CreateThemeResp> publishTheme(@Validated @RequestBody CreateThemeReq req) { public CommonResp<CreateThemeResp> publishTheme(@Validated @RequestBody CreateThemeReq req) {
// String userId = userHolder.getUserId(); String userId = userHolder.getUserId();
String userId = "4444";
return CommonResp.success(themeManager.publishTheme(req, userId)); return CommonResp.success(themeManager.publishTheme(req, userId));
} }
......
community-service/src/main/java/com/tanpu/community/dao/entity/user/CurriculumPriceEntity.java deleted 100644 → 0
View file @ 1a2f5fdb
package com.tanpu.community.dao.entity.user;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* <p>
* 定价表
* </p>
*
* @author xudong
* @since 2021-06-24
*/
@TableName("curriculum_price")
@ApiModel(value="CurriculumPriceEntity对象", description="定价表")
public class CurriculumPriceEntity implements Serializable {
private static final long serialVersionUID = 1L;
private String id;
@ApiModelProperty(value = "关联id")
private String relId;
@ApiModelProperty(value = "付费模式 1：免费 2：积分 3：现金")
private Integer chargeMode;
@ApiModelProperty(value = "价格")
private Long price;
@ApiModelProperty(value = "划线价")
private Long crossedPrice;
@ApiModelProperty(value = "是否促销 0：否 1 ：是 ")
private Integer promo;
@ApiModelProperty(value = "促销价格")
private Long promoPrice;
@ApiModelProperty(value = "促销开始日期")
private LocalDateTime promoStartTime;
@ApiModelProperty(value = "促销结束日期")
private LocalDateTime promoEndTime;
@ApiModelProperty(value = "使用积分 0：不使用 1：使用 （保留字段）")
private Integer useScore;
@ApiModelProperty(value = "积分")
private Integer score;
@ApiModelProperty(value = "是否有角色价 0：没有 1：有")
private Integer isRolePrice;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "创建人")
private String createBy;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime;
@ApiModelProperty(value = "删除")
private Integer deleteTag;
@ApiModelProperty(value = "更新人")
private String updateBy;
@ApiModelProperty(value = "机构id")
private String orgId;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getRelId() {
return relId;
}
public void setRelId(String relId) {
this.relId = relId;
}
public Integer getChargeMode() {
return chargeMode;
}
public void setChargeMode(Integer chargeMode) {
this.chargeMode = chargeMode;
}
public Long getPrice() {
return price;
}
public void setPrice(Long price) {
this.price = price;
}
public Long getCrossedPrice() {
return crossedPrice;
}
public void setCrossedPrice(Long crossedPrice) {
this.crossedPrice = crossedPrice;
}
public Integer getPromo() {
return promo;
}
public void setPromo(Integer promo) {
this.promo = promo;
}
public Long getPromoPrice() {
return promoPrice;
}
public void setPromoPrice(Long promoPrice) {
this.promoPrice = promoPrice;
}
public LocalDateTime getPromoStartTime() {
return promoStartTime;
}
public void setPromoStartTime(LocalDateTime promoStartTime) {
this.promoStartTime = promoStartTime;
}
public LocalDateTime getPromoEndTime() {
return promoEndTime;
}
public void setPromoEndTime(LocalDateTime promoEndTime) {
this.promoEndTime = promoEndTime;
}
public Integer getUseScore() {
return useScore;
}
public void setUseScore(Integer useScore) {
this.useScore = useScore;
}
public Integer getScore() {
return score;
}
public void setScore(Integer score) {
this.score = score;
}
public Integer getIsRolePrice() {
return isRolePrice;
}
public void setIsRolePrice(Integer isRolePrice) {
this.isRolePrice = isRolePrice;
}
public LocalDateTime getCreateTime() {
return createTime;
}
public void setCreateTime(LocalDateTime createTime) {
this.createTime = createTime;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public LocalDateTime getUpdateTime() {
return updateTime;
}
public void setUpdateTime(LocalDateTime updateTime) {
this.updateTime = updateTime;
}
public Integer getDeleteTag() {
return deleteTag;
}
public void setDeleteTag(Integer deleteTag) {
this.deleteTag = deleteTag;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public String getOrgId() {
return orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
@Override
public String toString() {
return "CurriculumPriceEntity{" +
"id=" + id +
", relId=" + relId +
", chargeMode=" + chargeMode +
", price=" + price +
", crossedPrice=" + crossedPrice +
", promo=" + promo +
", promoPrice=" + promoPrice +
", promoStartTime=" + promoStartTime +
", promoEndTime=" + promoEndTime +
", useScore=" + useScore +
", score=" + score +
", isRolePrice=" + isRolePrice +
", createTime=" + createTime +
", createBy=" + createBy +
", updateTime=" + updateTime +
", deleteTag=" + deleteTag +
", updateBy=" + updateBy +
", orgId=" + orgId +
"}";
}
}
community-service/src/main/java/com/tanpu/community/dao/entity/user/CurriculumResEntity.java deleted 100644 → 0
View file @ 1a2f5fdb
package com.tanpu.community.dao.entity.user;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* <p>
* 课程资源
* </p>
*
* @author xudong
* @since 2021-06-23
*/
@TableName("curriculum_res")
@ApiModel(value="CurriculumResEntity对象", description="课程资源")
public class CurriculumResEntity implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键id")
private String id;
@ApiModelProperty(value = "课程名称")
private String title;
@ApiModelProperty(value = "课程音视频")
private String audio;
@ApiModelProperty(value = "音/视频类型 1:音频 2:视频 3:小视频")
private Integer audioType;
@ApiModelProperty(value = "讲师id")
private String teacherId;
@ApiModelProperty(value = "讲师姓名")
private String teacherName;
@ApiModelProperty(value = "文稿内容")
private String content;
@ApiModelProperty(value = "时长")
private Integer duration;
@ApiModelProperty(value = "文件大小KB")
private Integer fileSize;
@ApiModelProperty(value = "组织id")
private String orgId;
@ApiModelProperty(value = "房间密码")
private String roomPwd;
@ApiModelProperty(value = "白名单 1：白名单 2：黑名单")
private Integer whiteList;
@ApiModelProperty(value = "创建人")
private String createBy;
@ApiModelProperty(value = "阅读数")
private Integer readNum;
@ApiModelProperty(value = "阅读基础数")
private Integer readBaseNum;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private String updateBy;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime;
@ApiModelProperty(value = "删除标识")
private Integer deleteTag;
@ApiModelProperty(value = "状态")
private Integer status;
@ApiModelProperty(value = "排序")
private Integer sort;
@ApiModelProperty(value = "简介")
private String info;
@ApiModelProperty(value = "封面")
private String cover;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getAudio() {
return audio;
}
public void setAudio(String audio) {
this.audio = audio;
}
public Integer getAudioType() {
return audioType;
}
public void setAudioType(Integer audioType) {
this.audioType = audioType;
}
public String getTeacherId() {
return teacherId;
}
public void setTeacherId(String teacherId) {
this.teacherId = teacherId;
}
public String getTeacherName() {
return teacherName;
}
public void setTeacherName(String teacherName) {
this.teacherName = teacherName;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public Integer getDuration() {
return duration;
}
public void setDuration(Integer duration) {
this.duration = duration;
}
public Integer getFileSize() {
return fileSize;
}
public void setFileSize(Integer fileSize) {
this.fileSize = fileSize;
}
public String getOrgId() {
return orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getRoomPwd() {
return roomPwd;
}
public void setRoomPwd(String roomPwd) {
this.roomPwd = roomPwd;
}
public Integer getWhiteList() {
return whiteList;
}
public void setWhiteList(Integer whiteList) {
this.whiteList = whiteList;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public Integer getReadNum() {
return readNum;
}
public void setReadNum(Integer readNum) {
this.readNum = readNum;
}
public Integer getReadBaseNum() {
return readBaseNum;
}
public void setReadBaseNum(Integer readBaseNum) {
this.readBaseNum = readBaseNum;
}
public LocalDateTime getCreateTime() {
return createTime;
}
public void setCreateTime(LocalDateTime createTime) {
this.createTime = createTime;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public LocalDateTime getUpdateTime() {
return updateTime;
}
public void setUpdateTime(LocalDateTime updateTime) {
this.updateTime = updateTime;
}
public Integer getDeleteTag() {
return deleteTag;
}
public void setDeleteTag(Integer deleteTag) {
this.deleteTag = deleteTag;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Integer getSort() {
return sort;
}
public void setSort(Integer sort) {
this.sort = sort;
}
public String getInfo() {
return info;
}
public void setInfo(String info) {
this.info = info;
}
public String getCover() {
return cover;
}
public void setCover(String cover) {
this.cover = cover;
}
@Override
public String toString() {
return "CurriculumResEntity{" +
"id=" + id +
", title=" + title +
", audio=" + audio +
", audioType=" + audioType +
", teacherId=" + teacherId +
", teacherName=" + teacherName +
", content=" + content +
", duration=" + duration +
", fileSize=" + fileSize +
", orgId=" + orgId +
", roomPwd=" + roomPwd +
", whiteList=" + whiteList +
", createBy=" + createBy +
", readNum=" + readNum +
", readBaseNum=" + readBaseNum +
", createTime=" + createTime +
", updateBy=" + updateBy +
", updateTime=" + updateTime +
", deleteTag=" + deleteTag +
", status=" + status +
", sort=" + sort +
", info=" + info +
", cover=" + cover +
"}";
}
}
community-service/src/main/java/com/tanpu/community/dao/entity/user/FinProResEntity.java deleted 100644 → 0
View file @ 1a2f5fdb
package com.tanpu.community.dao.entity.user;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* <p>
*
* </p>
*
* @author xudong
* @since 2021-06-23
*/
@TableName("fin_pro_res")
@ApiModel(value="FinProResEntity对象", description="")
public class FinProResEntity implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "唯一主键")
private String id;
@ApiModelProperty(value = "名称")
private String name;
@ApiModelProperty(value = "名称简拼")
private String abbr;
@ApiModelProperty(value = "备注")
private String bak;
@ApiModelProperty(value = "状态")
private Integer status;
@ApiModelProperty(value = "标识0:机构产品 1：用户自定义产品")
private String flag;
@ApiModelProperty(value = "产品资料")
private String resjson;
@ApiModelProperty(value = "宣传文案")
private String desjson;
@ApiModelProperty(value = "产品缩略图")
private String proImgurl;
@ApiModelProperty(value = "产品亮点")
private String proBright;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "创建人")
private String createBy;
@ApiModelProperty(value = "修改时间")
private LocalDateTime updateTime;
@ApiModelProperty(value = "修改人")
private String updateBy;
@ApiModelProperty(value = "删除标识")
private Integer deleteTag;
@ApiModelProperty(value = "机构Id")
private String orgId;
@ApiModelProperty(value = "产品标签")
private String proTag;
@ApiModelProperty(value = "名称开关")
private String titleSw;
@ApiModelProperty(value = "列表名称")
private String proTitle;
@ApiModelProperty(value = "风险揭示书配置")
private String proRiskConfig;
@ApiModelProperty(value = "风险管控开关")
private Integer investorCertificationSwitch;
@ApiModelProperty(value = "风险评级")
private Integer riskLevel;
@ApiModelProperty(value = "审核人")
private String arReviewBy;
@ApiModelProperty(value = "审核时间")
private LocalDateTime arReviewTime;
@ApiModelProperty(value = "提交发布人")
private String arSubmitBy;
@ApiModelProperty(value = "提交发布时间")
private LocalDateTime arSubmitTime;
@ApiModelProperty(value = "上架人")
private String arReleaseBy;
@ApiModelProperty(value = "上架时间")
private LocalDateTime arReleaseTime;
@ApiModelProperty(value = "产品类型")
private String proType;
@ApiModelProperty(value = "下架人")
private String arSoltBy;
@ApiModelProperty(value = "下架时间")
private LocalDateTime arSoltTime;
@ApiModelProperty(value = "预下架时间")
@TableField("pro_soldout_Time")
private LocalDateTime proSoldoutTime;
@ApiModelProperty(value = "募集开始时间")
private LocalDateTime raiseStart;
@ApiModelProperty(value = "募集结束时间")
private LocalDateTime raiseEnd;
@ApiModelProperty(value = "产品状态")
private String proStatus;
@ApiModelProperty(value = "募集量")
private String raiseNum;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getAbbr() {
return abbr;
}
public void setAbbr(String abbr) {
this.abbr = abbr;
}
public String getBak() {
return bak;
}
public void setBak(String bak) {
this.bak = bak;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public String getFlag() {
return flag;
}
public void setFlag(String flag) {
this.flag = flag;
}
public String getResjson() {
return resjson;
}
public void setResjson(String resjson) {
this.resjson = resjson;
}
public String getDesjson() {
return desjson;
}
public void setDesjson(String desjson) {
this.desjson = desjson;
}
public String getProImgurl() {
return proImgurl;
}
public void setProImgurl(String proImgurl) {
this.proImgurl = proImgurl;
}
public String getProBright() {
return proBright;
}
public void setProBright(String proBright) {
this.proBright = proBright;
}
public LocalDateTime getCreateTime() {
return createTime;
}
public void setCreateTime(LocalDateTime createTime) {
this.createTime = createTime;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public LocalDateTime getUpdateTime() {
return updateTime;
}
public void setUpdateTime(LocalDateTime updateTime) {
this.updateTime = updateTime;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public Integer getDeleteTag() {
return deleteTag;
}
public void setDeleteTag(Integer deleteTag) {
this.deleteTag = deleteTag;
}
public String getOrgId() {
return orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getProTag() {
return proTag;
}
public void setProTag(String proTag) {
this.proTag = proTag;
}
public String getTitleSw() {
return titleSw;
}
public void setTitleSw(String titleSw) {
this.titleSw = titleSw;
}
public String getProTitle() {
return proTitle;
}
public void setProTitle(String proTitle) {
this.proTitle = proTitle;
}
public String getProRiskConfig() {
return proRiskConfig;
}
public void setProRiskConfig(String proRiskConfig) {
this.proRiskConfig = proRiskConfig;
}
public Integer getInvestorCertificationSwitch() {
return investorCertificationSwitch;
}
public void setInvestorCertificationSwitch(Integer investorCertificationSwitch) {
this.investorCertificationSwitch = investorCertificationSwitch;
}
public Integer getRiskLevel() {
return riskLevel;
}
public void setRiskLevel(Integer riskLevel) {
this.riskLevel = riskLevel;
}
public String getArReviewBy() {
return arReviewBy;
}
public void setArReviewBy(String arReviewBy) {
this.arReviewBy = arReviewBy;
}
public LocalDateTime getArReviewTime() {
return arReviewTime;
}
public void setArReviewTime(LocalDateTime arReviewTime) {
this.arReviewTime = arReviewTime;
}
public String getArSubmitBy() {
return arSubmitBy;
}
public void setArSubmitBy(String arSubmitBy) {
this.arSubmitBy = arSubmitBy;
}
public LocalDateTime getArSubmitTime() {
return arSubmitTime;
}
public void setArSubmitTime(LocalDateTime arSubmitTime) {
this.arSubmitTime = arSubmitTime;
}
public String getArReleaseBy() {
return arReleaseBy;
}
public void setArReleaseBy(String arReleaseBy) {
this.arReleaseBy = arReleaseBy;
}
public LocalDateTime getArReleaseTime() {
return arReleaseTime;
}
public void setArReleaseTime(LocalDateTime arReleaseTime) {
this.arReleaseTime = arReleaseTime;
}
public String getProType() {
return proType;
}
public void setProType(String proType) {
this.proType = proType;
}
public String getArSoltBy() {
return arSoltBy;
}
public void setArSoltBy(String arSoltBy) {
this.arSoltBy = arSoltBy;
}
public LocalDateTime getArSoltTime() {
return arSoltTime;
}
public void setArSoltTime(LocalDateTime arSoltTime) {
this.arSoltTime = arSoltTime;
}
public LocalDateTime getProSoldoutTime() {
return proSoldoutTime;
}
public void setProSoldoutTime(LocalDateTime proSoldoutTime) {
this.proSoldoutTime = proSoldoutTime;
}
public LocalDateTime getRaiseStart() {
return raiseStart;
}
public void setRaiseStart(LocalDateTime raiseStart) {
this.raiseStart = raiseStart;
}
public LocalDateTime getRaiseEnd() {
return raiseEnd;
}
public void setRaiseEnd(LocalDateTime raiseEnd) {
this.raiseEnd = raiseEnd;
}
public String getProStatus() {
return proStatus;
}
public void setProStatus(String proStatus) {
this.proStatus = proStatus;
}
public String getRaiseNum() {
return raiseNum;
}
public void setRaiseNum(String raiseNum) {
this.raiseNum = raiseNum;
}
@Override
public String toString() {
return "FinProResEntity{" +
"id=" + id +
", name=" + name +
", abbr=" + abbr +
", bak=" + bak +
", status=" + status +
", flag=" + flag +
", resjson=" + resjson +
", desjson=" + desjson +
", proImgurl=" + proImgurl +
", proBright=" + proBright +
", createTime=" + createTime +
", createBy=" + createBy +
", updateTime=" + updateTime +
", updateBy=" + updateBy +
", deleteTag=" + deleteTag +
", orgId=" + orgId +
", proTag=" + proTag +
", titleSw=" + titleSw +
", proTitle=" + proTitle +
", proRiskConfig=" + proRiskConfig +
", investorCertificationSwitch=" + investorCertificationSwitch +
", riskLevel=" + riskLevel +
", arReviewBy=" + arReviewBy +
", arReviewTime=" + arReviewTime +
", arSubmitBy=" + arSubmitBy +
", arSubmitTime=" + arSubmitTime +
", arReleaseBy=" + arReleaseBy +
", arReleaseTime=" + arReleaseTime +
", proType=" + proType +
", arSoltBy=" + arSoltBy +
", arSoltTime=" + arSoltTime +
", proSoldoutTime=" + proSoldoutTime +
", raiseStart=" + raiseStart +
", raiseEnd=" + raiseEnd +
", proStatus=" + proStatus +
", raiseNum=" + raiseNum +
"}";
}
}
community-service/src/main/java/com/tanpu/community/dao/entity/user/OrderFlowEntity.java deleted 100644 → 0
View file @ 1a2f5fdb
package com.tanpu.community.dao.entity.user;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* <p>
*
* </p>
*
* @author xudong
* @since 2021-06-24
*/
@TableName("order_flow")
@ApiModel(value="OrderFlowEntity对象", description="")
public class OrderFlowEntity implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "唯一主键")
private String id;
@ApiModelProperty(value = "订单号")
private String abOrdernum;
@ApiModelProperty(value = "产品价格")
private Long abPrice;
@ApiModelProperty(value = "积分")
private Long abScore;
@ApiModelProperty(value = "积分抵扣")
private Long abScoreDeduct;
@ApiModelProperty(value = "账户余额抵扣")
private Long abAccountDeduct;
@ApiModelProperty(value = "支付通道付款金额")
private Long abPayment;
@ApiModelProperty(value = "支付方式 1:免费 2：积分 3现金")
private String abPayMode;
@ApiModelProperty(value = "订单总额")
private Long abTotalMoney;
@ApiModelProperty(value = "产品类型")
private String abType;
@ApiModelProperty(value = "产品ID")
private String abProid;
@ApiModelProperty(value = "产品规格ID")
private String abProSiid;
@ApiModelProperty(value = "产品规格类型")
private String abSiType;
@ApiModelProperty(value = "产品规格规格名称")
private String abSiName;
@ApiModelProperty(value = "产品规格规格编码")
private String abSiCode;
@ApiModelProperty(value = "产品规格定价模式")
private String abSiPattern;
@ApiModelProperty(value = "状态 WAIT:待支付 SUCCESS：支付成功 FAIL：支付失败 CANCEL：取消交易")
private String abStatus;
@ApiModelProperty(value = "权益分配状态")
private String abRightsStatus;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createtime;
@ApiModelProperty(value = "创建人")
private String createby;
@ApiModelProperty(value = "修改时间")
private LocalDateTime updatetime;
@ApiModelProperty(value = "修改人")
private String updateby;
@ApiModelProperty(value = "删除标识")
private String deletetag;
@ApiModelProperty(value = "微信unionid")
private String unionid;
@ApiModelProperty(value = "交易流水号")
private String transactionSerialNo;
@ApiModelProperty(value = "付款时间")
private LocalDateTime payTime;
@ApiModelProperty(value = "完成时间")
private LocalDateTime completeTime;
@ApiModelProperty(value = "机构id")
private String orgId;
@ApiModelProperty(value = "注册手机号")
private String registerPhone;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getAbOrdernum() {
return abOrdernum;
}
public void setAbOrdernum(String abOrdernum) {
this.abOrdernum = abOrdernum;
}
public Long getAbPrice() {
return abPrice;
}
public void setAbPrice(Long abPrice) {
this.abPrice = abPrice;
}
public Long getAbScore() {
return abScore;
}
public void setAbScore(Long abScore) {
this.abScore = abScore;
}
public Long getAbScoreDeduct() {
return abScoreDeduct;
}
public void setAbScoreDeduct(Long abScoreDeduct) {
this.abScoreDeduct = abScoreDeduct;
}
public Long getAbAccountDeduct() {
return abAccountDeduct;
}
public void setAbAccountDeduct(Long abAccountDeduct) {
this.abAccountDeduct = abAccountDeduct;
}
public Long getAbPayment() {
return abPayment;
}
public void setAbPayment(Long abPayment) {
this.abPayment = abPayment;
}
public String getAbPayMode() {
return abPayMode;
}
public void setAbPayMode(String abPayMode) {
this.abPayMode = abPayMode;
}
public Long getAbTotalMoney() {
return abTotalMoney;
}
public void setAbTotalMoney(Long abTotalMoney) {
this.abTotalMoney = abTotalMoney;
}
public String getAbType() {
return abType;
}
public void setAbType(String abType) {
this.abType = abType;
}
public String getAbProid() {
return abProid;
}
public void setAbProid(String abProid) {
this.abProid = abProid;
}
public String getAbProSiid() {
return abProSiid;
}
public void setAbProSiid(String abProSiid) {
this.abProSiid = abProSiid;
}
public String getAbSiType() {
return abSiType;
}
public void setAbSiType(String abSiType) {
this.abSiType = abSiType;
}
public String getAbSiName() {
return abSiName;
}
public void setAbSiName(String abSiName) {
this.abSiName = abSiName;
}
public String getAbSiCode() {
return abSiCode;
}
public void setAbSiCode(String abSiCode) {
this.abSiCode = abSiCode;
}
public String getAbSiPattern() {
return abSiPattern;
}
public void setAbSiPattern(String abSiPattern) {
this.abSiPattern = abSiPattern;
}
public String getAbStatus() {
return abStatus;
}
public void setAbStatus(String abStatus) {
this.abStatus = abStatus;
}
public String getAbRightsStatus() {
return abRightsStatus;
}
public void setAbRightsStatus(String abRightsStatus) {
this.abRightsStatus = abRightsStatus;
}
public LocalDateTime getCreatetime() {
return createtime;
}
public void setCreatetime(LocalDateTime createtime) {
this.createtime = createtime;
}
public String getCreateby() {
return createby;
}
public void setCreateby(String createby) {
this.createby = createby;
}
public LocalDateTime getUpdatetime() {
return updatetime;
}
public void setUpdatetime(LocalDateTime updatetime) {
this.updatetime = updatetime;
}
public String getUpdateby() {
return updateby;
}
public void setUpdateby(String updateby) {
this.updateby = updateby;
}
public String getDeletetag() {
return deletetag;
}
public void setDeletetag(String deletetag) {
this.deletetag = deletetag;
}
public String getUnionid() {
return unionid;
}
public void setUnionid(String unionid) {
this.unionid = unionid;
}
public String getTransactionSerialNo() {
return transactionSerialNo;
}
public void setTransactionSerialNo(String transactionSerialNo) {
this.transactionSerialNo = transactionSerialNo;
}
public LocalDateTime getPayTime() {
return payTime;
}
public void setPayTime(LocalDateTime payTime) {
this.payTime = payTime;
}
public LocalDateTime getCompleteTime() {
return completeTime;
}
public void setCompleteTime(LocalDateTime completeTime) {
this.completeTime = completeTime;
}
public String getOrgId() {
return orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getRegisterPhone() {
return registerPhone;
}
public void setRegisterPhone(String registerPhone) {
this.registerPhone = registerPhone;
}
@Override
public String toString() {
return "OrderFlowEntity{" +
"id=" + id +
", abOrdernum=" + abOrdernum +
", abPrice=" + abPrice +
", abScore=" + abScore +
", abScoreDeduct=" + abScoreDeduct +
", abAccountDeduct=" + abAccountDeduct +
", abPayment=" + abPayment +
", abPayMode=" + abPayMode +
", abTotalMoney=" + abTotalMoney +
", abType=" + abType +
", abProid=" + abProid +
", abProSiid=" + abProSiid +
", abSiType=" + abSiType +
", abSiName=" + abSiName +
", abSiCode=" + abSiCode +
", abSiPattern=" + abSiPattern +
", abStatus=" + abStatus +
", abRightsStatus=" + abRightsStatus +
", createtime=" + createtime +
", createby=" + createby +
", updatetime=" + updatetime +
", updateby=" + updateby +
", deletetag=" + deletetag +
", unionid=" + unionid +
", transactionSerialNo=" + transactionSerialNo +
", payTime=" + payTime +
", completeTime=" + completeTime +
", orgId=" + orgId +
", registerPhone=" + registerPhone +
"}";
}
}
community-service/src/main/java/com/tanpu/community/dao/entity/user/UserInfoEntity.java
View file @ b70e6d7c
package com.tanpu.community.dao.entity.user; package com.tanpu.community.dao.entity.user;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* *
* </p> * </p>
* *
* @author xudong * @author xudong
* @since 2021-07-14 * @since 2021-07-20
*/ */
@TableName("user_info") @TableName("user_info")
@ApiModel(value="UserInfoEntity对象", description="") @ApiModel(value="UserInfoEntity对象", description="")
...@@ -24,6 +25,9 @@ public class UserInfoEntity implements Serializable { ...@@ -24,6 +25,9 @@ public class UserInfoEntity implements Serializable {
@ApiModelProperty(value = "唯一主键") @ApiModelProperty(value = "唯一主键")
private String id; private String id;
@ApiModelProperty(value = "账户类型 1普通账号 2机构账号 3机构人员")
private Integer userType;
@ApiModelProperty(value = "微信openId") @ApiModelProperty(value = "微信openId")
private String uiOpenid; private String uiOpenid;
...@@ -253,6 +257,14 @@ public class UserInfoEntity implements Serializable { ...@@ -253,6 +257,14 @@ public class UserInfoEntity implements Serializable {
this.id = id; this.id = id;
} }
public Integer getUserType() {
return userType;
}
public void setUserType(Integer userType) {
this.userType = userType;
}
public String getUiOpenid() { public String getUiOpenid() {
return uiOpenid; return uiOpenid;
} }
...@@ -889,6 +901,7 @@ public class UserInfoEntity implements Serializable { ...@@ -889,6 +901,7 @@ public class UserInfoEntity implements Serializable {
public String toString() { public String toString() {
return "UserInfoEntity{" + return "UserInfoEntity{" +
"id=" + id + "id=" + id +
", userType=" + userType +
", uiOpenid=" + uiOpenid + ", uiOpenid=" + uiOpenid +
", uiUnionid=" + uiUnionid + ", uiUnionid=" + uiUnionid +
", uiTelphone=" + uiTelphone + ", uiTelphone=" + uiTelphone +
......
community-service/src/main/java/com/tanpu/community/dao/mapper/user/CurriculumPriceMapper.java deleted 100644 → 0
View file @ 1a2f5fdb
package com.tanpu.community.dao.mapper.user;
import com.tanpu.community.dao.entity.user.CurriculumPriceEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 定价表 Mapper 接口
* </p>
*
* @author xudong
* @since 2021-06-24
*/
public interface CurriculumPriceMapper extends BaseMapper<CurriculumPriceEntity> {
}
community-service/src/main/java/com/tanpu/community/dao/mapper/user/CurriculumResMapper.java deleted 100644 → 0
View file @ 1a2f5fdb
package com.tanpu.community.dao.mapper.user;
import com.tanpu.community.dao.entity.user.CurriculumResEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 课程资源 Mapper 接口
* </p>
*
* @author xudong
* @since 2021-06-23
*/
public interface CurriculumResMapper extends BaseMapper<CurriculumResEntity> {
}
community-service/src/main/java/com/tanpu/community/dao/mapper/user/FinProResMapper.java deleted 100644 → 0
View file @ 1a2f5fdb
package com.tanpu.community.dao.mapper.user;
import com.tanpu.community.dao.entity.user.FinProResEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author xudong
* @since 2021-06-23
*/
public interface FinProResMapper extends BaseMapper<FinProResEntity> {
}
community-service/src/main/java/com/tanpu/community/dao/mapper/user/OrderFlowMapper.java deleted 100644 → 0
View file @ 1a2f5fdb
package com.tanpu.community.dao.mapper.user;
import com.tanpu.community.dao.entity.user.OrderFlowEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author xudong
* @since 2021-06-24
*/
public interface OrderFlowMapper extends BaseMapper<OrderFlowEntity> {
}
community-service/src/main/java/com/tanpu/community/service/ProductService.java
View file @ b70e6d7c
...@@ -376,9 +376,12 @@ public class ProductService { ...@@ -376,9 +376,12 @@ public class ProductService {
themeQo.setTopicTitle(topicMap.get(themeQo.getTopicId())); themeQo.setTopicTitle(topicMap.get(themeQo.getTopicId()));
} }
if (!StringUtils.isEmpty(themeQo.getAuthorId()) && userMap.containsKey(themeQo.getAuthorId())) { if (!StringUtils.isEmpty(themeQo.getAuthorId()) && userMap.containsKey(themeQo.getAuthorId())) {
themeQo.setNickName(userMap.get(themeQo.getAuthorId()).getUiUsernameMp()); UserInfoEntity userInfoEntity = userMap.get(themeQo.getAuthorId());
themeQo.setUserImg(userMap.get(themeQo.getAuthorId()).getUiHeadimgMp()); themeQo.setNickName(userInfoEntity.getUiUsernameMp());
themeQo.setUserIntroduction(userMap.get(themeQo.getAuthorId()).getUiIntroductionMp()); themeQo.setUserImg(userInfoEntity.getUiHeadimgMp());
themeQo.setUserIntroduction(userInfoEntity.getUiIntroductionMp());
themeQo.setUserType(userInfoEntity.getUserType());
themeQo.setLevelGrade(userInfoEntity.getLevelGrade());
} }
if (themeQo.getContent() == null) { if (themeQo.getContent() == null) {
continue; continue;
......
community-service/src/main/resources/mapper/user/UserInfoEntityMapper.xml
View file @ b70e6d7c
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.tanpu.community.dao.entity.user.UserInfoEntity"> <resultMap id="BaseResultMap" type="com.tanpu.community.dao.entity.user.UserInfoEntity">
<id column="id" property="id" /> <id column="id" property="id" />
<result column="user_type" property="userType" />
<result column="ui_openid" property="uiOpenid" /> <result column="ui_openid" property="uiOpenid" />
<result column="ui_unionId" property="uiUnionid" /> <result column="ui_unionId" property="uiUnionid" />
<result column="ui_telphone" property="uiTelphone" /> <result column="ui_telphone" property="uiTelphone" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment