接口调整

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/admin/SysMerchantController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -65,8 +66,8 @@ public class SysMerchantController {
      * @param id 主键ID
      * @return 商户管理-详情查询
      */
-    @GetMapping("/{id}")
-    public R getMerchantDetail(@PathVariable("id") Integer id) {
+    @GetMapping("/merchantDetail")
+    public R getMerchantDetail(@RequestParam("id") Integer id) {
         return R.ok(kxsMerchantService.getMerchantDetail(id));
     }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/admin/SysShopGoodsController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -94,8 +95,8 @@ public class SysShopGoodsController {
      * @param id 主键ID
      * @return 商城管理-商品详情
      */
-    @GetMapping("/{id}")
-    public R shopGoodsDetail(@PathVariable("id") Integer id) {
+    @GetMapping("/shopGoodsDetail")
+    public R shopGoodsDetail(@RequestParam("id") Integer id) {
         return R.ok(kxsShopGoodsService.getByGoodsDetail(id));
     }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/admin/SysShopOrderController.java

@@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -49,8 +50,8 @@ public class SysShopOrderController {
      * @param id 主键ID
      * @return 商城订单-详情
      */
-    @GetMapping("/{orderDetail}")
-    public R orderDetail(@PathVariable("orderDetail") Integer id) {
+    @GetMapping("/orderDetail")
+    public R orderDetail(@RequestParam("orderDetail") Integer id) {
         return R.ok(kxsShopOrderService.getOrderDetailById(id));
     }
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/controller/admin/SysMachineApplyController.java

@@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -49,8 +50,8 @@ public class SysMachineApplyController {
      * @param id 主键ID
      * @return 商城管理-创客机具申请订单详情
      */
-    @GetMapping("/{applyId}")
-    public R applyDetail(@PathVariable("applyId") String id) {
+    @GetMapping("/applyDetail")
+    public R applyDetail(@RequestParam String id) {
         return R.ok(kxsMachineApplyService.applyDetail(id));
     }