123

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/CouponFindDTO.java

@@ -25,4 +25,14 @@ public class CouponFindDTO  extends PageParam {
      private List<Integer> companyIds;
 
      private Integer bizType;
+
+     private Integer isLed;
+
+     private Long userId;
+
+     private Long ledTime;
+
+     public  Long getLedTime(){
+          return  System.currentTimeMillis();
+     }
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/ActivityCouponVo.java

+package com.xxfc.platform.activity.vo;
+
+
+import com.xxfc.platform.activity.entity.Coupon;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/23 15:00
+ */
+@Data
+public class ActivityCouponVo extends Coupon {
+
+    @ApiModelProperty("是否使用")
+    private Integer isUsd;
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/CouponBiz.java

@@ -11,6 +11,7 @@ import com.xxfc.platform.activity.dto.CouponDTO;
 import com.xxfc.platform.activity.dto.CouponFindDTO;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.entity.UserCoupon;
+import com.xxfc.platform.activity.vo.ActivityCouponVo;
 import com.xxfc.platform.activity.vo.CouponPagVo;
 import com.xxfc.platform.activity.vo.CouponTitleVo;
 import com.xxfc.platform.activity.vo.CouponVo;
@@ -179,4 +180,11 @@ public class CouponBiz extends BaseBiz<CouponMapper, Coupon> {
         example.setOrderByClause("crt_time DESC");
         return   mapper.selectByExample(example);
     }
+
+
+    public PageDataVO<ActivityCouponVo> selectList(CouponFindDTO couponFindDTO) {
+        Integer page = couponFindDTO.getPage() == null ? 1 : couponFindDTO.getPage();
+        Integer limit = couponFindDTO.getLimit() == null ? 10 : couponFindDTO.getLimit();
+        return  PageDataVO.pageInfo(page, limit, () -> mapper.selectList(couponFindDTO));
+    }
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/CouponMapper.java

 package com.xxfc.platform.activity.mapper;
 
 import com.xxfc.platform.activity.dto.CouponDTO;
+import com.xxfc.platform.activity.dto.CouponFindDTO;
 import com.xxfc.platform.activity.entity.Coupon;
+import com.xxfc.platform.activity.vo.ActivityCouponVo;
 import com.xxfc.platform.activity.vo.CouponTitleVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
-
-import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 优惠券表
@@ -27,4 +26,7 @@ public interface CouponMapper extends Mapper<Coupon> {
     List<Coupon> couponsByTickerNoList(@Param(value = "tickerNoList") List<String> tickerNoList);
 
     List<CouponDTO> findCouponsByIds(@Param("ids") List<Integer> ids);
+
+
+    List<ActivityCouponVo> selectList(CouponFindDTO couponFindDTO);
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/CouponController.java

 package com.xxfc.platform.activity.rest;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.activity.biz.CouponBiz;
+import com.xxfc.platform.activity.dto.CouponFindDTO;
 import com.xxfc.platform.activity.entity.Coupon;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -29,4 +30,20 @@ public class CouponController extends BaseController<CouponBiz, Coupon> {
         return baseBiz.couponsByTickerNoList(tickerNoList);
     }
 
+
+    @ApiOperation("领劵中心")
+    @RequestMapping(value = "app/unauth/ledList", method = RequestMethod.GET)
+    @IgnoreUserToken
+    public ObjectRestResponse ledList(CouponFindDTO couponFindDTO){
+        String userIdStr=getCurrentUserId();
+        Long userId=0L;
+        if (StringUtils.isNotBlank(userIdStr)){
+            userId=Long.parseLong(userIdStr);
+        }
+        couponFindDTO.setUserId(userId);
+        couponFindDTO.setStatus(1);
+        couponFindDTO.setIsLed(1);
+        return ObjectRestResponse.succ(baseBiz.selectList(couponFindDTO));
+    }
+
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/CouponMapper.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.xxfc.platform.activity.mapper.CouponMapper">
 
 	<!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.xxfc.platform.activity.entity.Coupon" id="couponMap">
+    <resultMap type="com.xxfc.platform.activity.vo.ActivityCouponVo" id="couponMap">
         <result property="id" column="id"/>
         <result property="title" column="title"/>
         <result property="icon" column="icon"/>
@@ -35,6 +35,7 @@
         <result property="updName" column="upd_name"/>
         <result property="updTime" column="upd_time"/>
         <result property="isDel" column="is_del"/>
+        <result property="isLed" column="isLed"/>
     </resultMap>
 
     <select id="selectTitles" resultType="com.xxfc.platform.activity.vo.CouponTitleVo">
@@ -66,4 +67,25 @@
      </foreach>
      </if>
     </select>
+
+    <select id="selectList" resultMap="couponMap" parameterType="com.xxfc.platform.activity.dto.CouponFindDTO">
+        select  c.*,IF(COUNT(uc.id) >0 ,1,0) as isLed  from `coupon` c
+        LEFT JOIN  (SELECT * FROM user_coupon
+        WHERE 1=1
+        <if test="userId != null and userId >= 0">
+            and  user_id=#{userId}
+        </if>
+        ) uc ON c.id=uc.coupon_id
+        where c.`is_del`=0
+        <if test="isLed != null and isLed >= 0">
+            and c.is_led=#{isLed}
+        </if>
+        <if test="status != null and status >= 0">
+            and c.status=#{status}
+        </if>
+        <if test="ledTime != null and ledTime > 0L" >
+            and (c.start_time &lt;= #{ledTime} or c.start_time  = 0) and (c.end_time >= #{ledTime} or c.end_time  = 0)
+        </if>
+        GROUP BY c.id
+    </select>
 </mapper>
\ No newline at end of file