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/service_community/src/main/java/com/panzhihua/service_community/api/MicroCommercialStreetApi.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MicroCommercialStreetApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MicroCommercialStreetApi.java
index e092b7a..8aad276 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MicroCommercialStreetApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MicroCommercialStreetApi.java
@@ -4,6 +4,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.DeleteProductDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.PutUserInfoDTO;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -370,13 +371,12 @@
/**
* 删除产品信息
- * @param productId
- * @param userId
+ * @param deleteProductDTO
* @return
*/
- @DeleteMapping("/product/delete")
- public R deleteMcsProduct(@RequestParam("productId") Long productId, @RequestParam("userId") Long userId) {
- return mcsProductService.deleteMcsProduct(productId, userId);
+ @PostMapping("/product/delete")
+ public R deleteMcsProduct(@RequestBody DeleteProductDTO deleteProductDTO) {
+ return mcsProductService.deleteMcsProduct(deleteProductDTO);
}
/**
@@ -547,11 +547,12 @@
/**
* 戳戳卷核销
* @param couponId
+ * @param userId
* @return
*/
@GetMapping("/coupon/verify")
- public R verifyMcsCoupon(@RequestParam("couponId") Long couponId) {
- return mcsCouponService.verifyMcsCoupon(couponId);
+ public R verifyMcsCoupon(@RequestParam("couponId") Long couponId, @RequestParam("userId") Long userId) {
+ return mcsCouponService.verifyMcsCoupon(couponId, userId);
}
/**
@@ -559,7 +560,7 @@
* @param pageVerifyRecordDTO
* @return
*/
- @GetMapping("/verifyRecord/page")
+ @PostMapping("/verifyRecord/page")
public R pageMcsVerifyRecord(@RequestBody PageVerifyRecordDTO pageVerifyRecordDTO) {
return mcsVerifiedRecordService.pageMcsVerifyRecord(pageVerifyRecordDTO);
}
@@ -583,4 +584,33 @@
public R putUserInfo(@RequestBody PutUserInfoDTO putUserInfoDTO) {
return mcsMerchantService.putUserInfo(putUserInfoDTO);
}
+
+ /**
+ * 根据userId获取商家信息
+ * @param userId
+ * @return
+ */
+ @GetMapping("/retrieveMcsMerchantInfoByUserId")
+ public R retrieveMcsMerchantInfoByUserId(@RequestParam("userId") Long userId) {
+ return mcsMerchantService.retrieveMcsMerchantInfoByUserId(userId);
+ }
+
+ /**
+ * 定时任务-每隔5分钟执行一次，将已到期的微商业街商家旗下所有的游戏/资讯全部下架
+ * @return
+ */
+ @GetMapping("/offResourceForMcsMerchant")
+ public R offResourceForMcsMerchant() {
+ return mcsMerchantService.offResourceForMcsMerchant();
+ }
+
+ /**
+ * 获取产品信息详情
+ * @param productId
+ * @return
+ */
+ @GetMapping("/product/get")
+ public R getMcsProduct(@RequestParam("productId") Long productId) {
+ return mcsProductService.getMcsProduct(productId);
+ }
}
--
Gitblit v1.7.1