push

yd-product-api/src/main/java/com/yd/product/api/service/impl/ApiProductLaunchServiceImpl.java

@@ -284,8 +284,8 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService {
             //审核通过 -> 更新上架状态和更新租户/项目产品上架关系数据
             //审核通过 -> 更新上架状态和更新租户/项目产品上架关系数据
             //定时开始是否开启，开启-待开售状态 关闭-在售状态
             //定时开始是否开启，开启-待开售状态 关闭-在售状态
             if (NoYesEnum.YES.getItemValue().equals(productLaunch.getIsTiming())) {
             if (NoYesEnum.YES.getItemValue().equals(productLaunch.getIsTiming())) {
-                //定时开始是否开启，开启-待开售状态
-                productLaunch.setStatus(ProductCommonEnum.PRODUCT_LAUNCH_STATUS_DKS.getItemValue());
+                //定时开始是否开启，开启-预售状态
+                productLaunch.setStatus(ProductCommonEnum.PRODUCT_LAUNCH_STATUS_YS.getItemValue());
             }else if (NoYesEnum.NO.getItemValue().equals(productLaunch.getIsTiming())){
             }else if (NoYesEnum.NO.getItemValue().equals(productLaunch.getIsTiming())){
                 //关闭-在售状态
                 //关闭-在售状态
                 productLaunch.setStatus(ProductCommonEnum.PRODUCT_LAUNCH_STATUS_ZS.getItemValue());
                 productLaunch.setStatus(ProductCommonEnum.PRODUCT_LAUNCH_STATUS_ZS.getItemValue());
@@ -329,8 +329,18 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService {
         //校验产品上架信息是否存在
         //校验产品上架信息是否存在
         Result<ProductLaunch> result = checkProductLaunchIsExist(request.getProductLaunchBizId());
         Result<ProductLaunch> result = checkProductLaunchIsExist(request.getProductLaunchBizId());
         ProductLaunch productLaunch = result.getData();
         ProductLaunch productLaunch = result.getData();
-
-        productLaunch.setStatus(request.getStatus());
+        if (ProductCommonEnum.PRODUCT_LAUNCH_STATUS_SJ.getItemValue().equals(request.getStatus())) {
+            //上架 -> 待审核
+            productLaunch.setStatus(ProductCommonEnum.PRODUCT_LAUNCH_STATUS_DSH.getItemValue());
+        }else if (ProductCommonEnum.PRODUCT_LAUNCH_STATUS_XJ.getItemValue().equals(request.getStatus())) {
+            //下架 -> 下架
+            productLaunch.setStatus(ProductCommonEnum.PRODUCT_LAUNCH_STATUS_DSH.getItemValue());
+            //下架要清空租户/项目产品上架关系数据
+            //根据产品业务ID删除项目产品关系
+            iRelProjectProductLaunchService.delByProductLaunchBizId(productLaunch.getProductLaunchBizId());
+            //根据产品业务ID删除租户产品关系
+            iRelTenantProductLaunchService.delByProductLaunchBizId(productLaunch.getProductLaunchBizId());
+        }
         iProductLaunchService.saveOrUpdate(productLaunch);
         iProductLaunchService.saveOrUpdate(productLaunch);
         return Result.success();
         return Result.success();
     }
     }

yd-product-feign/src/main/java/com/yd/product/feign/enums/ProductCommonEnum.java

@@ -14,6 +14,7 @@ public enum ProductCommonEnum {
     PRODUCT_LAUNCH_STATUS_XJ("下架","XJ"),
     PRODUCT_LAUNCH_STATUS_XJ("下架","XJ"),
     PRODUCT_LAUNCH_STATUS_YS("预售","YS"),
     PRODUCT_LAUNCH_STATUS_YS("预售","YS"),
     PRODUCT_LAUNCH_STATUS_DKS("待开售","DKS"),
     PRODUCT_LAUNCH_STATUS_DKS("待开售","DKS"),
+    PRODUCT_LAUNCH_STATUS_SJ("上架","SJ"),
 
 
     //审核操作状态
     //审核操作状态
     APPROVAL_STATUS_TG("通过","TG"),
     APPROVAL_STATUS_TG("通过","TG"),