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

1.代客下单 失败添加消息提示

This commit is contained in:
SongZhang 2024-09-05 15:01:31 +08:00
parent f458e6f77e
commit b7fc525623
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
View File

@ -188,12 +188,8 @@ public class TbPlaceController {
public ResponseEntity<Object> pay( public ResponseEntity<Object> pay(
@Validated @RequestBody PayDTO payDTO @Validated @RequestBody PayDTO payDTO
) { ) {
try {
return ResponseEntity.ok(tbShopTableService.pay(payDTO)); return ResponseEntity.ok(tbShopTableService.pay(payDTO));
}catch (Exception e) {
return ResponseEntity.badRequest().body(e.getMessage());
}
} }
@AnonymousAccess @AnonymousAccess

2
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java
View File

@ -438,7 +438,7 @@ public class TbPayServiceImpl implements TbPayService {
return orderInfo; return orderInfo;
} }
public TbOrderInfo memberAccountPay(String memberId, String shopId, String accountCode, Integer orderId, Double discount) throws Exception { public TbOrderInfo memberAccountPay(String memberId, String shopId, String accountCode, Integer orderId, Double discount) {
TbOrderInfo orderInfo = orderInfoMapper.selectOne(new LambdaUpdateWrapper<TbOrderInfo>() TbOrderInfo orderInfo = orderInfoMapper.selectOne(new LambdaUpdateWrapper<TbOrderInfo>()
.eq(TbOrderInfo::getId, orderId) .eq(TbOrderInfo::getId, orderId)
.eq(TbOrderInfo::getShopId, shopId)); .eq(TbOrderInfo::getShopId, shopId));

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

@ -1248,11 +1248,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderInfo = tbPayServiceImpl.scanPay(payDTO); orderInfo = tbPayServiceImpl.scanPay(payDTO);
break; break;
case "deposit": case "deposit":
try { orderInfo = tbPayServiceImpl.memberAccountPay("", String.valueOf(payDTO.getShopId()), payDTO.getCode(), payDTO.getOrderId(), payDTO.getDiscount());
orderInfo = tbPayServiceImpl.memberAccountPay("", String.valueOf(payDTO.getShopId()), payDTO.getCode(), payDTO.getOrderId(), payDTO.getDiscount());
} catch (Exception e) {
throw new RuntimeException(e);
}
break; break;
default: default:
throw new BadRequestException("未知支付方式"); throw new BadRequestException("未知支付方式");