From ffde8aed4c7e1b0971eab1cdbc441c5e13a324d2 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Fri, 9 May 2025 17:37:46 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/api/teambuyController/OrderController.java | 8 +++++--- .../jeecg/modules/apiService/impl/ShopcarServiceImpl.java | 14 +++++++++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/OrderController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/OrderController.java index e5a04c6..6d2b658 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/OrderController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/OrderController.java @@ -26,20 +26,22 @@ public class OrderController { /******************************************************************************************************************/ //查看团餐订单列表 - @ApiOperation(value="订单-查询团餐订单列表/详情", notes="订单-查询团餐订单列表/详情") + @ApiOperation(value="订单-查询团餐订单列表/详情", notes="status：0-待出餐 1-已出餐 2-待取餐 3-已完成") @RequestMapping(value = "/queryLeaderOrderList", method = {RequestMethod.GET}) public Result queryLeaderOrderList(@RequestHeader("X-Access-Token") String token, TeambuyOrderLeader teambuyOrderLeader, PageBean pageBean){ return orderService.queryLeaderOrderList(token, teambuyOrderLeader, pageBean); } //根据团餐id查询团团员订单列表 - @ApiOperation(value="订单-根据团餐id查询团团员订单列表", notes="订单-根据团餐id查询团团员订单列表") + @ApiOperation(value="订单-根据团餐id查询团团员订单列表", notes="status：0-待支付 1-待出餐 2-送餐中 3-待取餐 4-已完成") @RequestMapping(value = "/queryLeaderOrderListById", method = {RequestMethod.GET}) public Result queryLeaderOrderListById(@RequestHeader("X-Access-Token") String token, String teambuyOrderLeaderId, PageBean pageBean){ return orderService.queryLeaderOrderListById(token, teambuyOrderLeaderId, pageBean); } //查看团员订单列表 - @ApiOperation(value="订单-查看团员订单列表/详情", notes="订单-查看团员订单列表/详情") + @ApiOperation(value="订单-查看团员订单列表/详情", notes="status：0-待支付 1-待出餐 2-送餐中 3-待取餐 4-已完成") + + @RequestMapping(value = "/queryMemberOrderList", method = {RequestMethod.GET}) public Result queryMemberOrderList(@RequestHeader("X-Access-Token") String token, TeambuyOrderMember teambuyOrderMember, PageBean pageBean){ return orderService.queryMemberOrderList(token, teambuyOrderMember, pageBean); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopcarServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopcarServiceImpl.java index da0594e..47d4ff6 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopcarServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopcarServiceImpl.java @@ -91,11 +91,23 @@ public class ShopcarServiceImpl implements ShopcarService { public Result addShopcar(String token, TeambuyBuycar teambuyBuycar) { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250"); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426"); //返回信息 String massege = ""; try{ + //判断该用户添加的商品是否存在，存在则进行数量增加 + TeambuyBuycar buycar = teambuyBuycarService + .lambdaQuery() + .eq(TeambuyBuycar::getUserId, hanHaiMember.getId()) + .eq(TeambuyBuycar::getGoodsId, teambuyBuycar.getGoodsId()) + .one(); + if(null != buycar){ + int num = buycar.getNum() + teambuyBuycar.getNum(); + teambuyBuycar.setNum(num); + teambuyBuycar.setId(buycar.getId()); + } + //执行新增操作(不传id进行新增，传了id则进行修改) teambuyBuycar.setUserId(hanHaiMember.getId()); boolean result = teambuyBuycarService.saveOrUpdate(teambuyBuycar);