diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/ObjectUtils.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/ObjectUtils.java
index 7e3fd4c..a8fe4c4 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/ObjectUtils.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/ObjectUtils.java
@@ -1,16 +1,24 @@
package com.bonus.canteen.core.common.utils;
+import com.bonus.canteen.core.order.business.OrderBusiness;
import com.bonus.common.core.exception.ServiceException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.lang.reflect.Field;
public class ObjectUtils {
+ private static final Logger log = LoggerFactory.getLogger(ObjectUtils.class);
public static void setAllFieldsToNull(Object obj) {
for (Field field : obj.getClass().getDeclaredFields()) {
+ if("serialVersionUID".equals(field.getName())) {
+ continue;
+ }
field.setAccessible(true);
try {
field.set(obj, null);
} catch (IllegalAccessException e) {
+ log.error("setAllFieldsToNull error", e);
throw new ServiceException("系统异常");
}
}
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 bd6789d..af1e01d 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
@@ -75,7 +75,7 @@ public class OrderBusiness {
}
CookRecipeDishes menuRecipeDishes = new CookRecipeDishes();
ObjectUtils.setAllFieldsToNull(menuRecipeDishes);
- menuRecipeDishes.setRecipeDetailId(orderDetail.getMenuDetailId());
+ menuRecipeDishes.setRecipeDetailId(orderDetail.getRecipeDetailId());
menuRecipeDishes.setDishesId(orderDetail.getGoodsId());
cookRecipeDishesService.reduceMenuRecipeDishesSupplyNum(menuRecipeDishes, orderDetail.getQuantity());
}
@@ -89,7 +89,7 @@ public class OrderBusiness {
}
CookRecipeDishes menuRecipeDishes = new CookRecipeDishes();
ObjectUtils.setAllFieldsToNull(menuRecipeDishes);
- menuRecipeDishes.setRecipeDetailId(orderDetail.getMenuDetailId());
+ menuRecipeDishes.setRecipeDetailId(orderDetail.getRecipeDetailId());
menuRecipeDishes.setDishesId(orderDetail.getGoodsId());
cookRecipeDishesService.addMenuRecipeDishesSupplyNum(menuRecipeDishes, orderDetail.getQuantity());
}
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java
index dd70825..ff2bbd7 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java
@@ -133,12 +133,14 @@ public class OrderInfoController extends BaseController
try {
orderInfoService.insertCanteenOrderInfo(orderAddParam);
}catch (ServiceException ex) {
+ logger.error("h5下单异常: {}", ex.getMessage(), ex);
if(Integer.valueOf(500001).equals(ex.getCode())) {
return AjaxResult.success(ex.getMessage());
}else {
return AjaxResult.error(ex.getMessage());
}
}catch (Exception ex) {
+ logger.error("h5下单失败: {}", ex.getMessage(), ex);
return AjaxResult.error("下单失败");
}
return AjaxResult.success();
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderCart.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderCart.java
index 6212ff7..d7b6a28 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderCart.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderCart.java
@@ -27,7 +27,7 @@ public class OrderCart extends BaseEntity
/** 菜谱id */
@Excel(name = "菜谱id")
- private Long menuId;
+ private Long recipeId;
/** 食堂id */
@Excel(name = "食堂id")
@@ -90,14 +90,14 @@ public class OrderCart extends BaseEntity
return userId;
}
- public void setMenuId(Long menuId)
+ public void setRecipeId(Long recipeId)
{
- this.menuId = menuId;
+ this.recipeId = recipeId;
}
- public Long getMenuId()
+ public Long getRecipeId()
{
- return menuId;
+ return recipeId;
}
public void setCanteenId(Long canteenId)
@@ -205,7 +205,7 @@ public class OrderCart extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("cartId", getCartId())
.append("userId", getUserId())
- .append("menuId", getMenuId())
+ .append("menuId", getRecipeId())
.append("canteenId", getCanteenId())
.append("stallId", getStallId())
.append("goodsId", getGoodsId())
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 014a0d7..2e0e8eb 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
@@ -46,7 +46,7 @@ public class OrderDetail extends BaseEntity
/** 菜品详情id */
@Excel(name = "菜品详情id")
- private Long menuDetailId;
+ private Long recipeDetailId;
/** 售卖价格 分 */
@Excel(name = "售卖价格 分")
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 596094f..da51be1 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
@@ -253,7 +253,7 @@ public class OrderInfo extends BaseEntity
orderDetail.setGoodsId(orderDetailInfoAddParam.getGoodsId());
orderDetail.setGoodsName(orderDetailInfoAddParam.getGoodsName());
orderDetail.setGoodsImgUrl(orderDetailInfoAddParam.getGoodsImgUrl());
- orderDetail.setMenuDetailId(orderDetailInfoAddParam.getMenuDetailId());
+ orderDetail.setRecipeDetailId(orderDetailInfoAddParam.getRecipeDetailId());
orderDetail.setSalePrice(orderDetailInfoAddParam.getSalePrice());
orderDetail.setDiscountPrice(orderDetailInfoAddParam.getDiscountPrice());
orderDetail.setFinalPrice(orderDetailInfoAddParam.getFinalPrice());
@@ -345,7 +345,7 @@ public class OrderInfo extends BaseEntity
orderDetail.setGoodsId(orderDetailInfoAddParam.getGoodsId());
orderDetail.setGoodsName(orderDetailInfoAddParam.getGoodsName());
orderDetail.setGoodsImgUrl(orderDetailInfoAddParam.getGoodsImgUrl());
- orderDetail.setMenuDetailId(orderDetailInfoAddParam.getMenuDetailId());
+ orderDetail.setRecipeDetailId(orderDetailInfoAddParam.getMenuDetailId());
orderDetail.setSalePrice(orderDetailInfoAddParam.getSalePrice());
orderDetail.setDiscountPrice(orderDetailInfoAddParam.getDiscountPrice());
orderDetail.setFinalPrice(orderDetailInfoAddParam.getFinalPrice());
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderDetailInfoAddParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderDetailInfoAddParam.java
index e27c01e..d1dca00 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderDetailInfoAddParam.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/OrderDetailInfoAddParam.java
@@ -16,9 +16,9 @@ public class OrderDetailInfoAddParam {
private String goodsImgUrl;
private String goodsName;
@NotNull(message = "菜谱详情ID不能为空")
- private Long menuDetailId;
+ private Long recipeDetailId;
@NotNull(message = "菜谱ID不能为空")
- private Long menuId;
+ private Long recipeId;
@NotNull(message = "菜谱下单数量不能为空")
private Integer quantity;
private Integer restrictNum;
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/vo/OrderCartVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/vo/OrderCartVO.java
index 06cfeb7..719150a 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/vo/OrderCartVO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/vo/OrderCartVO.java
@@ -26,7 +26,7 @@ public class OrderCartVO extends BaseEntity
/** 菜谱id */
@Excel(name = "菜谱id")
- private Long menuId;
+ private Long recipeId;
/** 食堂id */
@Excel(name = "食堂id")
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderCartServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderCartServiceImpl.java
index 65e103b..bccd673 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderCartServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderCartServiceImpl.java
@@ -89,7 +89,7 @@ public class OrderCartServiceImpl implements IOrderCartService
try{
cookRecipeDishMap = menuModule.getMenuRecipeDish(cookDishCheckDTO);
}catch (Exception ex) {
- log.info("菜单数据获取失败:" + ex.getMessage());
+ log.info("菜单数据获取失败:{}", ex.getMessage(), ex);
}
for (OrderCart shoppingCart : carts) {
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/utils/OrderCartParamChecker.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/utils/OrderCartParamChecker.java
index bbaa3cb..9266b4f 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/utils/OrderCartParamChecker.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/utils/OrderCartParamChecker.java
@@ -99,7 +99,7 @@ public class OrderCartParamChecker {
}
private static void checkMenuId(OrderCart orderCart) {
- if (orderCart.getMenuId() == null) {
+ if (orderCart.getRecipeId() == null) {
throw new ServiceException("菜谱ID为空");
}
}
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderCartMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderCartMapper.xml
index bd59fa8..1ddeb7d 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderCartMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderCartMapper.xml
@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select cart_id, user_id, menu_id, canteen_id, stall_id, goods_id,
+ select cart_id, user_id, recipe_id, canteen_id, stall_id, goods_id,
goods_name, goods_img_url, quantity, order_type, detail_type, order_date,
mealtime_type, create_by, create_time, update_by, update_time
from order_cart
@@ -35,7 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and user_id = #{userId}
- and menu_id = #{menuId}
+
+ and recipe_id = #{recipeId}
and canteen_id = #{canteenId}
and stall_id = #{stallId}
and goods_id = #{goodsId}
@@ -59,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
cart_id,
user_id,
- menu_id,
+ recipe_id,
canteen_id,
stall_id,
goods_id,
@@ -78,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{cartId},
#{userId},
- #{menuId},
+ #{recipeId},
#{canteenId},
#{stallId},
#{goodsId},
@@ -100,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update order_cart
user_id = #{userId},
- menu_id = #{menuId},
+ recipe_id = #{recipeId},
canteen_id = #{canteenId},
stall_id = #{stallId},
goods_id = #{goodsId},
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 ca0e0a7..67ce6b3 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
@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select detail_id, order_id, order_date, goods_id, goods_name, goods_img_url, menu_detail_id, sale_price, discount_price, final_price, quantity, sales_mode, detail_type, total_amount, calc_total_amount, real_amount, refund_amount, detail_state, refund_num, device_sn, serial_num, create_by, create_time, update_by, update_time from order_detail
+ select detail_id, order_id, order_date, goods_id, goods_name, goods_img_url, recipe_detail_id, sale_price, discount_price, final_price, quantity, sales_mode, detail_type, total_amount, calc_total_amount, real_amount, refund_amount, detail_state, refund_num, device_sn, serial_num, create_by, create_time, update_by, update_time from order_detail