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

退款接口

Browse Source
This commit is contained in:
SongZhang
2024-09-29 11:35:22 +08:00
parent c5d68ffffc
commit 655383fd02
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ReturnOrderDTO.java
View File

@@ -25,7 +25,7 @@ public class ReturnOrderDTO {
private String shopId; private String shopId;
@NotEmpty @NotEmpty
private String note; private String note;
@NotEmpty // @NotEmpty
private String pwd; private String pwd;
@Valid @Valid
private List<OrderDetail> orderDetails; private List<OrderDetail> orderDetails;

6
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -230,8 +230,13 @@ public class TbShopTableServiceImpl implements TbShopTableService {
TbOrderInfo orderInfo = null; TbOrderInfo orderInfo = null;
if (StrUtil.isNotBlank(date.getQrcode())) { if (StrUtil.isNotBlank(date.getQrcode())) {
try {
ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(criteria.getShopId(), date.getQrcode()); ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(criteria.getShopId(), date.getQrcode());
orderInfo = getCurrentOrder(shopEatTypeInfoDTO); orderInfo = getCurrentOrder(shopEatTypeInfoDTO);
}catch (Exception e) {
log.info(e.getMessage());
}
} }
itemMap.put("orderId", orderInfo == null ? null : orderInfo.getId()); itemMap.put("orderId", orderInfo == null ? null : orderInfo.getId());
@@ -2014,7 +2019,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
@Override @Override
public Object returnOrder(ReturnOrderDTO returnOrderDTO) { public Object returnOrder(ReturnOrderDTO returnOrderDTO) {
TbOrderInfo orderInfo = orderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>() TbOrderInfo orderInfo = orderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>()
.eq(TbOrderInfo::getId, returnOrderDTO.getOrderId()) .eq(TbOrderInfo::getId, returnOrderDTO.getOrderId())
.eq(TbOrderInfo::getStatus, "closed")); .eq(TbOrderInfo::getStatus, "closed"));