fix 套餐权益订单 积分发放

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

@@ -111,7 +111,6 @@ import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -2872,6 +2871,14 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 					try {
 						List<GoodsDonSku> goodsDonSkus = Jsons.parseList(sku.getBenefitsList(), GoodsDonSku.class);
 						userRealOrderBenefitsService.sendUserBenefitsTicket(orderDon, goodsDonSkus);
+						//是否有对应的实物分销订单
+						DistributeWaitingSendPoints distributeWaitingSendPoints = distributeWaitingSendPointsMapper.selectOne(Wrappers.lambdaQuery(DistributeWaitingSendPoints.class)
+								.eq(DistributeWaitingSendPoints::getOrderId, orderDon.getId())
+								.last("limit 1"));
+						if (distributeWaitingSendPoints != null) {
+							distributeWaitingSendPoints.setIsDelivery(true);
+							distributeWaitingSendPointsMapper.updateById(distributeWaitingSendPoints);
+						}
 					} catch (Exception e) {
 						log.error("发放用户:{}车票权益套餐错误：{}", orderDon.getUserId(), StringUtil.getErrorText(e));
 					}

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -124,6 +124,8 @@ public class CmsOrderController {
 
 	private final ChatgptUserMapper chatgptUserMapper;
 
+	private final UserBenefitsOrderRecordMapper userBenefitsOrderRecordMapper;
+
 	private static final GlobalThreadPoolTaskExecutor TASK_EXECUTOR = GlobalThreadPoolTaskExecutor.getInstance();
 
 	@GetMapping("/get")
@@ -250,6 +252,14 @@ public class CmsOrderController {
 							.eq(UserPayEquipmentAvailableBenefits::getRealOrderId, data.getId()));
 				}
 				data.setIsHasBenefits(count == 0 ? true : false);
+				//是否是套餐优惠权益订单
+				if (data.getIsBenefits()) {
+					Integer selectCount = userBenefitsOrderRecordMapper.selectCount(Wrappers.lambdaQuery(UserBenefitsOrderRecord.class)
+							.eq(UserBenefitsOrderRecord::getOrderId, data.getId()));
+					if (selectCount > 0) {
+						data.setIsHasBenefits(false);
+					}
+				}
 			}
 
 			if (data.getYhsId() != 0) {