From 3f9f58ae1ff13b16a75a9b4f04e9353d9bca46e5 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Mon, 16 Jun 2025 18:42:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=99=90=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ICookRecipeDishesService.java | 6 ++++- .../impl/CookRecipeDishesServiceImpl.java | 24 ++++++++++++++++-- .../core/order/business/OrderBusiness.java | 25 ++++++++++++++++--- .../core/order/domain/OrderDetail.java | 7 +++++- .../canteen/core/order/domain/OrderInfo.java | 13 +++++++--- .../domain/param/DeviceOrderInfoAddParam.java | 3 ++- .../order/domain/param/OrderInfoAddParam.java | 3 ++- .../domain/param/OrderSellNumCountParam.java | 13 ++++++++++ .../order/domain/param/ShopOrderAddParam.java | 2 +- .../domain/param/ShopOrderInfoAddParam.java | 3 ++- .../core/order/mapper/OrderInfoMapper.java | 9 +++++++ .../mapper/order/OrderDetailMapper.xml | 4 +++ .../mapper/order/OrderInfoMapper.xml | 16 ++++++++++++ 13 files changed, 112 insertions(+), 16 deletions(-) create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderSellNumCountParam.java diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/ICookRecipeDishesService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/ICookRecipeDishesService.java index b4977f1..aadded6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/ICookRecipeDishesService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/ICookRecipeDishesService.java @@ -1,6 +1,9 @@ package com.bonus.canteen.core.cook.service; +import java.util.Date; import java.util.List; + +import com.bonus.canteen.core.cook.domain.CookRecipeDetail; import com.bonus.canteen.core.cook.domain.CookRecipeDishes; /** @@ -64,7 +67,8 @@ public interface ICookRecipeDishesService { * @param cookRecipeDishes 菜品计划菜品关联 * @return 结果 */ - public int reduceMenuRecipeDishesSupplyNum(CookRecipeDishes cookRecipeDishes, Integer quantity); + public int reduceMenuRecipeDishesSupplyNum(CookRecipeDishes cookRecipeDishes, CookRecipeDetail menuRecipeDetail, + Integer quantity, Long userId, Date orderTime); public int addMenuRecipeDishesSupplyNum(CookRecipeDishes cookRecipeDishes, Integer quantity); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeDishesServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeDishesServiceImpl.java index c64c85d..183c0c1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeDishesServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeDishesServiceImpl.java @@ -1,8 +1,14 @@ package com.bonus.canteen.core.cook.service.impl; +import java.util.Date; import java.util.List; +import java.util.Objects; import com.bonus.canteen.core.common.utils.RedisUtil; +import com.bonus.canteen.core.cook.domain.CookRecipeDetail; +import com.bonus.canteen.core.cook.mapper.CookRecipeDetailMapper; +import com.bonus.canteen.core.order.domain.param.OrderSellNumCountParam; +import com.bonus.canteen.core.order.mapper.OrderInfoMapper; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.houqin.constant.GlobalConstants; @@ -27,6 +33,10 @@ public class CookRecipeDishesServiceImpl implements ICookRecipeDishesService { @Autowired private CookRecipeDishesMapper cookRecipeDishesMapper; + @Autowired + private OrderInfoMapper orderInfoMapper; + @Autowired + private CookRecipeDetailMapper cookRecipeDetailMapper; /** * 查询菜品计划菜品关联 @@ -105,7 +115,8 @@ public class CookRecipeDishesServiceImpl implements ICookRecipeDishesService { } @Override - public int reduceMenuRecipeDishesSupplyNum(CookRecipeDishes cookRecipeDishes, Integer quantity) { + public int reduceMenuRecipeDishesSupplyNum(CookRecipeDishes cookRecipeDishes, CookRecipeDetail menuRecipeDetail, + Integer quantity, Long userId, Date orderTime) { log.info("扣减库存入参：{}，数量：{}", JacksonUtil.writeValueAsString(cookRecipeDishes), quantity); if(cookRecipeDishes == null || cookRecipeDishes.getRecipeDetailId() == null || cookRecipeDishes.getDishesId() == null) { throw new ServiceException("参数错误"); @@ -124,10 +135,19 @@ public class CookRecipeDishesServiceImpl implements ICookRecipeDishesService { if(cookRecipeDishes.getRemanentNum() < quantity) { throw new ServiceException("菜品供应量不足"); } + Long sellNumCount = orderInfoMapper.goodsSellNumCount(menuRecipeDetail, userId, orderTime, cookRecipeDishes.getDishesId()); + log.info("菜品销售数量：{}", sellNumCount); + if(Objects.nonNull(cookRecipeDishes.getLimitNum()) && (sellNumCount > cookRecipeDishes.getLimitNum())) { + throw new ServiceException("菜品超过个人限购数量"); + } return cookRecipeDishesMapper.reduceCookRecipeDishesSupplyNum(cookRecipeDishes, quantity); } catch (Exception e) { log.error("修改菜谱菜品供应量失败", e); - throw new ServiceException("修改菜谱菜品供应量失败"); + if(e instanceof ServiceException) { + throw new ServiceException(e.getMessage()); + }else { + throw new ServiceException("修改菜谱菜品供应量失败"); + } }finally { try { RedisUtil.safeUnLock(lockKey); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java index ea503f6..a49e78e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java @@ -11,7 +11,10 @@ import com.bonus.canteen.core.account.service.IAccWalletInfoService; import com.bonus.canteen.core.common.utils.MqUtil; import com.bonus.canteen.core.common.utils.ObjectUtils; import com.bonus.canteen.core.common.utils.RedisUtil; +import com.bonus.canteen.core.cook.domain.CookRecipeDetail; import com.bonus.canteen.core.cook.domain.CookRecipeDishes; +import com.bonus.canteen.core.cook.enums.RecipeDetailTypeEnum; +import com.bonus.canteen.core.cook.service.ICookRecipeDetailService; import com.bonus.canteen.core.cook.service.ICookRecipeDishesService; import com.bonus.canteen.core.order.constants.OrderDetailStateEnum; import com.bonus.canteen.core.order.constants.OrderDetailTypeEnum; @@ -47,6 +50,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -66,6 +70,8 @@ public class OrderBusiness { private IAccWalletInfoService accWalletInfoService; @Autowired private IAccTradeService accTradeService; + @Autowired + private ICookRecipeDetailService cookRecipeDetailService; @Transactional(rollbackFor = Exception.class) public List orderPlaceHandler(List orderInfoList) { @@ -78,13 +84,13 @@ public class OrderBusiness { List orderDetailList = orderInfo.getOrderDetailList(); orderDetailList.forEach(orderDetail -> orderDetail.setOrderId(orderInfo.getOrderId())); orderDetailService.batchInsertOrderDetail(orderDetailList); - reduceMenuDishSupplyNum(orderDetailList); + reduceMenuDishSupplyNum(orderDetailList, orderInfo.getUserId(), orderInfo.getOrderTime()); }); } return orderInfoList; } - public void reduceMenuDishSupplyNum(List orderDetailList) { + public void reduceMenuDishSupplyNum(List orderDetailList, Long userId, Date orderTime) { log.info("订单扣减库存入参：{}", JacksonUtil.writeValueAsString(orderDetailList)); for(OrderDetail orderDetail : orderDetailList) { if(OrderDetailTypeEnum.KEYAMOUNT.getKey().equals(orderDetail.getDetailType())) { @@ -92,9 +98,20 @@ public class OrderBusiness { } CookRecipeDishes menuRecipeDishes = new CookRecipeDishes(); ObjectUtils.setAllFieldsToNull(menuRecipeDishes); - menuRecipeDishes.setRecipeDetailId(orderDetail.getRecipeDetailId()); + CookRecipeDetail menuRecipeDetail = new CookRecipeDetail(); + menuRecipeDetail.setDetailType(RecipeDetailTypeEnum.DETAIL_DATA.key()); + menuRecipeDetail.setRecipeId(orderDetail.getRecipeId()); + menuRecipeDetail.setApplyDate(orderDetail.getOrderDate()); + menuRecipeDetail.setMealtimeType(orderDetail.getMealtimeType()); + log.info("菜谱详情入参：{}", JacksonUtil.writeValueAsString(menuRecipeDetail)); + List cookRecipeDetails = cookRecipeDetailService.selectCookRecipeDetailList(menuRecipeDetail); + if(CollUtil.isEmpty(cookRecipeDetails) || cookRecipeDetails.size() > 1) { + throw new ServiceException("菜谱详情异常"); + } + menuRecipeDishes.setRecipeDetailId(cookRecipeDetails.get(0).getRecipeDetailId()); menuRecipeDishes.setDishesId(orderDetail.getGoodsId()); - cookRecipeDishesService.reduceMenuRecipeDishesSupplyNum(menuRecipeDishes, orderDetail.getQuantity()); + cookRecipeDishesService.reduceMenuRecipeDishesSupplyNum(menuRecipeDishes, menuRecipeDetail, + orderDetail.getQuantity(), userId , orderTime); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderDetail.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderDetail.java index 2e0e8eb..d092ad5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderDetail.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderDetail.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.math.BigDecimal; +import java.time.LocalDate; import java.util.Date; /** @@ -30,7 +31,7 @@ public class OrderDetail extends BaseEntity /** 订单日期 yyyy-MM-dd */ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "订单日期 yyyy-MM-dd", width = 30, dateFormat = "yyyy-MM-dd") - private Date orderDate; + private LocalDate orderDate; /** 商品菜品id */ @Excel(name = "商品菜品id") @@ -104,4 +105,8 @@ public class OrderDetail extends BaseEntity @Excel(name = "流水号") private String serialNum; + private Long recipeId; + + private Long mealtimeType; + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java index 79ca02b..8444b6d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java @@ -15,6 +15,7 @@ import lombok.Data; import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; +import java.time.LocalDate; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -81,7 +82,7 @@ public class OrderInfo extends BaseEntity /** 餐次类型 1-早餐 2-午餐 3-晚餐 4-下午茶 5-夜宵 */ @Excel(name = "餐次类型 1-早餐 2-午餐 3-晚餐 4-下午茶 5-夜宵") - private Integer mealtimeType; + private Long mealtimeType; /** 餐次名称 */ @Excel(name = "餐次名称") @@ -90,7 +91,7 @@ public class OrderInfo extends BaseEntity /** 订单日期 yyyy-MM-dd */ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "订单日期 yyyy-MM-dd", width = 30, dateFormat = "yyyy-MM-dd") - private Date orderDate; + private LocalDate orderDate; /** 应付金额 分 */ @Excel(name = "应付金额 分") @@ -213,7 +214,7 @@ public class OrderInfo extends BaseEntity orderInfo.setOrderDate(orderInfoAddParam.getOrderDate()); orderInfo.setOrderType(orderInfoAddParam.getOrderType()); Integer mealtimeType = orderInfoAddParam.getMealtimeType(); - orderInfo.setMealtimeType(Objects.isNull(mealtimeType) ? -1 : mealtimeType); + orderInfo.setMealtimeType(Objects.isNull(mealtimeType) ? -1L : mealtimeType); orderInfo.setMealtimeName(orderInfoAddParam.getMealtimeName()); orderInfo.setIsOnline(Objects.isNull(param.getIsOnline()) ? 1 : param.getIsOnline()); orderInfo.setOrderState(OrderStateEnum.WAIT_PLACE.getKey()); @@ -282,6 +283,8 @@ public class OrderInfo extends BaseEntity orderDetail.setRefundNum(0); orderDetail.setDeviceSn(StringUtils.defaultString(orderInfo.getDeviceSn(), StringUtils.EMPTY)); orderDetail.setSerialNum(StringUtils.EMPTY); + orderDetail.setRecipeId(orderDetailInfoAddParam.getRecipeId()); + orderDetail.setMealtimeType(orderInfo.getMealtimeType()); orderDetail.setCreateBy(SecurityUtils.getUsername()); orderDetail.setCreateTime(DateUtils.getNowDate()); orderDetail.setUpdateBy(SecurityUtils.getUsername()); @@ -312,7 +315,7 @@ public class OrderInfo extends BaseEntity orderInfo.setOrderDate(orderInfoAddParam.getOrderDate()); orderInfo.setOrderType(orderInfoAddParam.getOrderType()); Integer mealtimeType = orderInfoAddParam.getMealtimeType(); - orderInfo.setMealtimeType(Objects.isNull(mealtimeType) ? -1 : mealtimeType); + orderInfo.setMealtimeType(Objects.isNull(mealtimeType) ? -1L : mealtimeType); orderInfo.setMealtimeName(orderInfoAddParam.getMealtimeName()); orderInfo.setIsOnline(Objects.isNull(param.getIsOnline()) ? 1 : param.getIsOnline()); orderInfo.setOrderState(OrderStateEnum.WAIT_PLACE.getKey()); @@ -374,6 +377,8 @@ public class OrderInfo extends BaseEntity orderDetail.setRefundNum(0); orderDetail.setDeviceSn(StringUtils.defaultString(orderInfo.getDeviceSn(), StringUtils.EMPTY)); orderDetail.setSerialNum(StringUtils.EMPTY); + orderDetail.setMealtimeType(orderInfo.getMealtimeType()); + orderDetail.setRecipeId(orderDetailInfoAddParam.getMenuId()); orderDetail.setCreateBy(SecurityUtils.getUsername()); orderDetail.setCreateTime(DateUtils.getNowDate()); orderDetail.setUpdateBy(SecurityUtils.getUsername()); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/DeviceOrderInfoAddParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/DeviceOrderInfoAddParam.java index 7c09ea4..7dd9dfd 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/DeviceOrderInfoAddParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/DeviceOrderInfoAddParam.java @@ -5,6 +5,7 @@ import lombok.Data; import javax.validation.Valid; import javax.validation.constraints.NotNull; +import java.time.LocalDate; import java.util.Date; import java.util.List; @@ -21,7 +22,7 @@ public class DeviceOrderInfoAddParam { private String mealtimeName; @NotNull(message = "订单日期不能为空") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date orderDate; + private LocalDate orderDate; @NotNull(message = "订单类型不能为空") private Integer orderType; @NotNull(message = "设备订单ID不能为空") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderInfoAddParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderInfoAddParam.java index 5547b45..87d9490 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderInfoAddParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderInfoAddParam.java @@ -5,6 +5,7 @@ import lombok.Data; import javax.validation.Valid; import javax.validation.constraints.NotNull; +import java.time.LocalDate; import java.util.Date; import java.util.List; @@ -21,7 +22,7 @@ public class OrderInfoAddParam { private String mealtimeName; @NotNull(message = "订单日期不能为空") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date orderDate; + private LocalDate orderDate; @NotNull(message = "订单类型不能为空") private Integer orderType; private String deviceOrderId; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderSellNumCountParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderSellNumCountParam.java new file mode 100644 index 0000000..008b177 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderSellNumCountParam.java @@ -0,0 +1,13 @@ +package com.bonus.canteen.core.order.domain.param; + +import lombok.Data; + +import java.util.Date; + +@Data +public class OrderSellNumCountParam { + private Long userId; + private Long receptDetailId; + private Long goodsId; + private Date orderTime; +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderAddParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderAddParam.java index 42aba1d..f94b3f0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderAddParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderAddParam.java @@ -86,7 +86,7 @@ public class ShopOrderAddParam { orderInfo.setAccountPayAmount(param.getRealAmount()); orderInfo.setCanteenId(-1L); orderInfo.setStallId(-1L); - orderInfo.setMealtimeType(-1); + orderInfo.setMealtimeType(-1L); orderInfo.setIdentityVerification(orderInfoAddParam.getIdentityVerification()); orderInfoList.add(orderInfo); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderInfoAddParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderInfoAddParam.java index 691a9f6..42cdd3e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderInfoAddParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/ShopOrderInfoAddParam.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import javax.validation.constraints.NotNull; +import java.time.LocalDate; import java.util.Date; @Data @@ -18,7 +19,7 @@ public class ShopOrderInfoAddParam { private String deviceNum; @NotNull(message = "订单日期不能为空") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date orderDate; + private LocalDate orderDate; @NotNull(message = "核身方式不能为空") private Integer identityVerification; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mapper/OrderInfoMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mapper/OrderInfoMapper.java index 18213b4..9a171bb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mapper/OrderInfoMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mapper/OrderInfoMapper.java @@ -1,13 +1,16 @@ package com.bonus.canteen.core.order.mapper; +import com.bonus.canteen.core.cook.domain.CookRecipeDetail; import com.bonus.canteen.core.order.domain.OrderInfo; import com.bonus.canteen.core.order.domain.OrderPayResultDTO; import com.bonus.canteen.core.order.domain.OrderRefundHistoryVO; import com.bonus.canteen.core.order.domain.param.OrderQueryParam; import com.bonus.canteen.core.order.domain.param.OrderRefundHistoryParam; +import com.bonus.canteen.core.order.domain.param.OrderSellNumCountParam; import com.bonus.canteen.core.order.domain.param.OrderWriteOffParam; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; /** @@ -72,4 +75,10 @@ public interface OrderInfoMapper public List orderRefundHistory(@Param("param") OrderRefundHistoryParam param); public void writeOffOrderByOrderIds(@Param("param") OrderWriteOffParam param); + + public Long goodsSellNumCount(@Param("param") CookRecipeDetail param, + @Param("userId")Long userId, + @Param("orderTime")Date orderTime, + @Param("dishesId")Long dishesId); } + diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderDetailMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderDetailMapper.xml index 67ce6b3..2a15909 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -76,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" goods_id, goods_name, goods_img_url, + recipe_id, recipe_detail_id, sale_price, discount_price, @@ -102,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{goodsId}, #{goodsName}, #{goodsImgUrl}, + #{recipeId}, #{recipeDetailId}, #{salePrice}, #{discountPrice}, @@ -131,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" goods_id, goods_name, goods_img_url, + recipe_id, recipe_detail_id, sale_price, discount_price, @@ -157,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{orderDetail.goodsId}, #{orderDetail.goodsName}, #{orderDetail.goodsImgUrl}, + #{orderDetail.recipeId}, #{orderDetail.recipeDetailId}, #{orderDetail.salePrice}, #{orderDetail.discountPrice}, diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml index 06b73a0..bcbca56 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml @@ -465,4 +465,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file