Merge branch 'fixbug/fixgift' into 'master'

bug: [1025092] fixGift

See merge request rays/pcloud-book!898

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java

@@ -817,7 +817,6 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
             }
             fillProductAndApp(nowItems);
         }
-        List<RightsNowItem> giftCouponPackItems = rightsNowItemDao.getGiftCouponListByRightsSettingId(rightsSetting.getId());
         Iterator<RightsSettingTitle> iterator = rightsSettingTitles.iterator();
         while (iterator.hasNext()) {
             RightsSettingTitle rightsSettingTitle = iterator.next();
@@ -825,6 +824,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                 servesTitle = rightsSettingTitle;
                 iterator.remove();
             }
+            List<RightsNowItem> giftCouponPackItems = rightsNowItemDao.getGiftCouponListByRightsSettingTitleId(rightsSettingTitle.getId());
             if (RightsNowItemTypeNew.GIFT_COUPON_PACKAGE.value.equals(rightsSettingTitle.getRightsSettingNowType())) {
                 rightsSettingTitle.setRightsSettingItemList(giftCouponPackItems);
             }