fix

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

@@ -2560,6 +2560,14 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 	 */
 	public void unifiedHandlerOrderNotify(OrderDon orderDon, GoodsDon goodsDon, GoodsDonSku sku) {
 		orderDon.setStatus(goodsDon.getType() == 1 && goodsDon.getSecondType() == 2 ? OrderDon.Status.complete : OrderDon.Status.hasPayment);
+		//实物权益优惠订单
+		if (orderDon.getGoodsId() == 15) {
+			Integer selectCount = userBenefitsOrderRecordMapper.selectCount(Wrappers.lambdaQuery(UserBenefitsOrderRecord.class)
+					.eq(UserBenefitsOrderRecord::getOrderId, orderDon.getId()));
+			if (selectCount > 0) {
+				orderDon.setStatus(OrderDon.Status.complete);
+			}
+		}
 		boolean isSuccess = update(Wrappers.lambdaUpdate(OrderDon.class)
 				.set(OrderDon::getStatus, orderDon.getStatus())
 				.in(OrderDon::getStatus, List.of(OrderDon.Status.noPayment, OrderDon.Status.close))
@@ -2574,9 +2582,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		}
 
 		//mj镜像续费订单
-		if(orderDon.getOrderType() == 2 && orderDon.getGoodsId() == 26){
+		if (orderDon.getOrderType() != null && orderDon.getOrderType() == 2 && orderDon.getGoodsId() == 26) {
 			GroupsRelation groupsRelation = groupsRelationMapper.selectById(orderDon.getRelationId());
-			if(groupsRelation != null){
+			if (groupsRelation != null) {
 				Date expiryTime = groupsRelation.getExpiryTime();
 
 				//mj续费订单当天过期直接加次数