1.合作伙伴、行业应用、banner页管理、计算资源 save接口，内容改为非必填

2.解决方案上架字段showsStatus改为status
3.老aigc四季接口地址修改
4.提交企业信息审核(第二次申请) 把之前的数据删除；根据id查找改为根据userId查找
5.客户端算力资源展示，取有库存并且标品状态为上架的

computility-module-biz/computility-module-biz-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/bannerinfo/vo/BannerInfoSaveReqVO.java

@@ -16,7 +16,6 @@ public class BannerInfoSaveReqVO {
     private  String image;
     private  String image;
 
 
     @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
     @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "内容不能为空")
     private String information;
     private String information;
 
 
     @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)
     @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)

computility-module-biz/computility-module-biz-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/computilityinformation/vo/ComputilityInformationSaveReqVO.java

@@ -16,7 +16,6 @@ public class ComputilityInformationSaveReqVO {
     private String image;
     private String image;
 
 
     @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
     @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "内容不能为空")
     private String information;
     private String information;
 
 
     @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)
     @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -30,7 +29,6 @@ public class ComputilityInformationSaveReqVO {
     private String description;
     private String description;
 
 
     @Schema(description = "计算资源应用类别", requiredMode = Schema.RequiredMode.REQUIRED)
     @Schema(description = "计算资源应用类别", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "计算资源应用类别不能为空")
     private Integer category;
     private Integer category;
 
 
     @Schema(description = "状态：0-已隐藏，1-已显示", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @Schema(description = "状态：0-已隐藏，1-已显示", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")

computility-module-biz/computility-module-biz-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/industryapplication/vo/IndustryApplicationSaveReqVO.java

@@ -16,7 +16,6 @@ public class IndustryApplicationSaveReqVO {
     private String image;
     private String image;
 
 
     @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
     @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "内容不能为空")
     private String information;
     private String information;
 
 
     @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)
     @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)

computility-module-biz/computility-module-biz-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/partner/vo/PartnerSaveReqVO.java

@@ -16,7 +16,6 @@ public class PartnerSaveReqVO {
     private String image;
     private String image;
 
 
     @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
     @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "内容不能为空")
     private String information;
     private String information;
 
 
     @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)
     @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)

computility-module-biz/computility-module-biz-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/solution/vo/SolutionSaveReqVO.java

@@ -47,7 +47,7 @@ public class SolutionSaveReqVO {
 
 
     @Schema(description = "状态：0-已下架，1-已上架", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @Schema(description = "状态：0-已下架，1-已上架", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotNull(message = "状态：0-已下架，1-已上架不能为空")
     @NotNull(message = "状态：0-已下架，1-已上架不能为空")
-    private Integer showStatus;
+    private Integer status;
 
 
 
 
     @Schema(description = "备注", example = "随便")
     @Schema(description = "备注", example = "随便")

computility-module-external/src/main/java/com/luhu/computility/module/external/controller/openapi/AigcOldApiController.java

@@ -36,13 +36,13 @@ import static com.luhu.computility.framework.common.pojo.CommonResult.success;
 @RequestMapping("/external/v1")
 @RequestMapping("/external/v1")
 public class AigcOldApiController {
 public class AigcOldApiController {
 
 
-    @Value("${text-to-image.season}")
+    @Value("${new-aigc.text-to-image-v1}")
     private String textToImageBySeason;
     private String textToImageBySeason;
 
 
     @Value("${text-to-image.file-name}")
     @Value("${text-to-image.file-name}")
     private String textToImageByFileName;
     private String textToImageByFileName;
 
 
-    @Value("${text-to-image.poetry}")
+    @Value("${new-aigc.poetry-v1}")
     private String textToImageByPoetry;
     private String textToImageByPoetry;
 
 
 
 

computility-module-mall/computility-module-product/src/main/java/com/luhu/computility/module/product/dal/mysql/sku/ProductSkuMapper.java

@@ -16,6 +16,7 @@ import com.luhu.computility.module.product.dal.dataobject.category.ProductCatego
 import com.luhu.computility.module.product.dal.dataobject.sku.ProductSkuDO;
 import com.luhu.computility.module.product.dal.dataobject.sku.ProductSkuDO;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.luhu.computility.module.product.dal.dataobject.spu.ProductSpuDO;
 import com.luhu.computility.module.product.dal.dataobject.spu.ProductSpuDO;
+import com.luhu.computility.module.product.enums.spu.ProductSpuStatusEnum;
 import com.luhu.computility.module.system.dal.dataobject.permission.RoleDO;
 import com.luhu.computility.module.system.dal.dataobject.permission.RoleDO;
 import com.luhu.computility.module.system.dal.dataobject.permission.UserRoleDO;
 import com.luhu.computility.module.system.dal.dataobject.permission.UserRoleDO;
 import com.luhu.computility.module.system.dal.dataobject.user.AdminUserDO;
 import com.luhu.computility.module.system.dal.dataobject.user.AdminUserDO;
@@ -89,6 +90,8 @@ public interface ProductSkuMapper extends BaseMapperX<ProductSkuDO> {
                 .select(ProductSpuDO::getName)
                 .select(ProductSpuDO::getName)
                 .leftJoin(ProductSpuDO.class, ProductSpuDO::getId, ProductSkuDO::getSpuId)
                 .leftJoin(ProductSpuDO.class, ProductSpuDO::getId, ProductSkuDO::getSpuId)
                 .eq(!ObjectUtil.isEmpty(queryVO.getCategoryId()), ProductSpuDO::getCategoryId, queryVO.getCategoryId() )
                 .eq(!ObjectUtil.isEmpty(queryVO.getCategoryId()), ProductSpuDO::getCategoryId, queryVO.getCategoryId() )
+                .eqIfExists( ProductSpuDO::getStatus, ProductSpuStatusEnum.ENABLE.getStatus())
+                .gt(ProductSpuDO::getStock, 1)
                 .orderByDesc(ProductSkuDO::getCreator));
                 .orderByDesc(ProductSkuDO::getCreator));
     }
     }
 
 

computility-module-member/src/main/java/com/luhu/computility/module/member/controller/app/enterprise/AppEnterpriseController.java

 package com.luhu.computility.module.member.controller.app.enterprise;
 package com.luhu.computility.module.member.controller.app.enterprise;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.luhu.computility.framework.apilog.core.annotation.ApiAccessLog;
 import com.luhu.computility.framework.apilog.core.annotation.ApiAccessLog;
 import com.luhu.computility.framework.common.pojo.CommonResult;
 import com.luhu.computility.framework.common.pojo.CommonResult;
 import com.luhu.computility.framework.common.pojo.PageParam;
 import com.luhu.computility.framework.common.pojo.PageParam;
@@ -48,6 +49,10 @@ public class AppEnterpriseController {
     @PostMapping("/create")
     @PostMapping("/create")
     @Operation(summary = "提交企业信息审核")
     @Operation(summary = "提交企业信息审核")
     public CommonResult<Long> createEnterprise(@Valid @RequestBody AppEnterpriseSaveReqVO createReqVO) {
     public CommonResult<Long> createEnterprise(@Valid @RequestBody AppEnterpriseSaveReqVO createReqVO) {
+        EnterpriseDO enterprise = enterpriseService.getEnterpriseByUserId(getLoginUserId());
+        if (!ObjectUtil.isEmpty(enterprise)){
+            enterpriseService.deleteEnterprise(enterprise.getId());
+        }
         return success(enterpriseService.createEnterpriseByMemberUser(getLoginUserId(),createReqVO));
         return success(enterpriseService.createEnterpriseByMemberUser(getLoginUserId(),createReqVO));
     }
     }
 
 

computility-module-member/src/main/java/com/luhu/computility/module/member/service/enterprise/EnterpriseServiceImpl.java

@@ -116,7 +116,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 
 
     @Override
     @Override
     public EnterpriseDO getEnterpriseByUserId(Long id) {
     public EnterpriseDO getEnterpriseByUserId(Long id) {
-        return enterpriseMapper.selectById(id);
+        return enterpriseMapper.getEnterpriseByUserId(id);
     }
     }
 
 
     @Override
     @Override