Эх сурвалжийг харах

fix 礼品订单购买title

zoujiajian 1 жил өмнө
parent
commit
911b275321

+ 1 - 1
netflix-dao/src/main/resources/mapper/GroupRelationMapper.xml

@@ -342,7 +342,7 @@
 
     <select id="getUserHasPayGoods" resultType="com.cyksj.model.views.RenewalView">
         select g.id as goods_id,g.title,g.logo from (select distinct groups_id from groups_relation where status in
-        ('validity', 'outside') and (expiry_time is null
+        ('validity', 'outside') and cmt != 2 and (expiry_time is null
         or
         expiry_time > #{now}) and user_id != 0 and user_id in <foreach
             collection="list" item="item" open="(" separator="," close=")">

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

@@ -3509,9 +3509,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 	 */
 	public void setOrderDonPayTile(AtomicBoolean isGiftCardPay, GiftCardDto gcPayInfo, List<GiftCardPayReq> giftCards, OrderDon orderDon, GoodsDon goodsDon, GoodsDonSku sku, List<Long> dpSkuIds) {
 		StringBuilder payTitle = new StringBuilder();
-		if (isGiftCardPay != null && !isGiftCardPay.get()) {
-			payTitle.append(goodsDon.getTitle());
-		}
+//		if (isGiftCardPay != null && !isGiftCardPay.get()) {
+//			payTitle.append(goodsDon.getTitle());
+//		}
 		if (sku != null) {
 			payTitle.append(sku.getSpecVal());
 		}