zoujiajian 1 năm trước cách đây
mục cha
commit
ca9a4390ec

+ 3 - 2
netflix-service/src/main/java/com/cyksj/service/fission/impl/UserMirrorFissionFrontServiceImpl.java

@@ -144,7 +144,7 @@ public class UserMirrorFissionFrontServiceImpl implements UserMirrorFissionFront
 	public UserMirrorFissionRecord getPresentFissionTicket(long userId) {
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
 		UserMirrorFissionRecord userMirrorFissionRecord = userMirrorFissionRecordMapper.selectOne(Wrappers.lambdaQuery(UserMirrorFissionRecord.class)
-				.eq(UserMirrorFissionRecord::getUserId, userIdList)
+				.in(UserMirrorFissionRecord::getUserId, userIdList)
 				.select(UserMirrorFissionRecord::getId, UserMirrorFissionRecord::getRelationId, UserMirrorFissionRecord::getGoodsId, UserMirrorFissionRecord::getTrialSkuId, UserMirrorFissionRecord::getNum, UserMirrorFissionRecord::getRemainNum)
 				.last("limit 1"));
 		return userMirrorFissionRecord;
@@ -207,7 +207,7 @@ public class UserMirrorFissionFrontServiceImpl implements UserMirrorFissionFront
 			userMirrorFissionRecord.setRelationId(relationId);
 			userMirrorFissionRecord.setGoodsId(sku.getGoodsId());
 			userMirrorFissionRecord.setNum(userMirrorFissionTicketConfig.getNum());
-			userMirrorFissionRecord.setRemainNum(userMirrorFissionRecord.getNum());
+			userMirrorFissionRecord.setRemainNum(userMirrorFissionTicketConfig.getNum());
 			userMirrorFissionRecord.setTrialSkuId(userMirrorFissionTicketConfig.getTrialSkuId());
 			userMirrorFissionRecordMapper.insert(userMirrorFissionRecord);
 		} catch (DuplicateKeyException e) {
@@ -254,6 +254,7 @@ public class UserMirrorFissionFrontServiceImpl implements UserMirrorFissionFront
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
 		Integer count = orderDonMapper.selectCount(Wrappers.lambdaQuery(OrderDon.class)
 				.in(OrderDon::getUserId, userIdList)
+				.notIn(OrderDon::getStatus, Constant.noOrderStatus)
 				.apply(String.format("sku_id in (select id from goods_don_sku where goods_id = %s and is_mirror)", goodsId)));
 		if (count > 0) {
 			return true;