From f0da95925bcb8ad19b0d1cc78afe4b4a4ae188a6 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期四, 28 八月 2025 09:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/web-manage/web-manage-back
---
src/main/java/com/webmanage/controller/CartController.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/webmanage/controller/CartController.java b/src/main/java/com/webmanage/controller/CartController.java
index 1452cfc..350e3a7 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,8 +52,8 @@
@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 Long pricingId) {
try {
boolean result = cartService.removeFromCart(userId, unitId, pricingId);
@@ -70,8 +70,8 @@
@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 Long pricingId,
@RequestParam @NotNull @Min(1) Integer quantity) {
try {
@@ -89,8 +89,8 @@
@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) {
try {
boolean result = cartService.clearCart(userId, unitId);
if (result) {
@@ -106,8 +106,8 @@
@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) {
try {
CartVO cart = cartService.getCart(userId, unitId);
return Result.success(cart);
@@ -119,8 +119,8 @@
@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) {
try {
List<CartItemVO> items = cartService.getCartItems(userId, unitId);
return Result.success(items);
@@ -132,8 +132,8 @@
@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,
@RequestBody List<Long> pricingIds) {
try {
boolean result = cartService.batchRemoveFromCart(userId, unitId, pricingIds);
@@ -150,8 +150,8 @@
@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) {
try {
Integer count = cartService.getCartItemCount(userId, unitId);
return Result.success(count);
@@ -163,8 +163,8 @@
@PostMapping("/sync-to-db")
@ApiOperation("鍚屾Redis璐墿杞︽暟鎹埌鏁版嵁搴�")
- public Result<Object> syncCartToDatabase(@RequestParam @NotNull Long userId,
- @RequestParam @NotNull Long unitId) {
+ public Result<Object> syncCartToDatabase(@RequestParam @NotNull String userId,
+ @RequestParam @NotNull String unitId) {
try {
boolean result = cartService.syncCartToDatabase(userId, unitId);
if (result) {
@@ -180,8 +180,8 @@
@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) {
try {
boolean result = cartService.loadCartFromDatabase(userId, unitId);
if (result) {
@@ -197,8 +197,8 @@
@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) {
try {
boolean isConsistent = cartService.checkCartConsistency(userId, unitId);
if (isConsistent) {
--
Gitblit v1.8.0