Commit 0facbeaa by 吴博

bug:[1025092] fixGift

parent 0f14388b
...@@ -817,7 +817,6 @@ public class RightsSettingBizImpl implements RightsSettingBiz { ...@@ -817,7 +817,6 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
} }
fillProductAndApp(nowItems); fillProductAndApp(nowItems);
} }
List<RightsNowItem> giftCouponPackItems = rightsNowItemDao.getGiftCouponListByRightsSettingId(rightsSetting.getId());
Iterator<RightsSettingTitle> iterator = rightsSettingTitles.iterator(); Iterator<RightsSettingTitle> iterator = rightsSettingTitles.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
RightsSettingTitle rightsSettingTitle = iterator.next(); RightsSettingTitle rightsSettingTitle = iterator.next();
...@@ -825,6 +824,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz { ...@@ -825,6 +824,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
servesTitle = rightsSettingTitle; servesTitle = rightsSettingTitle;
iterator.remove(); iterator.remove();
} }
List<RightsNowItem> giftCouponPackItems = rightsNowItemDao.getGiftCouponListByRightsSettingTitleId(rightsSettingTitle.getId());
if (RightsNowItemTypeNew.GIFT_COUPON_PACKAGE.value.equals(rightsSettingTitle.getRightsSettingNowType())) { if (RightsNowItemTypeNew.GIFT_COUPON_PACKAGE.value.equals(rightsSettingTitle.getRightsSettingNowType())) {
rightsSettingTitle.setRightsSettingItemList(giftCouponPackItems); rightsSettingTitle.setRightsSettingItemList(giftCouponPackItems);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment