zoujiajian преди 2 години
родител
ревизия
2f206434d2

+ 4 - 0
netflix-dao/src/main/java/com/cyksj/model/views/OrderDonRenewView.java

@@ -1,5 +1,6 @@
 package com.cyksj.model.views;
 
+import com.cyksj.model.entity.OrderDon;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
@@ -40,6 +41,9 @@ public class OrderDonRenewView {
 	@DbField("o.order_type")
 	private Integer orderType;
 
+	@DbField("o.status")
+	private OrderDon.Status status;
+
 	@DbField("o.created_time")
 	private Date createdTime;
 }

+ 2 - 0
netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupRelationController.java

@@ -182,6 +182,7 @@ public class CmsGroupRelationController {
                     .field(OrderDonRenewView::getUserId, e.getUserId())
                     .field(OrderDonRenewView::getRelationId, e.getRelationId())
                     .field(OrderDonRenewView::getOrderType, 2)
+                    .field(OrderDonRenewView::getStatus, Constant.noOrderAllStatus).op(Operator.NotIn)
                     .build());
             e.setNumOfRenew(count.intValue());
         });
@@ -230,6 +231,7 @@ public class CmsGroupRelationController {
                 .field(OrderDonRenewView::getUserId, userId)
                 .field(OrderDonRenewView::getRelationId, relationId)
                 .field(OrderDonRenewView::getOrderType, 2)
+                .field(OrderDonRenewView::getStatus, Constant.noOrderAllStatus).op(Operator.NotIn)
                 .build());
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }