From 469253559edbf8039045262a82ced133954d0f42 Mon Sep 17 00:00:00 2001 From: myh Date: Sat, 11 Nov 2023 20:19:04 +0800 Subject: [PATCH] =?UTF-8?q?bug=20fix:=20Ambiguous=20mapping.=20Cannot=20ma?= =?UTF-8?q?p=20=E2=80=98***=E2=80=99=20method?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MerchantsController.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/example/springdemo/controller/MerchantsController.java b/src/main/java/com/example/springdemo/controller/MerchantsController.java index 91d56ec..463763e 100644 --- a/src/main/java/com/example/springdemo/controller/MerchantsController.java +++ b/src/main/java/com/example/springdemo/controller/MerchantsController.java @@ -1,12 +1,11 @@ package com.example.springdemo.controller; import com.example.springdemo.entities.Merchants; +import com.example.springdemo.entities.password.MerchantsPassword; import com.example.springdemo.service.MerchantsService; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; -import java.util.Optional; - @RestController @RequestMapping("/merchants") public class MerchantsController { @@ -14,16 +13,17 @@ public class MerchantsController { private MerchantsService merchantsService; @PostMapping("/add") - public Merchants addMerchants(@RequestBody Merchants merchants) { - return merchantsService.addMerchants(merchants); + public Merchants addMerchants(@RequestBody Merchants merchants, + @RequestBody MerchantsPassword merchantsPassword) { + return merchantsService.addMerchants(merchants, merchantsPassword); } @DeleteMapping("/delete/{id}") - public void deleteMerchants(@PathVariable("id") Long id) { - merchantsService.deleteMerchantsById(id); + public void deleteMerchants(@PathVariable("id") Long merchantID) { + merchantsService.deleteMerchantsById(merchantID); } - @PutMapping("/update") + @PutMapping("/update/info") public Merchants updateMerchants(@RequestBody Merchants merchants) { return merchantsService.updateMerchants(merchants); } @@ -39,7 +39,12 @@ public class MerchantsController { } @GetMapping("/find/{id}") - public Merchants getMerchantsById(@PathVariable("id") Long id) { - return merchantsService.findById(id); + public Merchants getMerchantsById(@PathVariable("id") Long merchantID) { + return merchantsService.findById(merchantID); + } + + @PutMapping("/update/password") + public void updatePassword(@RequestParam String password, @RequestParam Long merchantID) { + merchantsService.updatePassword(password, merchantID); } }