修改优惠券查看接口

src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfCouponController.java

@@ -2,7 +2,9 @@ package com.diaoyun.zion.chinafrica.controller;
 
 import com.diaoyun.zion.chinafrica.constant.KeyConstant;
 import com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity;
+import com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends;
 import com.diaoyun.zion.chinafrica.service.TbCfCouponService;
+import com.diaoyun.zion.chinafrica.service.TbCfIssueCouponService;
 import com.diaoyun.zion.chinafrica.vo.UserCouponVo;
 import com.diaoyun.zion.master.base.Result;
 import com.diaoyun.zion.master.common.RedisCache;
@@ -31,7 +33,8 @@ import java.util.concurrent.Executors;
 public class TbCfCouponController {
     @Autowired
     private TbCfCouponService tbCfCouponService;
-
+    @Autowired
+    private TbCfIssueCouponService tbCfIssueCouponService;
     @ApiOperation("领取优惠券")
     @GetMapping("/take/{couponId}")
     public Result<TbCfCouponEntity> takeCoupon(@ApiParam("优惠券Id")@PathVariable("couponId")String couponId) {
@@ -48,4 +51,10 @@ public class TbCfCouponController {
     public Result<TbCfCouponEntity> queryCouponDetail(@ApiParam("优惠券Id")@PathVariable("couponId")String couponId) {
         return tbCfCouponService.queryCouponDetail(couponId);
     }
+    @ApiOperation("用户Id")
+    @GetMapping("/queryCouponByUserId/{userId}")
+    public Result<TbCfIssueCouponEntityExtends> queryCouponByUserId(@ApiParam("用户Id")@PathVariable("userId") String userId) {
+        return tbCfIssueCouponService.queryCouponByUserId(userId);
+    }
+
 }

src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfIssueCouponDao.java

 package com.diaoyun.zion.chinafrica.dao;
 
 import com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity;
+import com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends;
 import com.diaoyun.zion.master.dao.BaseDao;
 
+import java.util.List;
+
 /**
  *  优惠券发放保存表Dao
  *
@@ -11,4 +14,5 @@ import com.diaoyun.zion.master.dao.BaseDao;
  */
 public interface TbCfIssueCouponDao extends BaseDao<TbCfIssueCouponEntity> {
 
+    List<TbCfIssueCouponEntityExtends> queryCouponByUserId(String userId);
 }

src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfIssueCouponEntityExtends.java

+package com.diaoyun.zion.chinafrica.entity;
+
+import java.math.BigDecimal;
+
+public class TbCfIssueCouponEntityExtends extends TbCfIssueCouponEntity {
+    private BigDecimal amount;
+    private BigDecimal money;
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public BigDecimal getMoney() {
+        return money;
+    }
+
+    public void setMoney(BigDecimal money) {
+        this.money = money;
+    }
+}

src/main/java/com/diaoyun/zion/chinafrica/service/TbCfIssueCouponService.java

@@ -2,6 +2,8 @@ package com.diaoyun.zion.chinafrica.service;
 
 import com.diaoyun.zion.chinafrica.entity.TbCfCouponIssueEntity;
 import com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity;
+import com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends;
+import com.diaoyun.zion.master.base.Result;
 
 import java.util.List;
 import java.util.Map;
@@ -72,6 +74,7 @@ public interface TbCfIssueCouponService {
      */
     int deleteBatch(String[] couponIssuetableIds);
 
+    Result<TbCfIssueCouponEntityExtends> queryCouponByUserId(String userId);
 
 
 }

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfIssueCouponServiceImpl.java

@@ -3,7 +3,9 @@ package com.diaoyun.zion.chinafrica.service.impl;
 import com.diaoyun.zion.chinafrica.dao.TbCfIssueCouponDao;
 import com.diaoyun.zion.chinafrica.entity.TbCfCouponIssueEntity;
 import com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity;
+import com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends;
 import com.diaoyun.zion.chinafrica.service.TbCfIssueCouponService;
+import com.diaoyun.zion.master.base.Result;
 import com.diaoyun.zion.master.util.IdUtil;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,4 +69,9 @@ public class TbCfIssueCouponServiceImpl implements TbCfIssueCouponService {
         tbCfIssueCoupon.setIssueId(tbCfCouponIssue.getCouponIssueId());
         return tbCfIssueCouponDao.save(tbCfIssueCoupon);
     }
+
+    public Result<TbCfIssueCouponEntityExtends> queryCouponByUserId(String userId){
+        List<TbCfIssueCouponEntityExtends> anExtends = tbCfIssueCouponDao.queryCouponByUserId(userId);
+        return new Result<>(anExtends.get(0));
+    }
 }

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfUserInfoServiceImpl.java

@@ -164,13 +164,13 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
                 tokenManager.addToken(token, tbCfUserInfoVo);
                 result.setMessage(ResultCodeEnum.SUCCESS.getDesc());
                 result.setData(tbCfUserInfoVo);
-
+/*
                 //获取购物返券
                 List<TbCfCouponEntity> couponList = tbCfCouponDao.getCouponByCategory(CouponCategoryEnum.REGISTER.getValue(),new Date());
                 if(!couponList.isEmpty()) {
                     //领取优惠券
                     tbCfCouponService.takeCoupon(couponList.get(0).getCouponId(),tbCfUserInfoVo.getUserId());
-                }
+                }*/
             } else {
                 result.setCode(ResultCodeEnum.VALIDATE_ERROR.getCode());
                 result.setMessage("The mailbox or nick has been registered");

src/main/resources/mapper/TbCfIssueCouponDao.xml

 <?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.platform.dao.TbCfIssueCouponDao">
+<mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfIssueCouponDao">
 
 	<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity" id="tbCfIssueCouponMap">
 		<result property="couponIssuetableId" column="coupon_issuetable_id"/>
@@ -58,7 +58,24 @@
 			limit #{offset}, #{limit}
 		</if>
 	</select>
-
+<select id="queryCouponByUserId" resultType="com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends">
+	select
+		a.coupon_issuetable_id,
+		a.coupon_id,
+		b.coupon_category_id,
+		c.coupon_category_name,
+		b.coupon_title,
+		b.with_amount amount,
+		b.deduct_amount money,
+		a.user_id,
+		a.nick,
+		a.create_time,
+		a.enable_flag,
+		a.issue_id
+		from tb_cf_issue_coupon a LEFT  join  tb_cf_coupon b ON a.coupon_id=b.coupon_id
+		LEFT JOIN tb_cf_coupon_category c on b.coupon_category_id=c.coupon_category_id
+		WHERE a.user_id = #{user_id} and b.status=1
+</select>
 	<select id="queryTotal" resultType="int">
 		select count(*) from tb_cf_issue_coupon
 		WHERE 1=1