更新

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

@@ -72,17 +72,18 @@ public class TbCfCouponIssueController {
         int status = tbCfCouponIssueService.queryByStatus(tbCfCouponIssue.getCouponIssueId());
         List<TbCfUserInfoEntity> userList= tbCfCouponIssueService.queryByUserStatus(status);
         List<HashMap<String, String>> list=new ArrayList<>();
-        for(int i=0;i<userList.size();i++){
-            HashMap<String, String> map = new HashMap<String, String>();
-            map.put("userId",userList.get(i).getUserId());
-            map.put("nick",userList.get(i).getNick());
-            list.add(map);
-        }
-        for (HashMap<String, String> m:list) {
-             String userId=m.get("userId");
-             String nick= m.get("nick");
-            tbCfIssueCouponService.save(tbCfCouponIssue,tbCfIssueCoupon,userId,nick);
-        }
+            for (int i = 0; i < userList.size(); i++) {
+                HashMap<String, String> map = new HashMap<String, String>();
+                map.put("userId", userList.get(i).getUserId());
+                map.put("nick", userList.get(i).getNick());
+                list.add(map);
+            }
+            for (HashMap<String, String> m : list) {
+                String userId = m.get("userId");
+                String nick = m.get("nick");
+                tbCfIssueCouponService.save(tbCfCouponIssue, tbCfIssueCoupon, userId, nick);
+            }
+
         return R.ok();
     }
 

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

@@ -2,6 +2,9 @@ package com.platform.dao;
 
 import com.platform.entity.TbCfIssueCouponEntity;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  *  优惠券发放保存表Dao
  *
@@ -9,5 +12,7 @@ import com.platform.entity.TbCfIssueCouponEntity;
  * @date 2019-10-24 17:30:10
  */
 public interface TbCfIssueCouponDao extends BaseDao<TbCfIssueCouponEntity> {
- 
+    List<TbCfIssueCouponEntity> queryByUserIdAndCouponId(String userId, String couponId);
+
+    List<HashMap<String, String>> queryAll();
 }

platform-admin/src/main/java/com/platform/entity/TbCfCouponEntity.java

@@ -98,16 +98,22 @@ public class TbCfCouponEntity implements Serializable {
      * 修改时间
      */
     private Date updateTime;
-
+    /**
+     * 设置是否是注册就是的优惠券，(0)默认状态，（1）是用户注册就送这张优惠券
+     */
     private Integer couponVaild;
-
-    public void setCouponVaild(Integer couponVaild){
-        this.couponVaild = couponVaild;
-    }
-
-    public Integer getCouponVaild(){
+    /**
+     * 设置：(0)默认状态，（1）是用户注册就送这张优惠券
+     */
+    public Integer getCouponVaild() {
         return couponVaild;
     }
+    /**
+     * 获取：(0)默认状态，（1）是用户注册就送这张优惠券
+     */
+    public void setCouponVaild(Integer couponVaild) {
+        this.couponVaild = couponVaild;
+    }
 
     /**
      * 设置：优惠券id

platform-admin/src/main/java/com/platform/entity/TbCfIssueCouponEntity.java

@@ -89,8 +89,9 @@ public class TbCfIssueCouponEntity implements Serializable {
 
     /**
      * 获取：优惠券id
+     * @param userId
      */
-    public String getCouponId() {
+    public String getCouponId(String userId) {
         return couponId;
     }
     /**
@@ -170,4 +171,5 @@ public class TbCfIssueCouponEntity implements Serializable {
     public String getIssueId() {
         return issueId;
     }
+
 }

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

@@ -3,6 +3,7 @@ package com.platform.service;
 import com.platform.entity.TbCfCouponIssueEntity;
 import com.platform.entity.TbCfIssueCouponEntity;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -72,6 +73,11 @@ public interface TbCfIssueCouponService {
      */
     int deleteBatch(String[] couponIssuetableIds);
 
+    /**
+     *
+     * @return
+     */
+    List<TbCfIssueCouponEntity> queryByUserIdAndCouponId(String userId, String couponId);
 
-
+    List<HashMap<String, String>> queryAll();
 }

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

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -57,13 +58,22 @@ public class TbCfIssueCouponServiceImpl implements TbCfIssueCouponService {
 
     @Override
     public int save(TbCfCouponIssueEntity tbCfCouponIssue, TbCfIssueCouponEntity tbCfIssueCoupon, String userId, String nick) {
-        tbCfIssueCoupon.setCouponIssueTableId(IdUtil.createIdbyUUID());
-        tbCfIssueCoupon.setCouponId(tbCfCouponIssue.getCouponId());
-        tbCfIssueCoupon.setUserId(userId);
-        tbCfIssueCoupon.setNick(nick);
-        tbCfIssueCoupon.setEnableFlag(1);
-        tbCfIssueCoupon.setCreateTime(new Date());
-        tbCfIssueCoupon.setIssueId(tbCfCouponIssue.getCouponIssueId());
+            tbCfIssueCoupon.setCouponIssueTableId(IdUtil.createIdbyUUID());
+            tbCfIssueCoupon.setCouponId(tbCfCouponIssue.getCouponId());
+            tbCfIssueCoupon.setUserId(userId);
+            tbCfIssueCoupon.setNick(nick);
+            tbCfIssueCoupon.setEnableFlag(1);
+            tbCfIssueCoupon.setCreateTime(new Date());
+            tbCfIssueCoupon.setIssueId(tbCfCouponIssue.getCouponIssueId());
         return tbCfIssueCouponDao.save(tbCfIssueCoupon);
     }
+    @Override
+    public List<TbCfIssueCouponEntity> queryByUserIdAndCouponId(String userId, String couponId){
+        return tbCfIssueCouponDao.queryByUserIdAndCouponId(userId,couponId);
+    }
+
+    @Override
+    public List<HashMap<String, String>> queryAll() {
+        return tbCfIssueCouponDao.queryAll();
+    }
 }

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

@@ -172,7 +172,7 @@
 			<if test="createTime != null">`create_time` = #{createTime}, </if>
 			<if test="updateUserId != null">`update_user_id` = #{updateUserId}, </if>
 			<if test="updateTime != null">`update_time` = #{updateTime}</if>
-			<if test="couponVaild != null">`update_time` = #{couponVaild}</if>
+			<if test="couponVaild != null">`coupon_vaild` = #{couponVaild}</if>
 		</set>
 		where coupon_id = #{couponId}
 	</update>

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

@@ -58,7 +58,7 @@
 			</when>
 			<when test="status != null and status == '20'">
 				where
-				(unix_timestamp(now()) - unix_timestamp(a.create_time))/(24*60*60) &lt; '1'
+				(unix_timestamp(now()) - unix_timestamp(a.create_time))/(4*24*60*60) &lt; '1'
 			</when>
 			<when test="status != null and status == '30'">
 				LEFT JOIN tb_cf_order b ON a.user_id=b.user_id

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

@@ -28,6 +28,13 @@
 		where coupon_issuetable_id = #{id}
 	</select>
 
+	<select id="queryByUserIdAndCouponId" resultType="com.platform.entity.TbCfIssueCouponEntity">
+		select a.user_id from tb_cf_issue_coupon a where a.user_id=#{userId} and a.coupon_id=#{couponId}
+	</select>
+	<select id="queryAll" resultType="com.platform.entity.TbCfIssueCouponEntity">
+		select user_id,coupon_id  from tb_cf_issue_coupon
+
+	</select>
 	<select id="queryList" resultType="com.platform.entity.TbCfIssueCouponEntity">
 		select
 		a.coupon_issuetable_id,

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

@@ -51,14 +51,14 @@
     <Card v-show="!showList">
         <p slot="title">{{title}}</p>
 		<i-form ref="formValidate" :model="tbCfCoupon" :rules="ruleValidate" :label-width="80">
-          <Form-item label="优惠券类型" prop="couponVaild">
+          <Form-item label="优惠券类型" prop="couponCategoryId">
                <i-select  placeholder="请选择" v-model="tbCfCoupon.couponCategoryId" @on-change="changeCouponCategory">
                     <i-option
                             v-for="(el,i) in CouponCategory" :key = 'i'
                             :value="el.couponCategoryId">{{el.couponCategoryName}}</i-option>
                 </i-select>
             </Form-item>
-            <Form-item label="设置是否为注册就送该优惠券" prop="couponCategoryId">
+            <Form-item label="设置是否为注册就送该优惠券" prop="couponVaild">
                 <i-select  placeholder="请选择" v-model="tbCfCoupon.couponVaild">
                     <i-option value="0">0</i-option>
                     <i-option value="1">1</i-option>

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

@@ -23,7 +23,7 @@ $(function () {
 			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
 			{label: '修改人', name: 'updateUserId', index: 'update_user_id', width: 80, hidden: true},
 			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80, hidden: true},
-			{label: '修改时间', name: 'coupon_vaild', index: 'update_time', width: 80, hidden: true}]
+			{label: '是否为注册就送优惠券', name: 'couponVaild', index: 'coupon_vaild', width: 80, hidden: true}]
     });
 });
 $(function () {
@@ -83,7 +83,6 @@ let vm = new Vue({
 			value:'40',
 			label:'4'
 		}],
-
         showEdit: true,
 		showList: true,
 		showCategory: true,