Merge branch 'mj' into dev

# Conflicts:
#	netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java
#	netflix-web/src/main/resources/application-prd.yml

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

@@ -186,6 +186,7 @@ public class GoodsDonSku extends BaseEntity {
     /**
      * mj relax次数
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer mjRelaxNum;
 
     /**

netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java

@@ -1260,4 +1260,17 @@ public class GoodsDonController {
 	}
 
 
+
+	/**
+	 * 获取套餐列表
+	 */
+	@GetMapping("/get/upgradePackage")
+	public Result<SearchResult<UpgradePackageView>> list() {
+		log.info("获取套餐列表");
+		Map<String, Object> build = MapUtils.flatBuilder(request.getParameterMap()).build();
+		SearchResult<UpgradePackageView> search = beanSearcher.search(UpgradePackageView.class, build);
+		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+	}
+
+
 }

netflix-web/src/main/java/com/cyksj/web/controller/mirror/MidjourneyController.java

@@ -61,9 +61,19 @@ public class MidjourneyController {
             }
         }else {
             Object fastNum = redisService.get(RedisService.key.MIDJOURNEY_FAST_LIMIT.getName() + midjourneyUser.getId());
-            midjourneyUser.setMjFastNum(Integer.parseInt(fastNum.toString()));
+            if (fastNum == null){
+                redisService.set(RedisService.key.MIDJOURNEY_FAST_LIMIT.getName() + midjourneyUser.getId(), midjourneyUser.getMjFastNum(), RedisService.key.MIDJOURNEY_FAST_LIMIT.getTimeout());
+            }else {
+                midjourneyUser.setMjFastNum(Integer.parseInt(fastNum.toString()));
+            }
             Object relaxNum = redisService.get(RedisService.key.MIDJOURNEY_RELAX_LIMIT.getName() + midjourneyUser.getId());
-            midjourneyUser.setMjRelaxNum(Integer.parseInt(relaxNum.toString()));
+            if (relaxNum == null){
+                if (midjourneyUser.getMjRelaxNum() != null){
+                    redisService.set(RedisService.key.MIDJOURNEY_RELAX_LIMIT.getName() + midjourneyUser.getId(), midjourneyUser.getMjRelaxNum(), RedisService.key.MIDJOURNEY_RELAX_LIMIT.getTimeout());
+                }
+            }else {
+                midjourneyUser.setMjRelaxNum(Integer.parseInt(relaxNum.toString()));
+            }
         }
         return midjourneyUser;
     }