From 1690d4d06b0c20b3606e50e0844ef67e07947a0d Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 14:05:59 +0800
Subject: [PATCH] 1.
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 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 b7ffd3c..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();
@@ -413,6 +428,7 @@
confirmOrderVo.setResidualPoint(appUser.getLavePoint().intValue());
//获取默认收货地址
UserAddress userAddress = userAddressClient.getDefaultUserAddress(userid).getData();
+ userAddress.setIdStr(userAddress.getId().toString());
confirmOrderVo.setUserAddress(userAddress);
confirmOrderVo.setPaymentType(confirmOrder.getPaymentType());
//获取用户优惠券，用户全部优惠券，不能使用的需要标识出来置灰展示
@@ -571,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();
@@ -1055,7 +1056,7 @@
this.removeBatchByIds(ids);
}
}
- return R.ok();
+ return R.ok(order.getId().toString());
}
--
Gitblit v1.7.1