订单返回店铺二维码
This commit is contained in:
@@ -40,5 +40,6 @@ public class OrderVo {
|
|||||||
private String useType;
|
private String useType;
|
||||||
|
|
||||||
private Integer shopId;
|
private Integer shopId;
|
||||||
|
private String qrcode;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import com.chaozhanggui.system.cashierservice.exception.MsgException;
|
|||||||
import com.chaozhanggui.system.cashierservice.mapper.MpCashierCartMapper;
|
import com.chaozhanggui.system.cashierservice.mapper.MpCashierCartMapper;
|
||||||
import com.chaozhanggui.system.cashierservice.mapper.MpOrderDetailMapper;
|
import com.chaozhanggui.system.cashierservice.mapper.MpOrderDetailMapper;
|
||||||
import com.chaozhanggui.system.cashierservice.mapper.MpOrderInfoMapper;
|
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.rabbit.RabbitProducer;
|
||||||
import com.chaozhanggui.system.cashierservice.redis.RedisCst;
|
import com.chaozhanggui.system.cashierservice.redis.RedisCst;
|
||||||
import com.chaozhanggui.system.cashierservice.redis.RedisUtil;
|
import com.chaozhanggui.system.cashierservice.redis.RedisUtil;
|
||||||
@@ -92,6 +93,8 @@ public class OrderService {
|
|||||||
private MpOrderDetailMapper mpOrderDetailMapper;
|
private MpOrderDetailMapper mpOrderDetailMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
private MpOrderInfoMapper mpOrderInfoMapper;
|
private MpOrderInfoMapper mpOrderInfoMapper;
|
||||||
|
@Autowired
|
||||||
|
private MpShopInfoMapper mpShopInfoMapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建订单
|
* 创建订单
|
||||||
@@ -521,7 +524,8 @@ public class OrderService {
|
|||||||
orderVo.setOutNumber(orderInfo.getOutNumber());
|
orderVo.setOutNumber(orderInfo.getOutNumber());
|
||||||
orderVo.setUseType(orderInfo.getUseType());
|
orderVo.setUseType(orderInfo.getUseType());
|
||||||
orderVo.setShopId(Integer.valueOf(orderInfo.getShopId()));
|
orderVo.setShopId(Integer.valueOf(orderInfo.getShopId()));
|
||||||
|
TbShopInfo shopInfo = mpShopInfoMapper.selectById(orderInfo.getShopId());
|
||||||
|
orderVo.setQrcode(shopInfo == null ? null : shopInfo.getShopQrcode());
|
||||||
Map<String, Object> map = new HashMap<>();
|
Map<String, Object> map = new HashMap<>();
|
||||||
// 餐位费
|
// 餐位费
|
||||||
map.put("seatFee", mealCashierCart);
|
map.put("seatFee", mealCashierCart);
|
||||||
|
|||||||
Reference in New Issue
Block a user