From ac918503bb5e8fad007348e7e39ba7275b75f334 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期一, 08 九月 2025 23:33:32 +0800
Subject: [PATCH] 修改取消订单，修改状态为已取消
---
src/main/java/com/webmanage/controller/CartController.java | 114 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 72 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/webmanage/controller/CartController.java b/src/main/java/com/webmanage/controller/CartController.java
index 1452cfc..666983d 100644
--- a/src/main/java/com/webmanage/controller/CartController.java
+++ b/src/main/java/com/webmanage/controller/CartController.java
@@ -35,8 +35,8 @@
@PostMapping("/add")
@ApiOperation("娣诲姞鍟嗗搧鍒拌喘鐗╄溅")
public Result<Object> addToCart(@Valid @RequestBody CartItemDTO cartItemDTO,
- @RequestParam @NotNull Long userId,
- @RequestParam @NotNull Long unitId) {
+ @RequestParam @NotNull String userId,
+ @RequestParam String unitId) {
try {
boolean result = cartService.addToCart(userId, unitId, cartItemDTO);
if (result) {
@@ -52,11 +52,12 @@
@DeleteMapping("/remove")
@ApiOperation("浠庤喘鐗╄溅绉婚櫎鍟嗗搧")
- public Result<Object> removeFromCart(@RequestParam @NotNull Long userId,
- @RequestParam @NotNull Long unitId,
+ public Result<Object> removeFromCart(@RequestParam @NotNull String userId,
+ @RequestParam String unitId,
+ @RequestParam @NotNull String productId,
@RequestParam @NotNull Long pricingId) {
try {
- boolean result = cartService.removeFromCart(userId, unitId, pricingId);
+ boolean result = cartService.removeFromCart(userId, unitId, productId, pricingId);
if (result) {
return Result.success("浠庤喘鐗╄溅绉婚櫎鍟嗗搧鎴愬姛");
} else {
@@ -70,12 +71,34 @@
@PutMapping("/update")
@ApiOperation("鏇存柊璐墿杞﹀晢鍝佹暟閲�")
- public Result<Object> updateCartItemQuantity(@RequestParam @NotNull Long userId,
- @RequestParam @NotNull Long unitId,
+ public Result<Object> updateCartItemQuantity(@RequestParam @NotNull String userId,
+ @RequestParam String unitId,
+ @RequestParam @NotNull String productId,
@RequestParam @NotNull Long pricingId,
@RequestParam @NotNull @Min(1) Integer quantity) {
try {
- boolean result = cartService.updateCartItemQuantity(userId, unitId, pricingId, quantity);
+ boolean result = cartService.updateCartItemQuantity(userId, unitId, productId, pricingId, quantity);
+ if (result) {
+ return Result.success("鏇存柊璐墿杞﹀晢鍝佹暟閲忔垚鍔�");
+ } else {
+ return Result.error("鏇存柊璐墿杞﹀晢鍝佹暟閲忓け璐�");
+ }
+ } catch (Exception e) {
+ log.error("鏇存柊璐墿杞﹀晢鍝佹暟閲忓け璐�", e);
+ return Result.error("鏇存柊璐墿杞﹀晢鍝佹暟閲忓け璐ワ細" + e.getMessage());
+ }
+ }
+
+
+ @PutMapping("/update/duration")
+ @ApiOperation("鏇存柊璐墿杞﹀晢鍝佹暟閲�")
+ public Result<Object> updateCartItemDuration(@RequestParam @NotNull String userId,
+ @RequestParam String unitId,
+ @RequestParam @NotNull String productId,
+ @RequestParam @NotNull Long pricingId,
+ @RequestParam @NotNull @Min(1) Integer duration) {
+ try {
+ boolean result = cartService.updateCartItemDuration(userId, unitId, productId, pricingId, duration);
if (result) {
return Result.success("鏇存柊璐墿杞﹀晢鍝佹暟閲忔垚鍔�");
} else {
@@ -89,10 +112,11 @@
@DeleteMapping("/clear")
@ApiOperation("娓呯┖璐墿杞�")
- public Result<Object> clearCart(@RequestParam @NotNull Long userId,
- @RequestParam @NotNull Long unitId) {
+ public Result<Object> clearCart(@RequestParam @NotNull String userId,
+ @RequestParam String unitId,
+ @RequestParam @NotNull String productId) {
try {
- boolean result = cartService.clearCart(userId, unitId);
+ boolean result = cartService.clearCart(userId, unitId, productId);
if (result) {
return Result.success("娓呯┖璐墿杞︽垚鍔�");
} else {
@@ -106,10 +130,11 @@
@GetMapping("/info")
@ApiOperation("鑾峰彇璐墿杞︿俊鎭�")
- public Result<Object> getCart(@RequestParam @NotNull Long userId,
- @RequestParam @NotNull Long unitId) {
+ public Result<Object> getCart(@RequestParam @NotNull String userId,
+ @RequestParam String unitId,
+ @RequestParam @NotNull String productId ) {
try {
- CartVO cart = cartService.getCart(userId, unitId);
+ CartVO cart = cartService.getCart(userId, unitId, productId);
return Result.success(cart);
} catch (Exception e) {
log.error("鑾峰彇璐墿杞︿俊鎭け璐�", e);
@@ -119,10 +144,11 @@
@GetMapping("/items")
@ApiOperation("鑾峰彇璐墿杞﹀晢鍝佸垪琛�")
- public Result<Object> getCartItems(@RequestParam @NotNull Long userId,
- @RequestParam @NotNull Long unitId) {
+ public Result<Object> getCartItems(@RequestParam @NotNull String userId,
+ @RequestParam String unitId,
+ @RequestParam @NotNull String productId) {
try {
- List<CartItemVO> items = cartService.getCartItems(userId, unitId);
+ List<CartItemVO> items = cartService.getCartItems(userId, unitId, productId);
return Result.success(items);
} catch (Exception e) {
log.error("鑾峰彇璐墿杞﹀晢鍝佸垪琛ㄥけ璐�", e);
@@ -132,11 +158,12 @@
@DeleteMapping("/batch-remove")
@ApiOperation("鎵归噺鍒犻櫎璐墿杞﹀晢鍝�")
- public Result<Object> batchRemoveFromCart(@RequestParam @NotNull Long userId,
- @RequestParam @NotNull Long unitId,
+ public Result<Object> batchRemoveFromCart(@RequestParam @NotNull String userId,
+ @RequestParam String unitId,
+ @RequestParam @NotNull String productId,
@RequestBody List<Long> pricingIds) {
try {
- boolean result = cartService.batchRemoveFromCart(userId, unitId, pricingIds);
+ boolean result = cartService.batchRemoveFromCart(userId, unitId, productId, pricingIds);
if (result) {
return Result.success("鎵归噺鍒犻櫎璐墿杞﹀晢鍝佹垚鍔�");
} else {
@@ -150,10 +177,11 @@
@GetMapping("/count")
@ApiOperation("鑾峰彇璐墿杞﹀晢鍝佹暟閲�")
- public Result<Object> getCartItemCount(@RequestParam @NotNull Long userId,
- @RequestParam @NotNull Long unitId) {
+ public Result<Object> getCartItemCount(@RequestParam @NotNull String userId,
+ @RequestParam String unitId,
+ @RequestParam @NotNull String productId ) {
try {
- Integer count = cartService.getCartItemCount(userId, unitId);
+ Integer count = cartService.getCartItemCount(userId, unitId, productId);
return Result.success(count);
} catch (Exception e) {
log.error("鑾峰彇璐墿杞﹀晢鍝佹暟閲忓け璐�", e);
@@ -163,27 +191,28 @@
@PostMapping("/sync-to-db")
@ApiOperation("鍚屾Redis璐墿杞︽暟鎹埌鏁版嵁搴�")
- public Result<Object> syncCartToDatabase(@RequestParam @NotNull Long userId,
- @RequestParam @NotNull Long unitId) {
- try {
- boolean result = cartService.syncCartToDatabase(userId, unitId);
- if (result) {
- return Result.success("鍚屾璐墿杞︽暟鎹埌鏁版嵁搴撴垚鍔�");
- } else {
- return Result.error("鍚屾璐墿杞︽暟鎹埌鏁版嵁搴撳け璐�");
+ public Result<Object> syncCartToDatabase(@RequestParam @NotNull String userId,
+ @RequestParam @NotNull String unitId,
+ @RequestParam @NotNull String productId ) {
+ try {
+ boolean result = cartService.syncCartToDatabase(userId, unitId, productId);
+ if (result) {
+ return Result.success("鍚屾璐墿杞︽暟鎹埌鏁版嵁搴撴垚鍔�");
+ } else {
+ return Result.error("鍚屾璐墿杞︽暟鎹埌鏁版嵁搴撳け璐�");
+ }
+ } catch (Exception e) {
+ log.error("鍚屾璐墿杞︽暟鎹埌鏁版嵁搴撳け璐�", e);
+ return Result.error("鍚屾璐墿杞︽暟鎹埌鏁版嵁搴撳け璐ワ細" + e.getMessage());
}
- } catch (Exception e) {
- log.error("鍚屾璐墿杞︽暟鎹埌鏁版嵁搴撳け璐�", e);
- return Result.error("鍚屾璐墿杞︽暟鎹埌鏁版嵁搴撳け璐ワ細" + e.getMessage());
- }
}
-
@PostMapping("/load-from-db")
@ApiOperation("浠庢暟鎹簱鍔犺浇璐墿杞︽暟鎹埌Redis")
- public Result<Object> loadCartFromDatabase(@RequestParam @NotNull Long userId,
- @RequestParam @NotNull Long unitId) {
+ public Result<Object> loadCartFromDatabase(@RequestParam @NotNull String userId,
+ @RequestParam @NotNull String unitId,
+ @RequestParam @NotNull String productId ) {
try {
- boolean result = cartService.loadCartFromDatabase(userId, unitId);
+ boolean result = cartService.loadCartFromDatabase(userId, unitId,productId);
if (result) {
return Result.success("浠庢暟鎹簱鍔犺浇璐墿杞︽暟鎹垚鍔�");
} else {
@@ -197,10 +226,11 @@
@GetMapping("/consistency")
@ApiOperation("妫�鏌ヨ喘鐗╄溅鏁版嵁涓�鑷存��")
- public Result<Object> checkCartConsistency(@RequestParam @NotNull Long userId,
- @RequestParam @NotNull Long unitId) {
+ public Result<Object> checkCartConsistency(@RequestParam @NotNull String userId,
+ @RequestParam @NotNull String unitId,
+ @RequestParam @NotNull String productId) {
try {
- boolean isConsistent = cartService.checkCartConsistency(userId, unitId);
+ boolean isConsistent = cartService.checkCartConsistency(userId, unitId, productId);
if (isConsistent) {
return Result.success("璐墿杞︽暟鎹竴鑷�");
} else {
--
Gitblit v1.8.0