fix mj relax模式为空

netflix-dao/src/main/java/com/cyksj/model/entity/GroupsTrips.java

@@ -79,6 +79,14 @@ public class GroupsTrips {
     @DbField("sku.spec_val")
     @TableField(exist = false)
     private String specVal;
+
+    /**
+     * 商品规格
+     */
+    @DbField("sku.is_mirror")
+    @TableField(exist = false)
+    private Boolean isMirror;
+
     /**
      * 录入人
      */

netflix-dao/src/main/java/com/cyksj/model/manage/views/AccountView.java

@@ -118,6 +118,9 @@ public class AccountView {
     @DbField("gdk.id")
     private Long skuId;
 
+    @DbField("gdk.is_mirror")
+    private Boolean isMirror;
+
     @DbField("a.gpt_refresh_token")
     private String gptRefreshToken;
 

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

@@ -987,16 +987,22 @@ public class CmsOrderController {
 			startTime = DateUtil.offsetMonth(startTime, sku.getMonths());
 			expiryTime = relation.getExpiryTime();
 		}
-		MidjourneyUserDetailView midjourneyUserDetailView = midjourneyUserConversationMapper.getMjMirrorOrderDetail(orderDon.getRelationId(), startTime, expiryTime);
-
-		GoodsDonSku sku = skuMapper.selectById(orderDon.getSkuId());
 		MidjourneyUser midjourneyUser = midjourneyUserMapper.selectOne(Wrappers.lambdaQuery(MidjourneyUser.class)
 				.eq(MidjourneyUser::getRelationId, orderDon.getRelationId())
 				.last("limit 1"));
+		if (midjourneyUser == null) {
+			return GatewayResponse.SUCCESS.newBuilder().toResult();
+		}
+		MidjourneyUserDetailView midjourneyUserDetailView = midjourneyUserConversationMapper.getMjMirrorOrderDetail(orderDon.getRelationId(), startTime, expiryTime);
+		GoodsDonSku sku = skuMapper.selectById(orderDon.getSkuId());
 		midjourneyUserDetailView.setUserId(orderDon.getUserId());
 		midjourneyUserDetailView.setExpiryTime(midjourneyUser.getExpireTime());
 		midjourneyUserDetailView.setMjFastNum(sku.getMjFastNum() - midjourneyUserDetailView.getUseFastNum());
-		midjourneyUserDetailView.setMjRelaxNum(sku.getMjRelaxNum() - midjourneyUserDetailView.getUseRelaxNum());
+		if (sku.getMjRelaxNum() == null) {
+			midjourneyUserDetailView.setMjRelaxNum(null);
+		} else {
+			midjourneyUserDetailView.setMjRelaxNum(sku.getMjRelaxNum() - midjourneyUserDetailView.getUseRelaxNum());
+		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyUserDetailView);
 	}
 }