Bläddra i källkod

app端,删除对账,接口参数调整

xucaiqin 2 år sedan
förälder
incheckning
372b95d7d3

+ 3 - 2
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/app/AppKwpLedgerLogisticsController.java

@@ -4,6 +4,7 @@ import com.sckw.core.model.vo.TableTop;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.payment.model.constant.LedgerEnum;
 import com.sckw.payment.model.constant.LedgerEnum;
 import com.sckw.payment.model.constant.LogisticsUnitType;
 import com.sckw.payment.model.constant.LogisticsUnitType;
+import com.sckw.payment.model.dto.Id;
 import com.sckw.payment.model.vo.req.*;
 import com.sckw.payment.model.vo.req.*;
 import com.sckw.payment.service.KwpLedgerLogisticsService;
 import com.sckw.payment.service.KwpLedgerLogisticsService;
 import jakarta.annotation.Resource;
 import jakarta.annotation.Resource;
@@ -189,8 +190,8 @@ public class AppKwpLedgerLogisticsController {
      * @return
      * @return
      */
      */
     @DeleteMapping("delete")
     @DeleteMapping("delete")
-    public HttpResult delete(@RequestParam("id") @NotBlank(message = "物流对账单id不能为空") String id) {
-        return HttpResult.ok(kwpLedgerLogisticsService.remove(Long.valueOf(id)));
+    public HttpResult delete(@RequestBody @Valid Id id) {
+        return HttpResult.ok(kwpLedgerLogisticsService.remove(id.getIdLong()));
     }
     }
 
 
     /**
     /**

+ 8 - 5
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/app/AppKwpLedgerTradeController.java

@@ -2,6 +2,7 @@ package com.sckw.payment.controller.app;
 
 
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.payment.model.constant.TradeUnitType;
 import com.sckw.payment.model.constant.TradeUnitType;
+import com.sckw.payment.model.dto.Id;
 import com.sckw.payment.model.vo.req.*;
 import com.sckw.payment.model.vo.req.*;
 import com.sckw.payment.service.KwpLedgerTradeService;
 import com.sckw.payment.service.KwpLedgerTradeService;
 import jakarta.annotation.Resource;
 import jakarta.annotation.Resource;
@@ -89,6 +90,7 @@ public class AppKwpLedgerTradeController {
     public HttpResult purchaseList(@RequestBody @Valid TradeReq tradeReq) {
     public HttpResult purchaseList(@RequestBody @Valid TradeReq tradeReq) {
         return HttpResult.ok(kwpLedgerTradeService.purchaseList(tradeReq));
         return HttpResult.ok(kwpLedgerTradeService.purchaseList(tradeReq));
     }
     }
+
     /**
     /**
      * 贸易对账单统计 采购方
      * 贸易对账单统计 采购方
      *
      *
@@ -99,6 +101,7 @@ public class AppKwpLedgerTradeController {
     public HttpResult purchaseSum(@RequestBody @Valid TradeReq tradeReq) {
     public HttpResult purchaseSum(@RequestBody @Valid TradeReq tradeReq) {
         return HttpResult.ok(kwpLedgerTradeService.purchaseSum(tradeReq));
         return HttpResult.ok(kwpLedgerTradeService.purchaseSum(tradeReq));
     }
     }
+
     /**
     /**
      * 对账单关联订单
      * 对账单关联订单
      *
      *
@@ -117,7 +120,7 @@ public class AppKwpLedgerTradeController {
      * @return
      * @return
      */
      */
     @GetMapping("querySellDetail")
     @GetMapping("querySellDetail")
-    public HttpResult querySellDetail(@NotBlank(message = "id不能为空")@RequestParam("id") String id) {
+    public HttpResult querySellDetail(@NotBlank(message = "id不能为空") @RequestParam("id") String id) {
         return HttpResult.ok(kwpLedgerTradeService.queryDetail(Long.valueOf(id), TradeUnitType.PURCHASE));
         return HttpResult.ok(kwpLedgerTradeService.queryDetail(Long.valueOf(id), TradeUnitType.PURCHASE));
     }
     }
 
 
@@ -128,7 +131,7 @@ public class AppKwpLedgerTradeController {
      * @return
      * @return
      */
      */
     @GetMapping("queryPurchaseDetail")
     @GetMapping("queryPurchaseDetail")
-    public HttpResult queryPurchaseDetail(@NotBlank(message = "id不能为空")@RequestParam("id") String id) {
+    public HttpResult queryPurchaseDetail(@NotBlank(message = "id不能为空") @RequestParam("id") String id) {
         return HttpResult.ok(kwpLedgerTradeService.queryDetail(Long.valueOf(id), TradeUnitType.SELL));
         return HttpResult.ok(kwpLedgerTradeService.queryDetail(Long.valueOf(id), TradeUnitType.SELL));
     }
     }
 
 
@@ -139,7 +142,7 @@ public class AppKwpLedgerTradeController {
      * @return
      * @return
      */
      */
     @GetMapping("queryUpdate")
     @GetMapping("queryUpdate")
-    public HttpResult queryUpdate(@NotBlank(message = "id不能为空")@RequestParam("id") String id) {
+    public HttpResult queryUpdate(@NotBlank(message = "id不能为空") @RequestParam("id") String id) {
         return HttpResult.ok(kwpLedgerTradeService.queryUpdate(Long.valueOf(id)));
         return HttpResult.ok(kwpLedgerTradeService.queryUpdate(Long.valueOf(id)));
     }
     }
 
 
@@ -151,8 +154,8 @@ public class AppKwpLedgerTradeController {
      * @return
      * @return
      */
      */
     @DeleteMapping("delete")
     @DeleteMapping("delete")
-    public HttpResult delete(@NotBlank(message = "id不能为空") String id) {
-        return HttpResult.ok(kwpLedgerTradeService.remove(Long.valueOf(id)));
+    public HttpResult delete(@RequestBody @Valid Id id) {
+        return HttpResult.ok(kwpLedgerTradeService.remove(id.getIdLong()));
     }
     }
 
 
     /**
     /**