12/25

src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java

@@ -31,4 +31,5 @@ public class LpkGiftCardListVo implements Vo {
     private String buildDate;
     private String countNumber;
     private String qrCode;
+    private String isEnable;
 }

src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml

@@ -28,7 +28,7 @@
         <where>
             ${ew.sqlSegment}
         </where>
-        ORDER BY gi.isItlnvalid asc,gi.bindDate desc
+        ORDER BY gi.isItlnvalid desc,gi.bindDate desc
     </select>
     <select id="getGifCardBySid" resultType="com.yxt.yyth.api.empcardgift.EmpGiftAppletVo">
         SELECT

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml

@@ -53,6 +53,7 @@
         serialNumber,
         code,
         codeKey,
+        isEnable,
         CASE `state`
         WHEN 1 THEN '未发放'
         WHEN 2 THEN '未绑定客户'
@@ -95,6 +96,7 @@
         card.serialNumber,
         card.code,
         card.codeKey,
+        card.isEnable,
         CASE card.state
         WHEN 1 THEN '未发放'
         WHEN 2 THEN '未绑定客户'

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java

@@ -148,4 +148,10 @@ public class LpkGiftCardRest {
     public void  cardStatisticsList(@RequestBody PagerQuery<LpkReserveOrderQuery> pq) {
         lpkGiftCardService.cardStatisticsList(pq);
     }
+
+    @ApiOperation("设置是否作废")
+    @GetMapping("/cancelCard/{sid}")
+    public ResultBean  cancelCard(@PathVariable("sid")String sid) {
+        return lpkGiftCardService.isEnable(sid);
+    }
 }

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java

@@ -119,7 +119,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         if (null == lpkGiftCard) {
             return rb.setMsg("请核对卡号和密钥");
         }
-        if (!lpkGiftCard.getIsEnable().equals("1")) {
+        if (!lpkGiftCard.getIsEnable().equals("2")) {
             return rb.setMsg("此卡已作废");
         }
 
@@ -357,6 +357,12 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
         IPage<LpkGiftCardListVo> pagging = baseMapper.cardList(page, qw);
         PagerVo<LpkGiftCardListVo> p = PagerUtil.pageToVo(pagging, null);
+//        p.getRecords().forEach(s->{
+//            if(s.getIsEnable().equals("2")){
+//                s.setState("已作废");
+//            }
+//
+//        });
         return rb.success().setData(p);
     }
 
@@ -475,6 +481,12 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
         IPage<LpkGiftCardListVo> pagging = baseMapper.recordDetails(page, qw);
         PagerVo<LpkGiftCardListVo> p = PagerUtil.pageToVo(pagging, null);
+        p.getRecords().forEach(s->{
+            if(s.getIsEnable().equals("2")){
+                s.setState("已作废");
+            }
+
+        });
         return rb.success().setData(p);
     }
 
@@ -1430,4 +1442,12 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
 
         return rb.success().setData(pagging);
     }
+
+    public ResultBean isEnable(String sid ) {
+        ResultBean rb=new ResultBean();
+        LpkGiftCard card=baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("sid",sid));
+        card.setIsEnable("2");
+        baseMapper.updateById(card);
+        return rb.success().setData("成功");
+    }
 }