zoujiajian 2 年之前
父節點
當前提交
d1a7600c3c

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

@@ -5,7 +5,7 @@
 
     <select id="selectPlusRelationByIdAndUserId"
             resultType="com.cyksj.model.entity.OrderDiscountPlusPurchaseSkuRelation">
-        select id, relation_ids
+        select id, relation_ids, order_id
         from order_discount_plus_purchase_sku_relation
         where user_id = #{userId}
           and relation_ids like concat('%', #{relationId}, '%')

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -156,7 +156,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 							if (relationList.contains(ticket.getRelationId())) {
 								OrderDon plusOrder = orderDonMapper.selectById(data.getOrderId());
 								if (plusOrder != null) {
-									payTime = Optional.ofNullable(orderDon.getPayTime()).orElse(orderDon.getCreatedTime());
+									payTime = Optional.ofNullable(plusOrder.getPayTime()).orElse(plusOrder.getCreatedTime());
 								}
 								break;
 							}