diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java index cda221d..a5abc9e 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java @@ -40,5 +40,6 @@ public class OrderVo { private String useType; private Integer shopId; + private String qrcode; } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index ecb864c..0294163 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -15,6 +15,7 @@ import com.chaozhanggui.system.cashierservice.exception.MsgException; import com.chaozhanggui.system.cashierservice.mapper.MpCashierCartMapper; import com.chaozhanggui.system.cashierservice.mapper.MpOrderDetailMapper; import com.chaozhanggui.system.cashierservice.mapper.MpOrderInfoMapper; +import com.chaozhanggui.system.cashierservice.mapper.MpShopInfoMapper; import com.chaozhanggui.system.cashierservice.rabbit.RabbitProducer; import com.chaozhanggui.system.cashierservice.redis.RedisCst; import com.chaozhanggui.system.cashierservice.redis.RedisUtil; @@ -92,6 +93,8 @@ public class OrderService { private MpOrderDetailMapper mpOrderDetailMapper; @Autowired private MpOrderInfoMapper mpOrderInfoMapper; + @Autowired + private MpShopInfoMapper mpShopInfoMapper; /** * 创建订单 @@ -521,7 +524,8 @@ public class OrderService { orderVo.setOutNumber(orderInfo.getOutNumber()); orderVo.setUseType(orderInfo.getUseType()); orderVo.setShopId(Integer.valueOf(orderInfo.getShopId())); - + TbShopInfo shopInfo = mpShopInfoMapper.selectById(orderInfo.getShopId()); + orderVo.setQrcode(shopInfo == null ? null : shopInfo.getShopQrcode()); Map map = new HashMap<>(); // 餐位费 map.put("seatFee", mealCashierCart);