更新时间字段赋值

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -570,6 +570,7 @@ public class UserController extends BaseController {
         user.setQqOpenid(
                 StringUtil.isEmpty(param.getQqOpenid()) ? user.getQqOpenid() : param.getQqOpenid()
         );
+        user.setUpdateTime(new Date());
         sysUserService.update(user);
         return HttpResponseResult.succeed(true);
     }

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -207,8 +207,7 @@
 
     <update id="updateUserCard">
         UPDATE sys_user
-
-        <set>
+        set
             <if test="param.realName != null and param.realName != ''">
                 real_name_ = #{param.realName},
             </if>
@@ -224,7 +223,7 @@
             <if test="param.avatar != null and param.avatar != ''">
                 avatar_ = #{param.avatar},
             </if>
-        </set>
+        update_time_ = now()
         WHERE id_ = #{param.userId}
     </update>
 
@@ -241,16 +240,17 @@
 
     <update id="updatetSetDetail">
         UPDATE sys_user
-        set update_time_ = now()
-            <if test="param.avatar != null and param.avatar != ''">
-                ,avatar_ = #{param.avatar}
-            </if>
-            <if test="param.username != null and param.username != ''">
-                ,username_ = #{param.username}
-            </if>
-            <if test="param.gender != null">
-                ,gender_ = #{param.gender}
-            </if>
+        set
+        <if test="param.avatar != null and param.avatar != ''">
+            avatar_ = #{param.avatar},
+        </if>
+        <if test="param.username != null and param.username != ''">
+            username_ = #{param.username},
+        </if>
+        <if test="param.gender != null">
+            gender_ = #{param.gender},
+        </if>
+        update_time_ = now()
         WHERE id_ = #{id}
     </update>
 

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MemberPriceSettingsController.java

@@ -1,5 +1,9 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.dto.search.MemberPriceSettingsSearch;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
+import com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -9,11 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
@@ -24,35 +24,48 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.cooleshow.common.page.QueryInfo;
 
+import javax.validation.Valid;
+
 @RequestMapping("memberPriceSettings")
 @Api(tags = "会员价格设置")
 @RestController
 public class MemberPriceSettingsController extends BaseController {
-
 	@Autowired
 	private MemberPriceSettingsService memberPriceSettingsService;
-
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
 
-	@ApiOperation("分页查询")
-	@GetMapping(value = "/list")
-	@PreAuthorize("@pcs.hasPermissions('memberPriceSettings/list')")
-	public HttpResponseResult<PageInfo<MemberPriceSettings>> getList(QueryInfo queryInfo) {
-		return succeed(memberPriceSettingsService.queryPage(queryInfo));
+	/**
+	 * 查询单条
+	 */
+	@GetMapping("/detail/{id}")
+	@ApiOperation(value = "详情", notes = "传入id")
+	public HttpResponseResult<MemberPriceSettingsVo> detail(@PathVariable("id") Long id) {
+		return succeed(memberPriceSettingsService.detail(id));
 	}
 
-	@ApiOperation("更新")
+	/**
+	 * 查询分页
+	 */
+	@PostMapping("/page")
+	@ApiOperation(value = "查询分页", notes = "传入memberPriceSettingsSearch")
+	public HttpResponseResult<PageInfo<MemberPriceSettingsVo>> page(@RequestBody MemberPriceSettingsSearch query) {
+		IPage<MemberPriceSettingsVo> pages = memberPriceSettingsService.selectPage(PageUtil.getPage(query), query);
+		return succeed(PageUtil.pageInfo(pages));
+	}
+
+	/**
+	 * 修改
+	 */
 	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@PreAuthorize("@pcs.hasPermissions('memberPriceSettings/update')")
-	public HttpResponseResult<Object> update(@RequestBody MemberPriceSettings memberPriceSettings) {
+	@ApiOperation(value = "修改", notes = "传入memberPriceSettings")
+	public HttpResponseResult<Boolean> update(@Valid @RequestBody MemberPriceSettings memberPriceSettings) {
 		SysUser user = sysUserFeignService.queryUserInfo();
-
 		if (user == null || user.getId() == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		memberPriceSettings.setUpdateBy(user.getId()).setUpdateTime(new Date());
-		memberPriceSettingsService.update(memberPriceSettings);
-		return succeed();
+		memberPriceSettings.setUpdateBy(user.getId());
+		memberPriceSettings.setUpdateTime(new Date());
+		return status(memberPriceSettingsService.updateById(memberPriceSettings));
 	}
 }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserBankCardController.java

@@ -1,86 +0,0 @@
-package com.yonge.cooleshow.admin.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-import com.yonge.cooleshow.biz.dal.support.PageUtil;
-import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-import com.yonge.cooleshow.biz.dal.vo.UserBankCardVo;
-import com.yonge.cooleshow.biz.dal.dto.search.UserBankCardSearch;
-import com.yonge.cooleshow.biz.dal.entity.UserBankCard;
-import com.yonge.cooleshow.biz.dal.service.UserBankCardService;
-
-@RestController
-@RequestMapping("/userBankCard")
-@Api(value = "用户绑卡记录表", tags = "用户绑卡记录表")
-public class UserBankCardController extends BaseController {
-
-    @Autowired
-    private UserBankCardService userBankCardService;
-
-	/**
-     * 查询单条
-     */
-    @GetMapping("/detail/{id}")
-    @ApiOperation(value = "详情", notes = "传入id")
-    public HttpResponseResult<UserBankCardVo> detail(@PathVariable("id") Long id) {
-    	return succeed(userBankCardService.detail(id));
-	}
-    
-    /**
-     * 查询分页
-     */
-    @PostMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入userBankCardSearch")
-    public HttpResponseResult<PageInfo<UserBankCardVo>> page(@RequestBody UserBankCardSearch query) {
-		IPage<UserBankCardVo> pages = userBankCardService.selectPage(PageUtil.getPage(query), query);
-        return succeed(PageUtil.pageInfo(pages));
-	}
-    
-    /**
-	 * 新增
-	 */
-	@PostMapping("/save")
-	@ApiOperation(value = "新增", notes = "传入userBankCard")
-	public HttpResponseResult save(@Valid @RequestBody UserBankCard userBankCard) {
-    	return status(userBankCardService.save(userBankCard));
-	}
-    
-    /**
-	 * 修改
-	 */
-	@PostMapping("/update")
-	@ApiOperation(value = "修改", notes = "传入userBankCard")
-	public HttpResponseResult update(@Valid @RequestBody UserBankCard userBankCard) {
-        return status(userBankCardService.updateById(userBankCard));
-	}
-    
-    /**
-	 * 新增或修改
-	 */
-    @PostMapping("/submit")
-    @ApiOperation(value = "新增或修改", notes = "传入userBankCard")
-	public HttpResponseResult submit(@Valid @RequestBody UserBankCard userBankCard) {
-        return status(userBankCardService.saveOrUpdate(userBankCard));
-    }
-
- 	/**
-	 * 删除
-	 */
-	@PostMapping("/remove")
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
-	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        if (StringUtil.isEmpty(ids)) {
-			return failed("参数不能为空");
-		}
-		return status(userBankCardService.removeByIds(StringUtil.toLongList(ids)));
-	}
-}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserOrderController.java

@@ -23,7 +23,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/userOrder")
-@Api(value = "平台订单表", tags = "平台订单表")
+@Api(value = "订单管理", tags = "订单管理")
 public class UserOrderController extends BaseController {
 
     @Autowired

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserWithdrawalController.java

@@ -34,7 +34,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/userWithdrawal")
-@Api(value = "用户账户提现表", tags = "用户账户提现表")
+@Api(value = "用户提现", tags = "用户提现")
 public class UserWithdrawalController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VipCardController.java

@@ -1,69 +0,0 @@
-package com.yonge.cooleshow.admin.controller;
-
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
-
-import io.swagger.annotations.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-import com.yonge.cooleshow.biz.dal.vo.VipCardVo;
-import com.yonge.cooleshow.biz.dal.entity.VipCard;
-import com.yonge.cooleshow.biz.dal.service.VipCardService;
-
-import java.util.Date;
-import java.util.List;
-
-@RestController
-@RequestMapping("/vipCard")
-@Api(value = "会员卡表", tags = "会员卡表")
-public class VipCardController extends BaseController {
-
-    @Autowired
-    private VipCardService vipCardService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-
-	/**
-     * 查询单条
-     */
-    @GetMapping("/detail/{id}")
-    @ApiOperation(value = "详情", notes = "传入id")
-    @PreAuthorize("@pcs.hasPermissions('vipCard/detail')")
-    public HttpResponseResult<VipCardVo> detail(@PathVariable("id") Long id) {
-    	return succeed(vipCardService.detail(id));
-	}
-    
-    /**
-     * 查询分页
-     */
-    @PostMapping("/list")
-    @ApiOperation(value = "查询列表")
-    @PreAuthorize("@pcs.hasPermissions('vipCard/list')")
-    public HttpResponseResult<List<VipCardVo>> list() {
-		List<VipCardVo> list = vipCardService.selectList();
-        return succeed(list);
-	}
-    
-    /**
-	 * 修改
-	 */
-	@PostMapping("/update")
-	@ApiOperation(value = "修改", notes = "传入vipCard")
-    @PreAuthorize("@pcs.hasPermissions('vipCard/update')")
-    public HttpResponseResult update(@Valid @RequestBody VipCard vipCard) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        vipCard.setUpdateBy(user.getId());
-        vipCard.setUpdateTime(new Date());
-        return status(vipCardService.updateById(vipCard));
-	}
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MemberPriceSettingsDao.java

@@ -1,9 +1,37 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings;
+import com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo;
+import com.yonge.cooleshow.biz.dal.dto.search.MemberPriceSettingsSearch;
+
 
-public interface MemberPriceSettingsDao extends BaseDAO<Integer, MemberPriceSettings> {
+public interface MemberPriceSettingsDao extends BaseMapper<MemberPriceSettings>{
+    /**
+     * 查询详情
+     * @author liweifan
+     * @date 2022-04-25 14:34:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo
+     */
+    MemberPriceSettingsVo detail(@Param("id") Long id);
 
-	
+    /**
+     * 分页查询
+     * @author liweifan
+     * @date 2022-04-25 14:34:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo
+     */
+    List<MemberPriceSettingsVo> selectPage(@Param("page") IPage page, @Param("param") MemberPriceSettingsSearch param);
+    /***
+     * 查询集合
+     * @author liweifan
+     * @param: param
+     * @updateTime 2022/4/25 14:58
+     * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo>
+     */
+    List<MemberPriceSettingsVo> selectList(@Param("param") MemberPriceSettingsSearch param);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/TeacherAuthEntryRecordDao.java

@@ -18,15 +18,6 @@ public interface TeacherAuthEntryRecordDao extends BaseMapper<TeacherAuthEntryRe
 	List<TeacherAuthEntryRecordVo> selectPage(@Param("page")IPage page,@Param("param") AuthEntryRecordSearch search);
 
 	/***
-	 * 修改用户实名信息
-	 * @author liweifan
-	 * @param: teacherApplyDetailDto
-	 * @updateTime 2022/3/18 15:57
-	 * @return: java.lang.Integer
-	 */
-	Integer updateUserCard(@Param("param") TeacherApplyDetailReq teacherApplyDetailDto);
-
-	/***
 	 * 根据老师id查询详情
 	 * @author liweifan
 	 * @param: id

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VipCardDao.java

@@ -1,27 +0,0 @@
-package com.yonge.cooleshow.biz.dal.dao;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import com.yonge.cooleshow.biz.dal.entity.VipCard;
-import com.yonge.cooleshow.biz.dal.vo.VipCardVo;
-
-
-public interface VipCardDao extends BaseMapper<VipCard>{
-	/**
-	 * 查询详情
-     * @author liweifan
-     * @date 2022-04-13 13:36:48
-     * @return: com.yonge.cooleshow.biz.dal.vo.VipCardVo
-	 */
-	VipCardVo detail(@Param("id") Long id);
-	/***
-	 * 查询集合
-	 * @author liweifan
-	 * @updateTime 2022/4/13 14:02
-	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.VipCardVo>
-	 */
-	List<VipCardVo> selectList();
-	
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MemberPriceSettingsSearch.java

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.cooleshow.common.page.QueryInfo;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-04-25 14:34:49
+ */
+@ApiModel(value = "MemberPriceSettingsSearch对象", description = "查询对象")
+public class MemberPriceSettingsSearch extends QueryInfo{
+	private static final long serialVersionUID = 1L;
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MemberPriceSettings.java

@@ -1,125 +1,117 @@
 package com.yonge.cooleshow.biz.dal.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.yonge.cooleshow.biz.dal.enums.PeriodEnum;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import com.yonge.cooleshow.biz.dal.enums.PeriodEnum;
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
-/**
- * 对应数据库表(member_price_settings):
- */
-public class MemberPriceSettings {
+import javax.validation.constraints.PositiveOrZero;
+import java.math.BigDecimal;
 
-	@ApiModelProperty(value = "",required = false)
-	private Integer id;
-	
-	@ApiModelProperty(value = "周期",required = false)
+@TableName("member_price_settings")
+@ApiModel(value = "MemberPriceSettings对象", description = "")
+public class MemberPriceSettings implements Serializable {
+	private static final long serialVersionUID = 1L;
+	@TableId(value = "id_", type = IdType.AUTO)
+	private Long id;
+	@ApiModelProperty("周期 ")
+	@TableField(value = "period_")
 	private PeriodEnum period;
-	
-	@ApiModelProperty(value = "销售价",required = false)
-	private java.math.BigDecimal salePrice;
-	
-	@ApiModelProperty(value = "原价",required = false)
-	private java.math.BigDecimal originalPrice;
-	
-	@ApiModelProperty(value = "创建时间",required = false)
-	private java.util.Date createTime;
-	
-	@ApiModelProperty(value = "更新时间",required = false)
-	private java.util.Date updateTime;
-	
-	@ApiModelProperty(value = "创建人",required = false)
+	@PositiveOrZero(message = "销售价必须大于等于0")
+	@ApiModelProperty("销售价 ")
+	@TableField(value = "sale_price_")
+	private BigDecimal salePrice;
+	@PositiveOrZero(message = "原价必须大于等于0")
+	@ApiModelProperty("原价 ")
+	@TableField(value = "original_price_")
+	private BigDecimal originalPrice;
+	@ApiModelProperty("创建时间 ")
+	@TableField(value = "create_time_")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date createTime;
+	@ApiModelProperty("更新时间 ")
+	@TableField(value = "update_time_")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date updateTime;
+	@ApiModelProperty("创建人 ")
+	@TableField(value = "create_by_")
 	private Long createBy;
-	
-	@ApiModelProperty(value = "更新人",required = false)
+	@ApiModelProperty("更新人 ")
+	@TableField(value = "update_by_")
 	private Long updateBy;
-	
-	private String modifierName;
-	
-	public MemberPriceSettings setId(Integer id){
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
 		this.id = id;
-		return this;
 	}
-	
-	public Integer getId(){
-		return this.id;
+
+	public PeriodEnum getPeriod() {
+		return period;
 	}
-			
-	public MemberPriceSettings setPeriod(PeriodEnum period){
+
+	public void setPeriod(PeriodEnum period) {
 		this.period = period;
-		return this;
 	}
-	
-	public PeriodEnum getPeriod(){
-		return this.period;
+
+	public BigDecimal getSalePrice() {
+		return salePrice;
 	}
-			
-	public MemberPriceSettings setSalePrice(java.math.BigDecimal salePrice){
+
+	public void setSalePrice(BigDecimal salePrice) {
 		this.salePrice = salePrice;
-		return this;
 	}
-	
-	public java.math.BigDecimal getSalePrice(){
-		return this.salePrice;
+
+	public BigDecimal getOriginalPrice() {
+		return originalPrice;
 	}
-			
-	public MemberPriceSettings setOriginalPrice(java.math.BigDecimal originalPrice){
+
+	public void setOriginalPrice(BigDecimal originalPrice) {
 		this.originalPrice = originalPrice;
-		return this;
 	}
-	
-	public java.math.BigDecimal getOriginalPrice(){
-		return this.originalPrice;
+
+	public Date getCreateTime() {
+		return createTime;
 	}
-			
-	public MemberPriceSettings setCreateTime(java.util.Date createTime){
+
+	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
-		return this;
 	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
+
+	public Date getUpdateTime() {
+		return updateTime;
 	}
-			
-	public MemberPriceSettings setUpdateTime(java.util.Date updateTime){
+
+	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
-		return this;
 	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
+
+	public Long getCreateBy() {
+		return createBy;
 	}
-			
-	public MemberPriceSettings setCreateBy(Long createBy){
+
+	public void setCreateBy(Long createBy) {
 		this.createBy = createBy;
-		return this;
-	}
-	
-	public Long getCreateBy(){
-		return this.createBy;
-	}
-			
-	public MemberPriceSettings setUpdateBy(Long updateBy){
-		this.updateBy = updateBy;
-		return this;
-	}
-	
-	public Long getUpdateBy(){
-		return this.updateBy;
-	}
-			
-	public String getModifierName() {
-		return modifierName;
 	}
 
-	public void setModifierName(String modifierName) {
-		this.modifierName = modifierName;
+	public Long getUpdateBy() {
+		return updateBy;
 	}
 
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
+	public void setUpdateBy(Long updateBy) {
+		this.updateBy = updateBy;
 	}
 
-}
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/PeriodEnum.java

@@ -1,19 +1,31 @@
 package com.yonge.cooleshow.biz.dal.enums;
 
+import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.cooleshow.common.enums.BaseEnum;
 
 /**
  * 周期
  */
 public enum PeriodEnum implements BaseEnum<String, PeriodEnum> {
-	DAY("日"), MONTH("月"), QUARTERLY("季度"), YEAR_HALF("半年"), YEAR("年");
+	DAY("日"),
+	MONTH("月"),
+	QUARTERLY("季度"),
+	YEAR_HALF("半年"),
+	YEAR("年");
 
+	@EnumValue
+	private String code;
 	private String msg;
 
 	PeriodEnum(String msg) {
+		this.code = this.name();
 		this.msg = msg;
 	}
 
+	public void setCode(String code) {
+		this.code = code;
+	}
+
 	public String getMsg() {
 		return msg;
 	}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/MemberPriceSettingsService.java

@@ -1,8 +1,55 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
+import com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo;
+import com.yonge.cooleshow.biz.dal.dto.search.MemberPriceSettingsSearch;
 import com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
+import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 
-public interface MemberPriceSettingsService extends BaseService<Integer, MemberPriceSettings> {
+import java.util.List;
 
+/**
+ *  服务类
+ * @author liweifan
+ * @date 2022-04-25
+ */
+public interface MemberPriceSettingsService extends IService<MemberPriceSettings>  {
+    /**
+     * 查询详情
+     * @author liweifan
+     * @date 2022-04-25
+     */
+    MemberPriceSettingsVo detail(Long id);
+    /**
+     * 分页查询
+     * @author liweifan
+     * @date 2022-04-25
+     */
+    IPage<MemberPriceSettingsVo> selectPage(IPage<MemberPriceSettingsVo> page, MemberPriceSettingsSearch query);
+    /***
+     * 查询列表
+     * @author liweifan
+     * @updateTime 2022/4/25 14:55
+     * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo>
+     */
+    List<MemberPriceSettingsVo> selectList(MemberPriceSettingsSearch query);
+    /***
+     * 订单下单前操作
+     * @author liweifan
+     * @param: orderReq
+     * @updateTime 2022/3/31 15:47
+     * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.lang.Boolean>
+     */
+    HttpResponseResult<OrderCreateRes> orderCreate(OrderReq.OrderReqInfo orderReqInfo);
+    /***
+     * 订单下单后操作
+     * @author liweifan
+     * @param: orderVo
+     * @updateTime 2022/3/31 17:24
+     */
+    void orderSuccess(UserOrderDetailVo orderDetailVo);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/VipCardService.java

@@ -1,49 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
-import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
-import com.yonge.cooleshow.biz.dal.vo.UserOrderVo;
-import com.yonge.cooleshow.biz.dal.vo.VipCardVo;
-import com.yonge.cooleshow.biz.dal.entity.VipCard;
-import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
-
-import java.util.List;
-
-/**
- * 会员卡表 服务类
- * @author liweifan
- * @date 2022-04-13
- */
-public interface VipCardService extends IService<VipCard>  {
-
-	/**
-     * 查询详情
-     * @author liweifan
- 	 * @date 2022-04-13
-     */
-	VipCardVo detail(Long id);
-	/***
-	 * 查询页面
-	 * @author liweifan
-	 * @updateTime 2022/4/13 13:59
-	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.VipCardVo>
-	 */
-	List<VipCardVo> selectList();
-	/***
-	 * 订单下单前操作
-	 * @author liweifan
-	 * @param: orderReq
-	 * @updateTime 2022/3/31 15:47
-	 * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.lang.Boolean>
-	 */
-	HttpResponseResult<OrderCreateRes> orderCreate(OrderReq.OrderReqInfo orderReqInfo);
-	/***
-	 * 订单下单后操作
-	 * @author liweifan
-	 * @param: orderVo
-	 * @updateTime 2022/3/31 17:24
-	 */
-	void orderSuccess(UserOrderDetailVo orderDetailVo);
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MemberPriceSettingsServiceImpl.java

@@ -1,23 +1,118 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
+import com.yonge.cooleshow.biz.dal.entity.VipCardRecord;
+import com.yonge.cooleshow.biz.dal.enums.PeriodEnum;
+import com.yonge.cooleshow.biz.dal.enums.TimeTypeEnum;
+import com.yonge.cooleshow.biz.dal.service.StudentService;
+import com.yonge.cooleshow.biz.dal.service.VipCardRecordService;
+import com.yonge.cooleshow.biz.dal.vo.StudentVo;
+import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
+import com.yonge.cooleshow.biz.dal.vo.VipCardVo;
+import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 import org.springframework.stereotype.Service;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings;
-import com.yonge.cooleshow.biz.dal.service.MemberPriceSettingsService;
+import com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo;
+import com.yonge.cooleshow.biz.dal.dto.search.MemberPriceSettingsSearch;
 import com.yonge.cooleshow.biz.dal.dao.MemberPriceSettingsDao;
+import com.yonge.cooleshow.biz.dal.service.MemberPriceSettingsService;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
 
 @Service
-public class MemberPriceSettingsServiceImpl extends BaseServiceImpl<Integer, MemberPriceSettings>  implements MemberPriceSettingsService {
-	
+public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSettingsDao, MemberPriceSettings> implements MemberPriceSettingsService {
+	private final static Logger log = LoggerFactory.getLogger(MemberPriceSettingsServiceImpl.class);
+	@Autowired
+	private StudentService studentService;
 	@Autowired
-	private MemberPriceSettingsDao memberPriceSettingsDao;
+	private VipCardRecordService vipCardRecordService;
 
 	@Override
-	public BaseDAO<Integer, MemberPriceSettings> getDAO() {
-		return memberPriceSettingsDao;
+	public MemberPriceSettingsVo detail(Long id) {
+		return baseMapper.detail(id);
 	}
-	
+
+	@Override
+	public IPage<MemberPriceSettingsVo> selectPage(IPage<MemberPriceSettingsVo> page, MemberPriceSettingsSearch query){
+		return page.setRecords(baseMapper.selectPage(page, query));
+	}
+
+	@Override
+	public List<MemberPriceSettingsVo> selectList(MemberPriceSettingsSearch query) {
+		return baseMapper.selectList(query);
+	}
+
+
+	@Override
+	public HttpResponseResult<OrderCreateRes> orderCreate(OrderReq.OrderReqInfo orderReqInfo) {
+		MemberPriceSettingsVo detail = detail(Long.parseLong(orderReqInfo.getBizContent().toString()));
+		if (null == detail) {
+			return HttpResponseResult.failed("未找到会员卡信息");
+		}
+		//插入会员卡信息到会员卡记录表
+		OrderCreateRes orderCreateRes = new OrderCreateRes();
+		orderCreateRes.setRes(true);
+		orderCreateRes.setBizId(detail.getId());
+		orderCreateRes.setBizContent("会员卡购买-" + detail.getPeriod().getMsg());
+		orderCreateRes.setGoodNum(1);
+		orderCreateRes.setOriginalPrice(detail.getOriginalPrice());
+		orderCreateRes.setExpectPrice(detail.getSalePrice());
+		return HttpResponseResult.succeed(orderCreateRes);
+	}
+
+
+	@Override
+	public void orderSuccess(UserOrderDetailVo orderDetailVo) {
+		MemberPriceSettingsVo detail = detail(orderDetailVo.getBizId());
+		if (null == detail) {
+			return;
+		}
+		StudentVo studentVo = studentService.detail(orderDetailVo.getUserId());
+		//修改用户会员时长
+		Date membershipEndTime = studentVo.getMembershipEndTime();
+		Calendar now = Calendar.getInstance();
+
+		VipCardRecord vipCardRecord = new VipCardRecord();
+		vipCardRecord.setUserId(orderDetailVo.getUserId());
+		vipCardRecord.setOrderId(orderDetailVo.getOrderId());
+		vipCardRecord.setVipCardId(detail.getId());
+
+		if (null == membershipEndTime || membershipEndTime.before(new Date())) {
+			//没有会员、会员已过期
+			studentVo.setMembershipStartTime(now.getTime());
+		} else {
+			now.setTime(studentVo.getMembershipEndTime());
+		}
+		vipCardRecord.setStartTime(now.getTime());
+
+		if(PeriodEnum.DAY.equals(detail.getPeriod())){
+			now.add(Calendar.DAY_OF_MONTH, 1);
+		}else if (PeriodEnum.MONTH.equals(detail.getPeriod())) {
+			now.add(Calendar.MONTH, 1);
+		} else if (PeriodEnum.QUARTERLY.equals(detail.getPeriod())) {
+			now.add(Calendar.MONTH, 3);
+		} else if (PeriodEnum.YEAR_HALF.equals(detail.getPeriod())) {
+			now.add(Calendar.MONTH, 6);
+		} else if (PeriodEnum.YEAR.equals(detail.getPeriod())) {
+			now.add(Calendar.YEAR, 1);
+		}
+
+		vipCardRecord.setEndTime(now.getTime());
+		studentVo.setMembershipEndTime(now.getTime());
+		studentVo.setMemberRankSettingId(1l);
+		studentVo.setUpdateTime(new Date());
+		studentService.updateById(studentVo);
+		//会员购买记录入库
+		vipCardRecordService.save(vipCardRecord);
+	}
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherAuthEntryRecordServiceImpl.java

@@ -47,13 +47,14 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
         build.setTeacherAuthStatus(authOperaReq.getPass() ? AuthStatusEnum.PASS : AuthStatusEnum.UNPASS);
         build.setReason(authOperaReq.getReason());
         build.setVerifyUserId(sysUser.getId());
+        build.setUpdateTime(new Date());
 
         //修改teacher表
         Teacher teacher = teacherDao.selectById(build.getUserId());
         if (null == teacher) {
             return HttpResponseResult.failed("未找到用户信息");
         }
-        if (AuthStatusEnum.PASS.equals(authOperaReq.getPass())) {
+        if (authOperaReq.getPass()) {
             teacher.setSubjectId(StringUtil.isEmpty(teacher.getSubjectId()) ? build.getSubjectId() : teacher.getSubjectId());
             teacher.setIntroduction(StringUtil.isEmpty(teacher.getIntroduction()) ? build.getIntroduction() : teacher.getIntroduction());
             teacher.setGraduateSchool(StringUtil.isEmpty(teacher.getGraduateSchool()) ? build.getGraduateSchool() : teacher.getGraduateSchool());
@@ -64,6 +65,7 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
         }
         teacher.setEntryFlag(authOperaReq.getPass() ? YesOrNoEnum.YES : YesOrNoEnum.NO);
         teacher.setEntryAuthDate(new Date());
+        teacher.setUpdateTime(new Date());
         teacherDao.updateById(teacher);
         return HttpResponseResult.succeed(baseMapper.updateById(build) > 0);
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherAuthMusicianRecordServiceImpl.java

@@ -74,12 +74,14 @@ public class TeacherAuthMusicianRecordServiceImpl extends ServiceImpl<TeacherAut
         build.setTeacherAuthStatus(authOperaReq.getPass() ? AuthStatusEnum.PASS : AuthStatusEnum.UNPASS);
         build.setReason(authOperaReq.getReason());
         build.setVerifyUserId(sysUser.getId());
+        build.setUpdateTime(new Date());
 
         //修改teacher表
         Teacher teacher = new Teacher();
         teacher.setUserId(build.getUserId());
         teacher.setMusicianFlag(authOperaReq.getPass() ? YesOrNoEnum.YES : YesOrNoEnum.NO);
         teacher.setMusicianDate(new Date());
+        teacher.setUpdateTime(new Date());
         teacherDao.updateById(teacher);
 
         return HttpResponseResult.succeed(baseMapper.updateById(build) > 0);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -157,6 +157,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             teacher.setUserId(id);
             teacher.setLiveFlag(YesOrNoEnum.YES);
             teacher.setLiveDate(new Date());
+            teacher.setUpdateTime(new Date());
             baseMapper.updateById(teacher);
             return HttpResponseResult.status(true);
         } else {
@@ -208,8 +209,10 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
 
         Teacher teacher = baseMapper.selectById(teacherSubmitReq.getUserId());
         teacher = getTeacherDetil(teacher, teacherSubmitReq);
+        teacher.setUpdateTime(new Date());
         baseMapper.updateById(teacher);
 
+        sysUser.setUpdateTime(new Date());
         employeeDao.updateSysUser(sysUser);
         return HttpResponseResult.succeed(true);
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -42,7 +42,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     private final static Logger log = LoggerFactory.getLogger(UserOrderServiceImpl.class);
 
     @Autowired
-    private VipCardService vipCardService;
+    private MemberPriceSettingsService memberPriceSettingsService;
     @Autowired
     private SysConfigService sysConfigService;
     @Autowired
@@ -76,7 +76,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     private void init() {
         /**********订单生成前******************/
         //vip开通缴费
-        orderCreate.put(GoodTypeEnum.VIP, vipCardService::orderCreate);
+        orderCreate.put(GoodTypeEnum.VIP, memberPriceSettingsService::orderCreate);
         //直播课程购买
         orderCreate.put(GoodTypeEnum.LIVE, courseGroupService::buyLiveCourse);
 
@@ -93,7 +93,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
 
         /**********订单完成后******************/
         //vip开通缴费
-        orderSuccess.put(GoodTypeEnum.VIP, vipCardService::orderSuccess);
+        orderSuccess.put(GoodTypeEnum.VIP, memberPriceSettingsService::orderSuccess);
         //直播课程购买
         orderSuccess.put(GoodTypeEnum.LIVE, courseGroupService::buyLiveCourseSuccess);
 
@@ -217,7 +217,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         if (null == detail || !payReq.getUserId().equals(detail.getUserId())) {
             return HttpResponseResult.failed("订单不存在");
         }
-        if (OrderStatusEnum.WAIT_PAY.equals(detail.getStatus()) || OrderStatusEnum.FAIL.equals(detail.getStatus())) {
+        if (OrderStatusEnum.WAIT_PAY.equals(detail.getStatus())) {
             //处于待支付状态，需要调用汇付发起付款请求接口
             return orderPayWaitPay(payReq, detail);
         } else if (OrderStatusEnum.PAYING.equals(detail.getStatus())) {
@@ -409,6 +409,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         }
         orderPayment.setPayFailMsg(responseResult.getMsg());
         orderPayment.setStatus(PayStatusEnum.failed);
+        orderPayment.setUpdateTime(new Date());
 
         orderPaymentService.saveOrUpdate(orderPayment);
         return orderPayment;
@@ -593,6 +594,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     @Transactional(rollbackFor = Exception.class)
     void orderCancel(UserOrderVo userOrder) {
         userOrder.setStatus(OrderStatusEnum.CLOSE);
+        userOrder.setUpdateTime(new Date());
         baseMapper.updateById(userOrder);
 
         UserOrderPayment orderPayment = orderPaymentService.detailByOrderNo(userOrder.getOrderNo());
@@ -600,6 +602,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             //更新付款单
             orderPayment.setStatus(PayStatusEnum.failed);
             orderPayment.setPayFailMsg("交易取消");
+            orderPayment.setUpdateTime(new Date());
             orderPaymentService.updateById(orderPayment);
         }
         List<UserOrderDetailVo> orderDetailList = orderDetailService.getOrderDetilListByOrderNo(userOrder.getOrderNo());
@@ -627,13 +630,16 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
      */
     @Transactional(rollbackFor = Exception.class)
     void orderSuccess(UserOrderVo detail, JSONObject hfRes) {
+        Date now = new Date();
         detail.setStatus(OrderStatusEnum.PAID);
-        detail.setPayTime(new Date());
+        detail.setPayTime(now);
+        detail.setUpdateTime(now);
         updateById(detail);
         //更新付款单
         UserOrderPayment orderPayment = orderPaymentService.detailByOrderNo(detail.getOrderNo());
         orderPayment.setStatus(PayStatusEnum.succeeded);
-        orderPayment.setArrivalTime(new Date());
+        orderPayment.setArrivalTime(now);
+        orderPayment.setUpdateTime(now);
         if (null != hfRes) {
             try {
                 orderPayment.setPayAmt(new BigDecimal(hfRes.getString("pay_amt")));

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserWithdrawalServiceImpl.java

@@ -166,6 +166,7 @@ public class UserWithdrawalServiceImpl extends ServiceImpl<UserWithdrawalDao, Us
             userWithdrawal.setVerifyReason(data.getVerifyReason());
             userWithdrawal.setVerifyUserId(userId);
             userWithdrawal.setTransferTime(new Date());
+            userWithdrawal.setUpdateTime(new Date());
             userWithdrawalList.add(userWithdrawal);
         }
         if (!CollectionUtils.isEmpty(errMsgList)) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VipCardRecordServiceImpl.java

@@ -2,13 +2,7 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
-import com.yonge.cooleshow.biz.dal.entity.VipCard;
-import com.yonge.cooleshow.biz.dal.service.VipCardService;
-import com.yonge.cooleshow.biz.dal.vo.VipCardVo;
-import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
-import com.yonge.cooleshow.biz.dal.vo.UserOrderVo;
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.biz.dal.service.MemberPriceSettingsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.entity.VipCardRecord;
@@ -21,7 +15,7 @@ import com.yonge.cooleshow.biz.dal.service.VipCardRecordService;
 @Service
 public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipCardRecord> implements VipCardRecordService {
     @Autowired
-    private VipCardService vipCardService;
+    private MemberPriceSettingsService memberPriceSettingsService;
 	@Override
     public VipCardRecordVo detail(Long id) {
         VipCardRecordVo detail = baseMapper.detail(id);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VipCardServiceImpl.java

@@ -1,107 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
-import com.yonge.cooleshow.biz.dal.entity.VipCardRecord;
-import com.yonge.cooleshow.biz.dal.enums.TimeTypeEnum;
-import com.yonge.cooleshow.biz.dal.service.StudentService;
-import com.yonge.cooleshow.biz.dal.service.VipCardRecordService;
-import com.yonge.cooleshow.biz.dal.vo.StudentVo;
-import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
-import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.yonge.cooleshow.biz.dal.entity.VipCard;
-import com.yonge.cooleshow.biz.dal.vo.VipCardVo;
-import com.yonge.cooleshow.biz.dal.dao.VipCardDao;
-import com.yonge.cooleshow.biz.dal.service.VipCardService;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-
-@Service
-public class VipCardServiceImpl extends ServiceImpl<VipCardDao, VipCard> implements VipCardService {
-    private final static Logger log = LoggerFactory.getLogger(VipCardServiceImpl.class);
-    @Autowired
-    private VipCardRecordService vipCardRecordService;
-    @Autowired
-    private StudentService studentService;
-
-    @Override
-    public VipCardVo detail(Long id) {
-        VipCardVo detail = baseMapper.detail(id);
-        detail.setTimeTypeName(detail.getTimeType().name());
-        return detail;
-    }
-
-    @Override
-    public List<VipCardVo> selectList() {
-        List<VipCardVo> vipCardVos = baseMapper.selectList();
-        vipCardVos.forEach(o -> o.setTimeTypeName(o.getTimeType().name()));
-        return vipCardVos;
-    }
-
-    @Override
-    public HttpResponseResult<OrderCreateRes> orderCreate(OrderReq.OrderReqInfo orderReqInfo) {
-        VipCardVo detail = detail(Long.parseLong(orderReqInfo.getBizContent().toString()));
-        if (null == detail) {
-            return HttpResponseResult.failed("未找到会员卡信息");
-        }
-        //插入会员卡信息到会员卡记录表
-        OrderCreateRes orderCreateRes = new OrderCreateRes();
-        orderCreateRes.setRes(true);
-        orderCreateRes.setBizId(detail.getId());
-        orderCreateRes.setBizContent("会员卡购买-" + detail.getTimeTypeName());
-        orderCreateRes.setGoodNum(1);
-        orderCreateRes.setOriginalPrice(detail.getOriginalPrice());
-        orderCreateRes.setExpectPrice(detail.getActualPrice());
-        return HttpResponseResult.succeed(orderCreateRes);
-    }
-
-
-    @Override
-    public void orderSuccess(UserOrderDetailVo orderDetailVo) {
-        VipCardVo detail = detail(orderDetailVo.getBizId());
-        if (null == detail) {
-            return;
-        }
-        StudentVo studentVo = studentService.detail(orderDetailVo.getUserId());
-        //修改用户会员时长
-        Date membershipEndTime = studentVo.getMembershipEndTime();
-        Calendar now = Calendar.getInstance();
-
-        VipCardRecord vipCardRecord = new VipCardRecord();
-        vipCardRecord.setUserId(orderDetailVo.getUserId());
-        vipCardRecord.setOrderId(orderDetailVo.getOrderId());
-        vipCardRecord.setVipCardId(detail.getId());
-
-
-        if (null == membershipEndTime || membershipEndTime.before(new Date())) {
-            //没有会员、会员已过期
-            studentVo.setMembershipStartTime(now.getTime());
-        } else {
-            now.setTime(studentVo.getMembershipEndTime());
-        }
-        vipCardRecord.setStartTime(now.getTime());
-        if (TimeTypeEnum.MONTH.equals(detail.getTimeType())) {
-            now.add(Calendar.MONTH, 1);
-        } else if (TimeTypeEnum.QUARTER.equals(detail.getTimeType())) {
-            now.add(Calendar.MONTH, 3);
-        } else if (TimeTypeEnum.YEAR.equals(detail.getTimeType())) {
-            now.add(Calendar.YEAR, 1);
-        }
-        vipCardRecord.setEndTime(now.getTime());
-        studentVo.setMembershipEndTime(now.getTime());
-        studentVo.setMemberRankSettingId(1l);
-        studentService.updateById(studentVo);
-        //会员购买记录入库
-        vipCardRecordService.save(vipCardRecord);
-    }
-
-
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MemberPriceSettingsVo.java

@@ -0,0 +1,35 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.beanutils.BeanUtils;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-04-25 14:34:49
+ */
+@ApiModel(value = "MemberPriceSettingsVo对象", description = "查询视图对象")
+public class MemberPriceSettingsVo extends MemberPriceSettings{
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty("更新人 ")
+    private String modifierName;
+
+    public String getModifierName() {
+        return modifierName;
+    }
+
+    public void setModifierName(String modifierName) {
+        this.modifierName = modifierName;
+    }
+
+    public MemberPriceSettingsVo buildVo(MemberPriceSettings memberPriceSettings){
+        try {
+            BeanUtils.copyProperties(this,memberPriceSettings);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return this;
+    }
+
+}

cooleshow-user/user-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -264,7 +264,6 @@
         UPDATE employee SET demission_date_ = IF(demission_date_ IS NULL,now(),NULL) WHERE user_id_=#{userID}
     </update>
 
-
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="Employee">
 		SELECT * FROM employee WHERE user_id_ = #{userId}

cooleshow-user/user-biz/src/main/resources/config/mybatis/MemberPriceSettingsMapper.xml

@@ -1,87 +1,50 @@
 <?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">
-<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.MemberPriceSettingsDao">
-
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings"
-		id="BaseResultMap">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings">
 		<result column="id_" property="id" />
-		<result column="period_" property="period" typeHandler="com.yonge.cooleshow.common.dal.CustomEnumTypeHandler" />
+		<result column="period_" property="period" />
 		<result column="sale_price_" property="salePrice" />
 		<result column="original_price_" property="originalPrice" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="create_by_" property="createBy" />
 		<result column="update_by_" property="updateBy" />
-		<result column="modifier_name_" property="modifierName" />
 	</resultMap>
 
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="BaseResultMap">
-		SELECT * FROM member_price_settings WHERE id_ = #{id}
-	</select>
-
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="BaseResultMap">
-		SELECT * FROM member_price_settings ORDER BY id_
+	<!-- 表字段 -->
+	<sql id="baseColumns">
+         t.id_ as id
+        , t.period_ as period
+        , t.sale_price_ as salePrice
+        , t.original_price_ as originalPrice
+        , t.create_time_ as createTime
+        , t.update_time_ as updateTime
+        , t.create_by_ as createBy
+        , t.update_by_ as updateBy
+        </sql>
+
+	<select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo">
+		SELECT
+			<include refid="baseColumns"/>,
+			ifnull(u.real_name_,u.username_) modifierName
+		FROM member_price_settings t
+		where t.id_ = #{id}
 	</select>
 
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert"
-		parameterType="com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings"
-		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO
-		member_price_settings
-		(id_,period_,sale_price_,original_price_,create_time_,update_time_,create_by_,update_by_)
-		VALUES(#{id},#{period, typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler},#{salePrice},#{originalPrice},#{createTime},#{updateTime},#{createBy},#{updateBy})
-	</insert>
-
-	<!-- 根据主键查询一条记录 -->
-	<update id="update"
-		parameterType="com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings">
-		UPDATE member_price_settings
-		<set>
-			<if test="salePrice != null">
-				sale_price_ = #{salePrice},
-			</if>
-			<if test="updateBy != null">
-				update_by_ = #{updateBy},
-			</if>
-			<if test="createBy != null">
-				create_by_ = #{createBy},
-			</if>
-			<if test="id != null">
-				id_ = #{id},
-			</if>
-			<if test="period != null">
-				period_ = #{period, typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler},
-			</if>
-			<if test="updateTime != null">
-				update_time_ = #{updateTime},
-			</if>
-			<if test="originalPrice != null">
-				original_price_ = #{originalPrice},
-			</if>
-			<if test="createTime != null">
-				create_time_ = #{createTime},
-			</if>
-		</set>
-		WHERE id_ = #{id}
-	</update>
-
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete">
-		DELETE FROM member_price_settings WHERE id_ = #{id}
-	</delete>
+	<sql id="selectSql">
+		SELECT
+			<include refid="baseColumns" />,
+		ifnull(u.real_name_,u.username_) as modifierName
+		FROM member_price_settings t
+		LEFT JOIN sys_user u on t.update_by_ = u.id_
+	</sql>
 
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
-		SELECT mps.*,ifnull(u.real_name_,u.username_) modifier_name_ FROM member_price_settings mps left join sys_user u on mps.update_by_ = u.id_ ORDER BY id_
-		<include refid="global.limit" />
+	<select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo">
+		<include refid="selectSql"/>
 	</select>
 
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM member_price_settings
+	<select id="selectList" resultType="com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo">
+		<include refid="selectSql"/>
 	</select>
-</mapper>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -27,7 +27,7 @@
         , t.update_time_ as "updateTime"
         </sql>
     <update id="setSubject">
-        update student set subject_id_ = #{subjectIds} where user_id_ = #{id}
+        update student set subject_id_ = #{subjectIds},update_time_ = now() where user_id_ = #{id}
     </update>
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.StudentVo">
         SELECT

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherAuthEntryRecordMapper.xml

@@ -36,25 +36,6 @@
         , t.update_time_ as "updateTime"
         </sql>
 
-    <update id="updateUserCard">
-        UPDATE sys_user
-        <set>
-            <if test="param.realName != null and param.realName != ''">
-                real_name_ = #{param.realName},
-            </if>
-            <if test="param.idCardNo != null and param.idCardNo != ''">
-                id_card_no_ = #{param.idCardNo},
-            </if>
-            <if test="param.gender != null">
-                gender_ = #{param.gender},
-            </if>
-            <if test="param.birthdate != null">
-                birthdate_ = #{param.birthdate},
-            </if>
-        </set>
-        WHERE id_ = #{param.userId}
-    </update>
-
     <!-- 分页查询 -->
     <select id="selectPage" resultType = "com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo">
         SELECT

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -134,7 +134,7 @@
     </select>
 
     <update id="setSubject">
-        update teacher set subject_id_ = #{subjectIds} where user_id_ = #{id}
+        update teacher set subject_id_ = #{subjectIds},update_time_ = now() where user_id_ = #{id}
     </update>
 
     <update id="addHomeBrowse">

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserAccountMapper.xml

@@ -26,36 +26,39 @@
         update user_cash_account
         <choose>
             <when test="null != inOrOut and inOrOut == 'IN'">
-                set amount_total_ = (amount_total_ + #{transAmount}),amount_frozen_ = (amount_frozen_ + #{transAmount})
+                set amount_total_ = (amount_total_ + #{transAmount}),amount_frozen_ = (amount_frozen_ + #{transAmount}),
             </when>
             <otherwise>
-                set amount_usable_ = (amount_usable_ - #{transAmount}),amount_frozen_ = (amount_frozen_ + #{transAmount})
+                set amount_usable_ = (amount_usable_ - #{transAmount}),amount_frozen_ = (amount_frozen_ + #{transAmount}),
             </otherwise>
         </choose>
+        update_time_ = now()
         where user_id_ = #{userId}
     </update>
     <update id="unfrozenChangeAccount">
         update user_cash_account
         <choose>
             <when test="null != inOrOut and inOrOut == 'IN'">
-                set amount_usable_ = (amount_usable_ + #{transAmount}),amount_frozen_ = (amount_frozen_ - #{transAmount})
+                set amount_usable_ = (amount_usable_ + #{transAmount}),amount_frozen_ = (amount_frozen_ - #{transAmount}),
             </when>
             <otherwise>
-                set amount_total_ = (amount_total_ - #{transAmount}),amount_frozen_ = (amount_frozen_ - #{transAmount})
+                set amount_total_ = (amount_total_ - #{transAmount}),amount_frozen_ = (amount_frozen_ - #{transAmount}),
             </otherwise>
         </choose>
+        update_time_ = now()
         where user_id_ = #{userId}
     </update>
     <update id="changeAccount">
         update user_cash_account
         <choose>
             <when test="null != inOrOut and inOrOut == 'IN'">
-                set amount_total_ = (amount_total_ + #{transAmount}),amount_usable_ = (amount_usable_ + #{transAmount})
+                set amount_total_ = (amount_total_ + #{transAmount}),amount_usable_ = (amount_usable_ + #{transAmount}),
             </when>
             <otherwise>
-                set amount_total_ = (amount_total_ - #{transAmount}),amount_usable_ = (amount_usable_ - #{transAmount})
+                set amount_total_ = (amount_total_ - #{transAmount}),amount_usable_ = (amount_usable_ - #{transAmount}),
             </otherwise>
         </choose>
+        update_time_ = now()
         where user_id_ = #{userId}
     </update>
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderMapper.xml

@@ -148,11 +148,12 @@
 
     <select id="selectPendingList" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderVo">
         SELECT * FROM user_order t
+        left join user_order_payment p on t.order_no_ = p.order_no_
         where (t.status_ = 'WAIT_PAY' and t.create_time_ &lt;= date_sub(now(), interval 30 minute))
-        or ( t.status_ = 'PAYING' and t.create_time_ &lt;= date_sub(now(), interval 120 minute))
+        or ( t.status_ = 'PAYING' and p.create_time_ &lt;= date_sub(now(), interval 120 minute))
     </select>
 
     <update id="updateStatusByOrderNo">
-        update user_order set status_ = #{orderStatus} where order_no_ = #{orderNo}
+        update user_order set status_ = #{orderStatus},update_time_ = now() where order_no_ = #{orderNo}
     </update>
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/VipCardMapper.xml

@@ -1,45 +0,0 @@
-<?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.yonge.cooleshow.biz.dal.dao.VipCardDao">
-	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.VipCard">
-            <result column="id_" property="id" />
-	        <result column="time_type_" property="timeType" />
-	        <result column="original_price_" property="originalPrice" />
-	        <result column="actual_price_" property="actualPrice" />
-	        <result column="create_time_" property="createTime" />
-	        <result column="create_by__" property="createBy" />
-	        <result column="update_time_" property="updateTime" />
-	        <result column="update_by_" property="updateBy" />
-		</resultMap>  
-    
-    <!-- 表字段 -->
-    <sql id="baseColumns">
-         t.id_ as id
-        , t.time_type_ as timeType
-        , t.original_price_ as originalPrice
-        , t.actual_price_ as actualPrice
-        , t.create_time_ as createTime
-        , t.create_by__ as createBy
-        , t.update_time_ as updateTime
-        , t.update_by_ as updateBy
-        </sql> 
-    
-    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.VipCardVo">
-        SELECT
-            <include refid="baseColumns"/>,
-            (
-                SELECT u.username_ FROM sys_user u WHERE u.id_ = t.update_by_
-            ) as updateByName
-        FROM vip_card t
-        where t.id_ = #{id}
-    </select>
-
-    <select id="selectList" resultType="com.yonge.cooleshow.biz.dal.vo.VipCardVo">
-        SELECT
-            <include refid="baseColumns" />,
-            (
-                SELECT u.username_ FROM sys_user u WHERE u.id_ = t.update_by_
-            ) as updateByName
-        FROM vip_card t
-    </select>
-</mapper>

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/MemberPriceSettingsController.java

@@ -0,0 +1,44 @@
+package com.yonge.cooleshow.student.controller;
+
+import com.yonge.cooleshow.biz.dal.dto.search.MemberPriceSettingsSearch;
+import com.yonge.cooleshow.biz.dal.entity.SysConfig;
+import com.yonge.cooleshow.biz.dal.service.MemberPriceSettingsService;
+import com.yonge.cooleshow.biz.dal.service.SysConfigService;
+import com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RequestMapping("memberPriceSettings")
+@Api(tags = "会员价格设置")
+@RestController
+public class MemberPriceSettingsController extends BaseController {
+
+	@Autowired
+	private MemberPriceSettingsService memberPriceSettingsService;
+	@Autowired
+	private SysConfigService sysConfigService;
+
+	@PostMapping("/list")
+	@ApiOperation(value = "查询列表")
+	public HttpResponseResult<List<MemberPriceSettingsVo>> list(@RequestBody MemberPriceSettingsSearch query) {
+		List<MemberPriceSettingsVo> list = memberPriceSettingsService.selectList(query);
+		return succeed(list);
+	}
+
+	@PostMapping("/vipPermissions")
+	@ApiOperation(value = "查询vip权限")
+	public HttpResponseResult<List<SysConfig>> vipPermissions() {
+		Map<String,Object> params = new HashMap<>();
+		params.put("group", "VIP_PERMISSION");
+		List<SysConfig> configs = sysConfigService.findAll(params);
+		return succeed(configs);
+	}
+}

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/VipCardController.java

@@ -1,43 +0,0 @@
-package com.yonge.cooleshow.student.controller;
-
-import com.yonge.cooleshow.biz.dal.entity.SysConfig;
-import com.yonge.cooleshow.biz.dal.service.SysConfigService;
-import com.yonge.cooleshow.biz.dal.service.VipCardService;
-import com.yonge.cooleshow.biz.dal.vo.VipCardVo;
-import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/vipCard")
-@Api(value = "会员卡表", tags = "会员卡表")
-public class VipCardController extends BaseController {
-
-    @Autowired
-    private VipCardService vipCardService;
-    @Autowired
-    private SysConfigService sysConfigService;
-
-    @PostMapping("/list")
-    @ApiOperation(value = "查询列表")
-    public HttpResponseResult<List<VipCardVo>> list() {
-		List<VipCardVo> list = vipCardService.selectList();
-        return succeed(list);
-	}
-
-    @PostMapping("/vipPermissions")
-    @ApiOperation(value = "查询vip权限")
-    public HttpResponseResult<List<SysConfig>> vipPermissions() {
-        Map<String,Object> params = new HashMap<>();
-        params.put("group", "VIP_PERMISSION");
-        List<SysConfig> configs = sysConfigService.findAll(params);
-        return succeed(configs);
-    }
-}