From b4318e61d4f091f13e23caeb00aef46fa718b1e0 Mon Sep 17 00:00:00 2001
From: Aug <17674666882@163.com>
Date: Tue, 5 Nov 2024 16:05:58 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=EF=BC=8C=E5=90=8C=E6=97=B6=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E7=89=A9=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiService/impl/IndexApiServiceImpl.java       | 41 ++++++----------------
 1 file changed, 10 insertions(+), 31 deletions(-)

diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java
index ee58cf0..0bfbae0 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java
@@ -1324,43 +1324,22 @@ public class IndexApiServiceImpl implements IndexApiService {
 
         boolean flag = travelWaresOrderService.save(travelWaresOrder);
         if(flag){
+            //订单创建成功，则删除购物车相关物品
+            TravelShopcar shopcar = travelShopcarService
+                    .lambdaQuery()
+                    .eq(TravelShopcar::getWaresId, travelWaresOrder.getWaresId())
+                    .eq(TravelShopcar::getUserId, hanHaiMember.getId())
+                    .one();
+            if(null != shopcar){
+                travelShopcarService.removeById(shopcar.getId());
+            }
+
             return Result.OK("创建文创好物订单成功！");
         }else {
             return Result.OK("创建文创好物订单失败！");
         }
     }
 
-//    //获取购物车列表
-//    @Override
-//    public Result<?> queryShopcarList(String token, PageBean pageBean) {
-//        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-//
-//        Page<TravelShopcar> page = new Page<TravelShopcar>(pageBean.getPageNo(), pageBean.getPageSize());
-//        List<TravelShopcar> list;
-//
-//        list = travelShopcarService
-//                .lambdaQuery()
-//                .eq(TravelShopcar::getUserId, hanHaiMember.getId())
-//                .orderByDesc(TravelShopcar::getCreateTime)
-//                .list();
-//
-//        String waresId;
-//        List<TravelWares> waresList = new ArrayList<>();
-//        for (TravelShopcar travelShopcar : list) {
-//            waresId = travelShopcar.getWaresId();
-//            TravelWares wares = travelWaresService
-//                    .lambdaQuery()
-//                    .eq(TravelWares::getId, waresId)
-//                    .one();
-//            if(null != wares){
-//                waresList.add(wares);
-//            }
-//        }
-//
-//        return Result.OK("购物车列表", waresList);
-//    }
-
-
     //获取购物车列表
     @Override
     public Result<?> queryShopcarList(String token, PageBean pageBean) {