From f62b8d5fc74db2391c7769e024e65c2bb51ac6bc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 11 四月 2025 11:51:12 +0800
Subject: [PATCH] 修改反馈bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
index da51645..4b16e40 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
@@ -1,6 +1,7 @@
package com.ruoyi.order.controller;
import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
@@ -42,11 +43,7 @@
@Resource
private TokenService tokenService;
-
- @Resource
- private GoodsShopClient goodsShopClient;
- @Resource
- private ShopClient shopClient;
+
@Resource
private AppUserClient appUserClient;
@@ -55,13 +52,13 @@
@ResponseBody
- @GetMapping("/getMyShoppingCart/{type}/{shopId}")
+ @GetMapping("/getMyShoppingCart")
@ApiOperation(value = "获取购物车列表", tags = {"商城-购物车-小程序"})
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "商品类型（1=服务商品，2=单品商品）", required = true, dataType = "int"),
@ApiImplicitParam(name = "shopId", value = "核销门店id", required = true, dataType = "int")
})
- public TableDataInfo<MyShoppingCartVo> getMyShoppingCart(@PathVariable("type") Integer type, @PathVariable("shopId") Integer shopId){
+ public TableDataInfo<MyShoppingCartVo> getMyShoppingCart(Integer type, Integer shopId){
startPage();
return getDataTable(shoppingCartService.getMyShoppingCart(type, shopId));
}
@@ -122,6 +119,9 @@
@ResponseBody
@GetMapping("/shoppingCartPaymentCallback")
public void shoppingCartPaymentCallback(UniPayCallbackResult uniPayCallbackResult, HttpServletResponse response){
+ String jsonString = JSONObject.toJSONString(uniPayCallbackResult);
+ System.out.println("1111111111111111111111");
+ System.out.println(jsonString);
R callback = shoppingCartService.shoppingCartPaymentCallback(uniPayCallbackResult);
if(callback.getCode() == 200){
response.setStatus(200);
@@ -169,7 +169,7 @@
@GetMapping("/getGoodsPrice")
public R<Price> getGoodsPrice(Long appUserId, Integer goodsId, Integer shopId){
AppUser appUser = appUserClient.getAppUserById(appUserId);
- Price price = shoppingCartService.getPrice(appUser, goodsId, shopId);
+ Price price = shoppingCartService.getPrice(appUser, goodsId, 1, shopId);
return R.ok(price);
}
--
Gitblit v1.7.1