添加优惠券领取情况、使用情况

platform-admin/src/main/java/com/platform/controller/TbCfCouponController.java

@@ -5,6 +5,7 @@ import com.platform.service.TbCfCouponService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
 import com.platform.utils.R;
+import com.platform.vo.CouponTakeVo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -106,4 +107,17 @@ public class TbCfCouponController {
 
         return R.ok().put("list", list);
     }
+
+    /**
+     * 优惠券领取情况
+     */
+    @RequestMapping("/take/{couponId}")
+    @RequiresPermissions("tbcfcoupon:info")
+    @ResponseBody
+    public R getCouponTakeList(@PathVariable("couponId") String couponId) {
+
+        List<CouponTakeVo> list = tbCfCouponService.getCouponTakeList(couponId);
+
+        return R.ok().put("list", list);
+    }
 }

platform-admin/src/main/java/com/platform/dao/TbCfCouponDao.java

 package com.platform.dao;
 
 import com.platform.entity.TbCfCouponEntity;
+import com.platform.vo.CouponTakeVo;
+
+import java.util.List;
 
 /**
  * 优惠券表Dao
@@ -10,4 +13,10 @@ import com.platform.entity.TbCfCouponEntity;
  */
 public interface TbCfCouponDao extends BaseDao<TbCfCouponEntity> {
 
+    /**
+     * 优惠券领取情况
+     * @param couponId
+     * @return
+     */
+    List<CouponTakeVo> getCouponTakeList(String couponId);
 }

platform-admin/src/main/java/com/platform/service/TbCfCouponService.java

 package com.platform.service;
 
 import com.platform.entity.TbCfCouponEntity;
+import com.platform.vo.CouponTakeVo;
 
 import java.util.List;
 import java.util.Map;
@@ -68,4 +69,11 @@ public interface TbCfCouponService {
      * @return 删除条数
      */
     int deleteBatch(String[] couponIds);
+
+    /**
+     * 优惠券领取情况
+     * @param couponId
+     * @return
+     */
+    List<CouponTakeVo> getCouponTakeList(String couponId);
 }

platform-admin/src/main/java/com/platform/service/impl/TbCfCouponServiceImpl.java

@@ -5,6 +5,7 @@ import com.platform.entity.TbCfCouponEntity;
 import com.platform.enums.UsualStateEnum;
 import com.platform.service.TbCfCouponService;
 import com.platform.utils.IdUtil;
+import com.platform.vo.CouponTakeVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -62,4 +63,9 @@ public class TbCfCouponServiceImpl implements TbCfCouponService {
     public int deleteBatch(String[] couponIds) {
         return tbCfCouponDao.deleteBatch(couponIds);
     }
+
+    @Override
+    public List<CouponTakeVo> getCouponTakeList(String couponId) {
+        return tbCfCouponDao.getCouponTakeList(couponId);
+    }
 }

platform-admin/src/main/java/com/platform/vo/CouponTakeVo.java

+package com.platform.vo;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 优惠券领取情况
+ * 表名 tb_cf_coupon
+ *
+ * @author lipengjun
+ * @date 2019-09-20 11:03:38
+ */
+public class CouponTakeVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 优惠券id
+     */
+    private String couponId;
+    /**
+     * 优惠券类型
+     */
+    private Integer couponCategory;
+    /**
+     * 优惠券标题
+     */
+    private String couponTitle;
+    /**
+     * 优惠券图片地址
+     */
+    private String couponIcon;
+    /**
+     * 用户名
+     */
+    private String nick;
+    /**
+     * 账号
+     */
+    private String account;
+    /**
+     * 领取时间
+     */
+    private Date createTime;
+    /**
+     * 是否已经使用，0已使用，1未使用
+     */
+    private Integer enableFlag;
+
+    public String getCouponId() {
+        return couponId;
+    }
+
+    public void setCouponId(String couponId) {
+        this.couponId = couponId;
+    }
+
+    public Integer getCouponCategory() {
+        return couponCategory;
+    }
+
+    public void setCouponCategory(Integer couponCategory) {
+        this.couponCategory = couponCategory;
+    }
+
+    public String getCouponTitle() {
+        return couponTitle;
+    }
+
+    public void setCouponTitle(String couponTitle) {
+        this.couponTitle = couponTitle;
+    }
+
+    public String getCouponIcon() {
+        return couponIcon;
+    }
+
+    public void setCouponIcon(String couponIcon) {
+        this.couponIcon = couponIcon;
+    }
+
+    public String getNick() {
+        return nick;
+    }
+
+    public void setNick(String nick) {
+        this.nick = nick;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getEnableFlag() {
+        return enableFlag;
+    }
+
+    public void setEnableFlag(Integer enableFlag) {
+        this.enableFlag = enableFlag;
+    }
+}

platform-admin/src/main/resources/com/platform/dao/TbCfCouponDao.xml

@@ -182,4 +182,11 @@
 		</foreach>
 	</delete>
 
+	<!--优惠券领取情况-->
+	<select id="getCouponTakeList" resultType="com.platform.vo.CouponTakeVo">
+		select t2.coupon_id,t2.create_time,t2.enable_flag,t1.coupon_category,
+		 t1.coupon_title,t1.coupon_icon,t3.nick,t3.account from tb_cf_coupon t1,tb_cf_take_coupon t2,tb_cf_user_info t3 where
+		t2.coupon_id=#{couponId} and t3.user_id=t2.user_id and t1.coupon_id=t2.coupon_id
+	</select>
+
 </mapper>
\ No newline at end of file

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfcoupon.html

@@ -19,6 +19,8 @@
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
             <div class="buttons-group">
+                <i-button type="info" @click="showTake">查看领取情况</i-button>
+                <!--<i-button type="info" @click="showUse"><i class="fa fa-plus"></i>&nbsp;查看使用情况</i-button>-->
                 #if($shiro.hasPermission("tbcfcoupon:save"))
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 #end
@@ -147,7 +149,22 @@
             </Form-item>
         </i-form>
 	</Card>
+
+    <!-- 领取详情 -->
+    <el-dialog :title="takeTitle" :visible.sync="takeVisible" width="80%">
+        <el-table :data="takeData">
+            <el-table-column property="couponTitle" label="标题" width="200"></el-table-column>
+            <el-table-column property="nick" label="用户昵称"></el-table-column>
+            <el-table-column property="account" label="用户账号"></el-table-column>
+            <el-table-column property="createTime" label="领取时间"></el-table-column>
+            <el-table-column property="enableFlag" label="是否已经使用，0已使用，1未使用"></el-table-column>
+        </el-table>
+    </el-dialog>
+
 </div>
+
+
+
 <!--element-ui-->
 <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 <script src="${rc.contextPath}/js/sys/tbcfcoupon.js?_${date.systemTime}"></script>

platform-admin/src/main/webapp/js/sys/tbcfcoupon.js

@@ -28,6 +28,11 @@ $(function () {
 let vm = new Vue({
 	el: '#rrapp',
 	data: {
+		takeVisible:false,
+		useVisible:false,
+		takeTitle:"领取详情(已领取数：0)",
+		//领取优惠券情况
+		takeData:[],
 		//优惠券类型
 		couponCategoryOptions: [{
 			value: '10',
@@ -160,6 +165,30 @@ let vm = new Vue({
         },
         handleReset: function (name) {
             handleResetForm(this, name);
+        },
+		//获取商品详情
+		showTake: function () {
+			let couponId = getSelectedRow("#jqGrid");
+			if (couponId == null) {
+				return;
+			}
+			vm.takeVisible = true;
+			vm.getCouponTakeList(couponId);
+		},
+		//获取优惠券领取情况
+		getCouponTakeList: function (couponId) {
+			Ajax.request({
+				url: "../tbcfcoupon/take/" + couponId,
+				async: true,
+				successCallback: function (r) {
+					vm.takeData = r.list;
+					var length=0;
+					if(!!vm.takeData) {
+						length=vm.takeData.length;
 					}
+					vm.takeTitle="领取详情(已领取数："+length+")";
+				}
+			});
+		},
 	}
 });
\ No newline at end of file