会员详情接口修改

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

@@ -0,0 +1,42 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.dto.search.VipCardRecordSearch;
+import com.yonge.cooleshow.biz.dal.service.VipCardRecordService;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
+import com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.base.page.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/vipCardRecord")
+@Api(value = "购买会员卡记录表", tags = "购买会员卡记录表")
+public class VipCardRecordController extends BaseController {
+
+    @Autowired
+    private VipCardRecordService vipCardRecordService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<VipCardRecordVo> detail(@PathVariable("id") Long id) {
+    	return succeed(vipCardRecordService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入vipCardRecordSearch")
+    public HttpResponseResult<PageInfo<VipCardRecordVo>> page(@RequestBody VipCardRecordSearch query) {
+		IPage<VipCardRecordVo> pages = vipCardRecordService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+}

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

@@ -10,35 +10,38 @@ import com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo;
 import com.yonge.cooleshow.biz.dal.dto.search.VipCardRecordSearch;
 
 
-public interface VipCardRecordDao extends BaseMapper<VipCardRecord>{
-	/**
-	 * 查询详情
+public interface VipCardRecordDao extends BaseMapper<VipCardRecord> {
+    /**
+     * 查询详情
+     *
      * @author liweifan
      * @date 2022-03-30 13:53:51
      * @return: com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo
-	 */
-	VipCardRecordVo detail(@Param("id") Long id);
+     */
+    VipCardRecordVo detail(@Param("id") Long id, @Param("userId") Long userId);
 
-	/**
-	 * 分页查询
+    /**
+     * 分页查询
+     *
      * @author liweifan
      * @date 2022-03-30 13:53:51
      * @return: com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo
-	 */
-	List<VipCardRecordVo> selectPage(@Param("page") IPage page, @Param("param") VipCardRecordSearch vipCardRecord);
+     */
+    List<VipCardRecordVo> selectPage(@Param("page") IPage page, @Param("param") VipCardRecordSearch vipCardRecord);
 
-	/***
-	 * 查询临期3天会员
-	 * @author liweifan
-	 * @updateTime 2022/5/5 19:33
-	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo>
-	 */
-	List<VipCardRecordVo> selectTemporaryRecord();
-	/***
-	 * 查询到期会员
-	 * @author liweifan
-	 * @updateTime 2022/5/5 20:18
-	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo>
-	 */
-	List<VipCardRecordVo> selectExpireRecord();
+    /***
+     * 查询临期3天会员
+     * @author liweifan
+     * @updateTime 2022/5/5 19:33
+     * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo>
+     */
+    List<VipCardRecordVo> selectTemporaryRecord();
+
+    /***
+     * 查询到期会员
+     * @author liweifan
+     * @updateTime 2022/5/5 20:18
+     * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo>
+     */
+    List<VipCardRecordVo> selectExpireRecord();
 }

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

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * @Author: liweifan
@@ -11,4 +12,14 @@ import io.swagger.annotations.ApiModel;
 public class VipCardRecordSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(hidden = true)
+	private Long userId;
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
 }

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

@@ -16,13 +16,18 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
  * @date 2022-03-30
  */
 public interface VipCardRecordService extends IService<VipCardRecord>  {
-
+	/**
+	 * 查询详情
+	 * @author liweifan
+	 * @date 2022-03-30
+	 */
+	VipCardRecordVo detail(Long id);
 	/**
      * 查询详情
      * @author liweifan
  	 * @date 2022-03-30
      */
-	VipCardRecordVo detail(Long id);
+	VipCardRecordVo detail(Long id,Long userId);
 
     /**
      * 分页查询

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

@@ -33,7 +33,13 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
 
     @Override
     public VipCardRecordVo detail(Long id) {
-        VipCardRecordVo detail = baseMapper.detail(id);
+        VipCardRecordVo detail = baseMapper.detail(id, null);
+        return detail;
+    }
+
+    @Override
+    public VipCardRecordVo detail(Long id, Long userId) {
+        VipCardRecordVo detail =  baseMapper.detail(id, userId);
         return detail;
     }
 
@@ -59,7 +65,7 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
             record.setUpdateTime(new Date());
 
             VipCardRecord vipCardRecord = new VipCardRecord();
-            BeanUtils.copyProperties(record,vipCardRecord);
+            BeanUtils.copyProperties(record, vipCardRecord);
             baseMapper.updateById(vipCardRecord);
         }
 
@@ -78,7 +84,7 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
             record.setUpdateTime(new Date());
 
             VipCardRecord vipCardRecord = new VipCardRecord();
-            BeanUtils.copyProperties(record,vipCardRecord);
+            BeanUtils.copyProperties(record, vipCardRecord);
             baseMapper.updateById(vipCardRecord);
         }
 
@@ -92,7 +98,7 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
         try {
             String url = sysMessageService.selectConfigUrl(MessageTypeEnum.VIP_EXPIRE_THIRTY_DAY.getCode());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.VIP_EXPIRE_THIRTY_DAY,
-                    receivers, null, 0,  url, ClientEnum.STUDENT.getCode());
+                    receivers, null, 0, url, ClientEnum.STUDENT.getCode());
         } catch (Exception e) {
             log.error("会员到期3天极光消息推送异常,userId={}", userId);
         }
@@ -100,7 +106,7 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
         try {
             String url = sysMessageService.selectConfigUrl(MessageTypeEnum.SMS_VIP_EXPIRE_THIRTY_DAY.getCode());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.SMS_VIP_EXPIRE_THIRTY_DAY,
-                    receivers, null, 0, null, ClientEnum.STUDENT.getCode() ,url);
+                    receivers, null, 0, null, ClientEnum.STUDENT.getCode(), url);
         } catch (Exception e) {
             log.error("会员到期3天短信消息推送异常,userId={}", userId);
         }
@@ -121,7 +127,7 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
         try {
             String url = sysMessageService.selectConfigUrl(MessageTypeEnum.SMS_VIP_EXPIRE.getCode());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.SMS_VIP_EXPIRE,
-                    receivers, null, 0, null, ClientEnum.STUDENT.getCode(),url);
+                    receivers, null, 0, null, ClientEnum.STUDENT.getCode(), url);
         } catch (Exception e) {
             log.error("会员到期3天短信消息推送异常,userId={}", userId);
         }

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

@@ -1,7 +1,11 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
 import com.yonge.cooleshow.biz.dal.entity.VipCardRecord;
+import com.yonge.cooleshow.biz.dal.enums.PeriodEnum;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
 
 /**
  * @Author: liweifan
@@ -10,12 +14,14 @@ import io.swagger.annotations.ApiModel;
 @ApiModel(value = "VipCardRecordVo对象", description = "购买会员卡记录表查询视图对象")
 public class VipCardRecordVo extends VipCardRecord{
 	private static final long serialVersionUID = 1L;
-	/***
-	 * 手机号
-	 * @author liweifan
-	 * @updateTime 2022/5/5 20:11
-	 */
+
 	private String phone;
+	@ApiModelProperty("原价 ")
+	private BigDecimal originalPrice;
+	@ApiModelProperty("销售价 ")
+	private BigDecimal salePrice;
+	@ApiModelProperty("周期 ")
+	private PeriodEnum period;
 
 	public String getPhone() {
 		return phone;
@@ -24,4 +30,28 @@ public class VipCardRecordVo extends VipCardRecord{
 	public void setPhone(String phone) {
 		this.phone = phone;
 	}
+
+	public BigDecimal getOriginalPrice() {
+		return originalPrice;
+	}
+
+	public void setOriginalPrice(BigDecimal originalPrice) {
+		this.originalPrice = originalPrice;
+	}
+
+	public BigDecimal getSalePrice() {
+		return salePrice;
+	}
+
+	public void setSalePrice(BigDecimal salePrice) {
+		this.salePrice = salePrice;
+	}
+
+	public PeriodEnum getPeriod() {
+		return period;
+	}
+
+	public void setPeriod(PeriodEnum period) {
+		this.period = period;
+	}
 }

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

@@ -30,15 +30,23 @@
 
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo">
         SELECT
-            <include refid="baseColumns"/>
+            <include refid="baseColumns"/>,
+            s.original_price_ as originalPrice,
+            s.sale_price_ as salePrice,
+            s.period_ as `period`
         FROM vip_card_record t
+        left join member_price_settings s on t.vip_card_id_ = s.id_
         where t.id_ = #{id}
+        <if test="userId != null">
+            and t.user_id_ = #{userId}
+        </if>
     </select>
     
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo">
 		SELECT         
         	<include refid="baseColumns" />
 		FROM vip_card_record t
+        order by t.create_time_ desc
 	</select>
 
     <select id="selectTemporaryRecord" resultType="com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo">

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

@@ -0,0 +1,61 @@
+package com.yonge.cooleshow.student.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
+
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.VipCardRecordSearch;
+import com.yonge.cooleshow.biz.dal.entity.VipCardRecord;
+import com.yonge.cooleshow.biz.dal.service.VipCardRecordService;
+
+@RestController
+@RequestMapping("/vipCardRecord")
+@Api(value = "购买会员卡记录表", tags = "购买会员卡记录表")
+public class VipCardRecordController extends BaseController {
+
+    @Autowired
+    private VipCardRecordService vipCardRecordService;
+
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    /**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<VipCardRecordVo> detail(@PathVariable("id") Long id) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(vipCardRecordService.detail(id, user.getId()));
+    }
+
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入vipCardRecordSearch")
+    public HttpResponseResult<PageInfo<VipCardRecordVo>> page(@RequestBody VipCardRecordSearch query) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        IPage<VipCardRecordVo> pages = vipCardRecordService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+    }
+}