czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 订单详情返回字段调整，增加registerType

Browse Source
This commit is contained in:
SongZhang
2024-10-29 10:52:04 +08:00
parent 70f8dfd887
commit 8010ee3ffe
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@@ -464,8 +464,8 @@ public class OrderService {
return Result.fail("订单不存在"); return Result.fail("订单不存在");
} }
TbShopInfo tbShopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId())); TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId()));
if (tbShopInfo == null) { if (shopInfo == null) {
return Result.fail("店铺不存在"); return Result.fail("店铺不存在");
} }
@@ -504,10 +504,10 @@ public class OrderService {
TbShopTable tbShopTable = shopTableMapper.selectQRcode(orderInfo.getTableId()); TbShopTable tbShopTable = shopTableMapper.selectQRcode(orderInfo.getTableId());
OrderVo orderVo = new OrderVo(); OrderVo orderVo = new OrderVo();
orderVo.setName(tbShopInfo.getShopName()); orderVo.setName(shopInfo.getShopName());
orderVo.setStatus(orderInfo.getStatus()); orderVo.setStatus(orderInfo.getStatus());
//TODO 增加商家二维码 //TODO 增加商家二维码
orderVo.setShopQrcode(tbShopInfo.getShopQrcode()); orderVo.setShopQrcode(shopInfo.getShopQrcode());
orderVo.setDetails(list); orderVo.setDetails(list);
orderVo.setOrderNo(orderInfo.getOrderNo()); orderVo.setOrderNo(orderInfo.getOrderNo());
orderVo.setTime(orderInfo.getCreatedAt()); orderVo.setTime(orderInfo.getCreatedAt());
@@ -526,8 +526,7 @@ 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.getShopQrcode());
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);
@@ -536,6 +535,7 @@ public class OrderService {
map.putAll(BeanUtil.beanToMap(orderVo, false, false)); map.putAll(BeanUtil.beanToMap(orderVo, false, false));
map.put("createdAt", DateUtil.formatDateTime(DateUtil.date(orderInfo.getCreatedAt()))); map.put("createdAt", DateUtil.formatDateTime(DateUtil.date(orderInfo.getCreatedAt())));
map.put("paidTime", orderInfo.getPaidTime() == null ? null : DateUtil.formatDateTime(DateUtil.date(orderInfo.getPaidTime()))); map.put("paidTime", orderInfo.getPaidTime() == null ? null : DateUtil.formatDateTime(DateUtil.date(orderInfo.getPaidTime())));
map.put("registerType", shopInfo.getRegisterType());
return map; return map;
} }
} }