|
|
@@ -193,7 +193,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
vo.setPayTime(order.getPayTime());
|
|
|
vo.setVideoUrl(order.getVideoUrl());
|
|
|
vo.setConfidence(order.getConfidence());
|
|
|
- vo.setShopName(order.getShopName());
|
|
|
+ vo.setShopName(order.getStoreName() != null ? order.getStoreName() : order.getShopName());
|
|
|
vo.setDeviceName(order.getDeviceName());
|
|
|
vo.setPayType(order.getPayType());
|
|
|
|
|
|
@@ -445,6 +445,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
Shop shop = shopMapper.selectById(device.getShopId());
|
|
|
if (shop != null) {
|
|
|
order.setStoreName(shop.getName());
|
|
|
+ order.setShopName(shop.getName());
|
|
|
}
|
|
|
}
|
|
|
} catch (Exception e) {
|