From af8cd7db30e347bf4a9d4753e352abe9106bdb09 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 11 一月 2022 18:06:54 +0800
Subject: [PATCH] 商业街1/11代码提交
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 87 +++++++++++++++++++++++++++++--------------
1 files changed, 58 insertions(+), 29 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index e882626..5596c68 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -2,28 +2,7 @@
import java.util.List;
-import com.panzhihua.common.model.dtos.PageBaseDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.DisableOrEnableMcsMerchantDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsEvaluateDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsGameDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsInfoDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsProductDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageJoinGameListDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsEvaluateDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsGameDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsInformationDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsMerchantDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsProductDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageVerifyRecordDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PutUserInfoDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetPopularForGameDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForGameDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForInfoDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForProductDTO;
-import com.panzhihua.common.model.vos.community.microCommercialStreet.McsConfigVO;
-import com.panzhihua.common.model.vos.community.microCommercialStreet.McsOrderVO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.DeleteProductDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -35,6 +14,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
@@ -174,8 +154,32 @@
import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.DisableOrEnableMcsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsEvaluateDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsInfoDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsProductDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageJoinGameListDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsEvaluateDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsInformationDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsProductDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageVerifyRecordDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PutUserInfoDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetPopularForGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForInfoDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForProductDTO;
import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
-import com.panzhihua.common.model.dtos.community.rentingHouses.*;
+import com.panzhihua.common.model.dtos.community.rentingHouses.NearbyDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHouseRegisterDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHousesConfigDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO;
import com.panzhihua.common.model.dtos.community.reserve.AddReserveAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO;
import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
@@ -331,6 +335,8 @@
import com.panzhihua.common.model.vos.community.bigscreen.PartyBuildingMemberVO;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsConfigVO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsOrderVO;
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
@@ -7968,12 +7974,11 @@
/**
* 删除产品信息
- * @param productId
- * @param userId
+ * @param deleteProductDTO
* @return
*/
- @DeleteMapping("/microcommercialstreet/product/delete")
- R deleteMcsProduct(@RequestParam("productId") Long productId, @RequestParam("userId") Long userId);
+ @PostMapping("/microcommercialstreet/product/delete")
+ R deleteMcsProduct(@RequestBody DeleteProductDTO deleteProductDTO);
/**
* 上架/下架产品信息
@@ -8178,17 +8183,18 @@
/**
* 戳戳卷核销
* @param couponId
+ * @param userId
* @return
*/
@GetMapping("/microcommercialstreet/coupon/verify")
- R verifyMcsCoupon(@RequestParam("couponId") Long couponId);
+ R verifyMcsCoupon(@RequestParam("couponId") Long couponId, @RequestParam("userId") Long userId);
/**
* 分页查询核销记录
* @param pageVerifyRecordDTO
* @return
*/
- @GetMapping("/microcommercialstreet/verifyRecord/page")
+ @PostMapping("/microcommercialstreet/verifyRecord/page")
R pageMcsVerifyRecord(@RequestBody PageVerifyRecordDTO pageVerifyRecordDTO);
/**
@@ -8206,4 +8212,27 @@
*/
@PutMapping("/microcommercialstreet/putUserInfo")
R putUserInfo(@RequestBody PutUserInfoDTO putUserInfoDTO);
+
+ /**
+ * 根据userId获取商家信息
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/retrieveMcsMerchantInfoByUserId")
+ R retrieveMcsMerchantInfoByUserId(@RequestParam("userId") Long userId);
+
+ /**
+ * 定时任务-每隔5分钟执行一次，将已到期的微商业街商家旗下所有的游戏/资讯全部下架
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/offResourceForMcsMerchant")
+ R offResourceForMcsMerchant();
+
+ /**
+ * 获取产品信息详情
+ * @param productId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/product/get")
+ R getMcsProduct(@RequestParam("productId") Long productId);
}
--
Gitblit v1.7.1