From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MicroCommercialStreetApi.java | 16 ++++------------
1 files changed, 4 insertions(+), 12 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 e025457..15c7fbc 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
@@ -307,15 +307,7 @@
*/
@GetMapping("/statistics/top")
public R getTopStatistics(@RequestParam("type") Integer type, @RequestParam("userId") Long userId) {
- if (type.equals(1)) {
- //戳戳游戏
- return mcsGameService.getTopStatistics(userId);
- } else if (type.equals(2)) {
- //戳戳资讯
- return mcsInformationService.getTopStatistics(userId);
- } else {
- return R.fail("未知错误");
- }
+ return mcsGameService.getTopStatistics(userId, type);
}
/**
@@ -421,16 +413,16 @@
/**
* 完成订单更新/新增商家信息
- * @param merchantName
+ * @param orderNo
* @param configId
* @param userId
* @return
*/
@GetMapping("/updateAfterOrder")
- public R updateMcsMerchantAfterOrder(@RequestParam(value = "merchantName", required = false) String merchantName,
+ public R updateMcsMerchantAfterOrder(@RequestParam(value = "orderNo") String orderNo,
@RequestParam("configId") Long configId,
@RequestParam("userId") Long userId) {
- return mcsMerchantService.updateOrAddMcsMerchantAfterOrder(merchantName, configId, userId);
+ return mcsMerchantService.updateOrAddMcsMerchantAfterOrder(orderNo, configId, userId);
}
/**
--
Gitblit v1.7.1