bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单-购物车

This commit is contained in:
gaowdong 2025-04-17 15:00:16 +08:00
parent 0bfaeb6ef5
commit 1d63ce61b3
7 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderShoppingCartQueryParam.java
View File

@ -29,6 +29,8 @@ public class OrderShoppingCartQueryParam
/** 订单类型 */
private Integer orderType;
private Long userId;
/** 菜谱日期 yyyy-MM-dd */
private List<String> menuDateList;
}

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShoppingCartDelParam.java
View File

@ -1,10 +1,11 @@
package com.bonus.canteen.core.order.domain.param;
import com.bonus.common.core.web.domain.BaseEntity;
import lombok.Data;
import java.util.List;
@Data
public class ShoppingCartDelParam {
public class ShoppingCartDelParam extends BaseEntity {
private List<Long> shoppingCartIds;
}

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mapper/OrderShoppingCartMapper.java
View File

@ -1,6 +1,7 @@
package com.bonus.canteen.core.order.mapper;
import com.bonus.canteen.core.order.domain.OrderShoppingCart;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -58,5 +59,5 @@ public interface OrderShoppingCartMapper
* @param shoppingCartIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteOrderShoppingCartByShoppingCartIds(List<Long> shoppingCartIds);
public int deleteOrderShoppingCartByShoppingCartIds(@Param("params") List<Long> shoppingCartIds);
}

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/module/MenuModule.java
View File

@ -1,6 +1,7 @@
package com.bonus.canteen.core.order.module;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import com.bonus.canteen.core.menu.domain.MenuRecipe;
import com.bonus.canteen.core.menu.enums.MenuRecipeSortEnum;
import com.bonus.canteen.core.menu.service.IMenuRecipeService;
@ -23,8 +24,8 @@ public class MenuModule {
public Map<Integer, List<MenuRecipeDishesVO>> getMenuRecipeDish(MenuDishCheckDTO menuDishCheckDTO) {
MenuRecipe menuRecipe = new MenuRecipe();
menuRecipe.setApplyDate(menuDishCheckDTO.getApplyDate());
menuRecipe.setCanteenId(menuDishCheckDTO.getCanteenId());
menuRecipe.setStallId(menuDishCheckDTO.getStallId());
menuRecipe.setCanteenIds(ListUtil.toList(menuDishCheckDTO.getCanteenId().toString()));
menuRecipe.setStallIds(ListUtil.toList(menuDishCheckDTO.getStallId().toString()));
menuRecipe.setKey(menuDishCheckDTO.getApplyType());
Map<Integer, List<MenuRecipeDishesVO>> mealTimeTypeMap = new HashMap<>();
List<MenuRecipeVO> menuRecipeList = menuRecipeService.selectMenuRecipeList(menuRecipe);

11
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderShoppingCartServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.bonus.canteen.core.order.service.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
import cn.hutool.core.collection.CollUtil;
@ -18,6 +19,7 @@ import com.bonus.canteen.core.order.mapper.OrderShoppingCartMapper;
import com.bonus.canteen.core.order.module.MenuModule;
import com.bonus.canteen.core.order.service.IOrderShoppingCartService;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.houqin.utils.id.Id;
import com.bonus.common.security.utils.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -61,7 +63,7 @@ public class OrderShoppingCartServiceImpl implements IOrderShoppingCartService
orderShoppingCartQuery.setCanteenId(orderShoppingCart.getCanteenId());
orderShoppingCartQuery.setStallId(orderShoppingCart.getStallId());
orderShoppingCartQuery.setOrderType(orderShoppingCart.getOrderType());
orderShoppingCartQuery.setUserId(SecurityUtils.getUserId());
orderShoppingCartQuery.setUserId(orderShoppingCart.getUserId());
List<OrderShoppingCart> orderShoppingCartList = orderShoppingCartMapper.selectOrderShoppingCartList(orderShoppingCartQuery);
if (CollUtil.isEmpty(orderShoppingCartList)) {
return new ArrayList<>();
@ -127,9 +129,15 @@ public class OrderShoppingCartServiceImpl implements IOrderShoppingCartService
@Override
public int insertOrderShoppingCart(OrderShoppingCart orderShoppingCart)
{
if(Objects.nonNull(orderShoppingCart.getShoppingCartId())) {
return updateOrderShoppingCart(orderShoppingCart);
}else {
orderShoppingCart.setShoppingCartId(Id.next());
orderShoppingCart.setCreateBy(SecurityUtils.getUsername());
orderShoppingCart.setUpdateBy(SecurityUtils.getUsername());
return orderShoppingCartMapper.insertOrderShoppingCart(orderShoppingCart);
}
}
/**
* 修改订单购物车
@ -140,6 +148,7 @@ public class OrderShoppingCartServiceImpl implements IOrderShoppingCartService
@Override
public int updateOrderShoppingCart(OrderShoppingCart orderShoppingCart)
{
orderShoppingCart.setUpdateTime(DateUtils.getNowDate());
orderShoppingCart.setUpdateTime(DateUtils.getNowDate());
return orderShoppingCartMapper.updateOrderShoppingCart(orderShoppingCart);
}

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/utils/ShoppingCartParamChecker.java
View File

@ -43,7 +43,7 @@ public class ShoppingCartParamChecker {
}
private static void checkShoppingCartId(OrderShoppingCart orderShoppingCart) {
if (orderShoppingCart.getShoppingCartId() == null) {
throw new ServiceException("购车餐品ID为空");
throw new ServiceException("购物车ID为空");
}
}
@ -93,7 +93,7 @@ public class ShoppingCartParamChecker {
if (orderShoppingCart.getDetailType() == null) {
throw new ServiceException("订单明细类别为空");
}
if(OrderDetailTypeEnum.isValidKey(orderShoppingCart.getDetailType())) {
if(!OrderDetailTypeEnum.isValidKey(orderShoppingCart.getDetailType())) {
throw new ServiceException("订单明细类别错误");
}
}
@ -107,7 +107,7 @@ public class ShoppingCartParamChecker {
if (orderType == null) {
throw new ServiceException("订单类型为空");
}
if(OrderTypeEnum.isValidKey(orderType)) {
if(!OrderTypeEnum.isValidKey(orderType)) {
throw new ServiceException("订单类型错误");
}
}

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderShoppingCartMapper.xml
View File

@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<delete id="deleteOrderShoppingCartByShoppingCartIds" parameterType="String">
delete from order_shopping_cart where shopping_cart_id in
<foreach item="shoppingCartId" collection="array" open="(" separator="," close=")">
<foreach item="shoppingCartId" collection="params" open="(" separator="," close=")">
#{shoppingCartId}
</foreach>
</delete>