Merge branch 'gift_card_func' into pre

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -418,11 +418,11 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			if (giftCardPayNumMap.isEmpty()) {
 				throw BusinessRuntimeException.getInstance("请选择要购买礼品卡的数量");
 			}
-			List<GiftCardGoodsSkuFrontView> giftCardViews = beanSearcher.searchAll(GiftCardGoodsSkuFrontView.class, MapUtils.builder().field(GiftCardGoodsSkuFrontView::getId, giftCardPayNumMap.keySet()).build());
+			List<GiftCardGoodsSkuFrontView> giftCardViews = beanSearcher.searchAll(GiftCardGoodsSkuFrontView.class, MapUtils.builder().field(GiftCardGoodsSkuFrontView::getId, giftCardPayNumMap.keySet()).op(Operator.InList).build());
 			if (giftCardViews.size() != giftCards.size()) {
 				throw BusinessRuntimeException.getInstance("系统异常,请刷新页面重试");
 			}
-			payTitle.append("礼品卡:");
+			payTitle.append("购买详情:");
 			BigDecimal gift_card_pay_money = BigDecimal.ZERO;
 			for (GiftCardGoodsSkuFrontView data : giftCardViews) {
 				//礼品卡数量
@@ -433,7 +433,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				gift_card_pay_money = gift_card_pay_money.add(data.getPrice().multiply(BigDecimal.valueOf(num)));
 
 				//礼品卡关系
-				if (!payTitle.toString().endsWith("礼品卡:")) {
+				if (!payTitle.toString().endsWith("购买详情:")) {
 					payTitle.append(" + ");
 				}
 				String gcDetail;