feature/1004086 小优化点集合——我的礼包

pcloud-service-book/src/main/java/com/pcloud/book/giftcoupon/biz/impl/GiftCouponPackageBizImpl.java

@@ -362,7 +362,7 @@ public class GiftCouponPackageBizImpl implements GiftCouponPackageBiz {
 
     @Override
     public PageBeanNew<GiftPackageDTO> list4MyGiftPackage(Integer state,Long wechatUserId,Integer currentPage, Integer numPerPage) {
-        //state=1 已领取  state=2 已失效
+        //state=1 已领取  state=2 已失效 state=3 已使用
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("wechatUserId", wechatUserId);
         paramMap.put("state", state);

pcloud-service-book/src/main/resources/mapper/giftConpon/GiftReceiveDao.xml

@@ -146,7 +146,10 @@
         a.crossed_price crossedPrice,
         a.exchange_address exchangeAddress,
         <if test="state!=null and state==2">
-            if(b.use_time>0,1,2) failureState,
+            2 failureState,
+        </if>
+        <if test="state!=null and state==3">
+            1 failureState,
         </if>
         a.serve_id serveId,
         a.serve_type serveType,
@@ -161,7 +164,10 @@
             and now() <![CDATA[ <= ]]> a.valid_date_end and use_time is null
         </if>
         <if test="state!=null and state==2">
-            and (now() > a.valid_date_end or use_time>0)
+            and now() > a.valid_date_end and use_time is null
+        </if>
+        <if test="state!=null and state==3">
+            and use_time is not null
         </if>
             order by b.create_time desc
     </select>