12/5

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

@@ -100,6 +100,9 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
     public ResultBean getGifCardByCustomerSid(PagerQuery<LpkGiftCardQuery> pq) {
         ResultBean rb = new ResultBean().fail();
         LpkGiftCardQuery query = pq.getParams();
+        if (StringUtils.isBlank(query.getCustomerSid())) {
+            return rb.setMsg("参数不能为空");
+        }
         QueryWrapper<LpkGiftCard> qw = new QueryWrapper<>();
         updateIsItInvalid(query.getCustomerSid());
         if (StringUtils.isNotBlank(query.getCustomerSid())) {
@@ -141,10 +144,10 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
                     LpkReserveOrderVo LpkReserveOrderVo = lpkReserveOrderService.selByCardSid(card.getSid()).getData();
                     if (null != LpkReserveOrderVo) {
                         int c = DateUtil.parse(sdf.format(LpkReserveOrderVo.getReserveDate())).compareTo(DateUtil.parse(sdf.format(new Date())));
-                        LpkGiftCard card1 = baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("sid", card.getSid()));
+//                        LpkGiftCard card1 = baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("sid", card.getSid()));
                         if (String.valueOf(c).equals("-1")) {
-                            card1.setIsReservation("1");
+                            card.setIsReservation("1");
-                            baseMapper.updateById(card1);
+                            baseMapper.updateById(card);
                         }
                     }
                 }