zoujiajian 1 éve
szülő
commit
c51feadf3d

+ 10 - 4
netflix-web/src/main/java/com/cyksj/web/controller/user/UserBenefitsFrontController.java

@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -164,10 +165,15 @@ public class UserBenefitsFrontController {
 						.field(RenewalView::getExpiryTime, DateTime.now()).op(Operator.GreaterThan)
 						.build());
 				fhCount = tickets.intValue();
-				GroupsRelation relation = relationMapper.selectOne(Wrappers.lambdaQuery(GroupsRelation.class)
-						.eq(GroupsRelation::getId, relationId)
-						.in(GroupsRelation::getUserId, userIdList));
-				Integer renewCount = userBenefitsOrderRecordMapper.selectUseComboRecordByUid(userIdList, data.getType(), data.getGoodsId(), data.getSkuId(), Constant.noOrderAllStatus, null, relation.getStartTime());
+				Date startTime = null;
+				if (relationId != null) {
+					GroupsRelation relation = relationMapper.selectOne(Wrappers.lambdaQuery(GroupsRelation.class)
+							.eq(GroupsRelation::getId, relationId)
+							.in(GroupsRelation::getUserId, userIdList));
+					startTime = relation.getStartTime();
+				}
+
+				Integer renewCount = userBenefitsOrderRecordMapper.selectUseComboRecordByUid(userIdList, data.getType(), data.getGoodsId(), data.getSkuId(), Constant.noOrderAllStatus, null, startTime);
 				data.setRenewCount(renewCount);
 			}
 			if (type == UserBenefits.Type.CERT) {