From 3a0970a72e270e60547a9c6ab2d95a7ae8b57325 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 10:42:12 +0800
Subject: [PATCH] 优化购物接口
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 30 +++++++++++++++---------------
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java | 2 ++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java | 2 --
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index 0665cec..a45cea5 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -368,7 +368,22 @@
*/
@Override
public ConfirmOrderVo confirmOrder(ConfirmOrder confirmOrder) {
+ Integer position = confirmOrder.getPosition();
Long userid = tokenService.getLoginUserApplet().getUserid();
+ //直接购买商品
+ if(2 == position){
+ //先加入购物车
+ String goodsJson = confirmOrder.getGoodsJson();
+ JSONArray objects = JSON.parseArray(goodsJson);
+ Long id = objects.getJSONObject(0).getLong("id");
+ Integer num1 = objects.getJSONObject(0).getInteger("num");
+ ShoppingCart shoppingCart = new ShoppingCart();
+ shoppingCart.setAppUserId(userid);
+ shoppingCart.setGoodsId(id.intValue());
+ shoppingCart.setNumber(num1);
+ Long shoppingCarId = addGoods(shoppingCart);
+ confirmOrder.setGoodsJson("[{\"id\": " + shoppingCarId + ", \"num\": " + num1 + "}]");
+ }
AppUser appUser = appUserClient.getAppUserById(userid);
Integer shopId = confirmOrder.getShopId();
Shop shop = shopClient.getShopById(shopId).getData();
@@ -572,22 +587,7 @@
*/
@Override
public R shoppingCartPayment(ShoppingCartPayment shoppingCartPayment) {
- Integer position = shoppingCartPayment.getPosition();
Long userid = tokenService.getLoginUserApplet().getUserid();
- //直接购买商品
- if(2 == position){
- //先加入购物车
- String goodsJson = shoppingCartPayment.getGoodsJson();
- JSONArray objects = JSON.parseArray(goodsJson);
- Long id = objects.getJSONObject(0).getLong("id");
- Integer num1 = objects.getJSONObject(0).getInteger("num");
- ShoppingCart shoppingCart = new ShoppingCart();
- shoppingCart.setAppUserId(userid);
- shoppingCart.setGoodsId(id.intValue());
- shoppingCart.setNumber(num1);
- Long shoppingCarId = addGoods(shoppingCart);
- shoppingCartPayment.setGoodsJson("[{\"id\": " + shoppingCarId + ", \"num\": " + num1 + "}]");
- }
AppUser appUser = appUserClient.getAppUserById(userid);
Integer shopId = shoppingCartPayment.getShopId();
String goodsJson = shoppingCartPayment.getGoodsJson();
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java
index b68c2f0..4983fe5 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java
@@ -11,6 +11,8 @@
@Data
@ApiModel
public class ConfirmOrder {
+ @ApiModelProperty(value = "购买方式（1=购物车，2=商品详情）", required = true)
+ private Integer position;
@ApiModelProperty(value = "购物车数据id,数量 JSON[{id:1212,num:2}]", required = true)
private String goodsJson;
@ApiModelProperty(value = "支付方式（1=现金，2=积分）", required = true)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java
index 55ecb37..056104b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java
@@ -11,8 +11,6 @@
@Data
@ApiModel
public class ShoppingCartPayment {
- @ApiModelProperty(value = "购买方式（1=购物车，2=商品详情）", required = true)
- private Integer position;
@ApiModelProperty(value = "购物车数据id,数量 JSON[{id:1212,num:2}]", required = true)
private String goodsJson;
@ApiModelProperty(value = "支付方式（1=微信，2=账户余额，3=积分）", required = true)
--
Gitblit v1.7.1