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

1.代客下单 扫码支付，储值卡扫码支付, 台桌状态

Browse Source
This commit is contained in:
SongZhang
2024-09-05 09:24:50 +08:00
parent be701b46ec
commit fed5b28ce2
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,6 +214,7 @@ public class TbPayServiceImpl implements TbPayService {
ResponseEntity<String> response = restTemplate.postForEntity(gateWayUrl.concat("merchantOrder/scanPay"), scanPayReq, String.class); ResponseEntity<String> response = restTemplate.postForEntity(gateWayUrl.concat("merchantOrder/scanPay"), scanPayReq, String.class);
log.info("响应信息, {}", response);
if (response.getStatusCodeValue() == 200 && ObjectUtil.isNotEmpty(response.getBody())) { if (response.getStatusCodeValue() == 200 && ObjectUtil.isNotEmpty(response.getBody())) {
JSONObject object = JSONObject.parseObject(response.getBody()); JSONObject object = JSONObject.parseObject(response.getBody());
if (object.get("code").equals("0")) { if (object.get("code").equals("0")) {
@@ -241,6 +242,7 @@ public class TbPayServiceImpl implements TbPayService {
.eq(TbOrderDetail::getOrderId, scanPayDTO.getOrderId())); .eq(TbOrderDetail::getOrderId, scanPayDTO.getOrderId()));
return orderInfo;
} else { } else {
String status = ObjectUtil.isNotEmpty(object.getJSONObject("data")) ? object.getJSONObject("data").getString("status") : null; String status = ObjectUtil.isNotEmpty(object.getJSONObject("data")) ? object.getJSONObject("data").getString("status") : null;
@@ -258,7 +260,7 @@ public class TbPayServiceImpl implements TbPayService {
// orderInfo.setStatus("fail"); // orderInfo.setStatus("fail");
// orderInfo.setPayOrderNo(payment.getTradeNumber()); // orderInfo.setPayOrderNo(payment.getTradeNumber());
// tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo); // tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
return orderInfo;
} }
} }
} else { } else {
@@ -276,6 +278,7 @@ public class TbPayServiceImpl implements TbPayService {
BigDecimal.valueOf(payment.getAmount()).setScale(2, RoundingMode.DOWN).multiply(new BigDecimal(100)).longValue(), BigDecimal.valueOf(payment.getAmount()).setScale(2, RoundingMode.DOWN).multiply(new BigDecimal(100)).longValue(),
payType.equals("wechatPay") ? thirdApply.getSmallAppid() : null, payType.equals("wechatPay") ? thirdApply.getSmallAppid() : null,
scanPayDTO.getCode(), DateUtils.getSsdfTimes(), thirdApply.getStoreId(), callBack, thirdApply.getAppToken()); scanPayDTO.getCode(), DateUtils.getSsdfTimes(), thirdApply.getStoreId(), callBack, thirdApply.getAppToken());
log.info("响应信息, {}", publicResp);
if (ObjectUtil.isNotNull(publicResp) && ObjectUtil.isNotEmpty(publicResp)) { if (ObjectUtil.isNotNull(publicResp) && ObjectUtil.isNotEmpty(publicResp)) {
if ("000000".equals(publicResp.getCode())) { if ("000000".equals(publicResp.getCode())) {
MainScanResp mainScanResp = publicResp.getObjData(); MainScanResp mainScanResp = publicResp.getObjData();
@@ -300,7 +303,7 @@ public class TbPayServiceImpl implements TbPayService {
.eq(TbOrderDetail::getOrderId, orderInfo.getId()) .eq(TbOrderDetail::getOrderId, orderInfo.getId())
.set(TbOrderDetail::getStatus, "closed")); .set(TbOrderDetail::getStatus, "closed"));
return orderInfo;
} else if ("TRADE_AWAIT".equals(mainScanResp.getState())) { } else if ("TRADE_AWAIT".equals(mainScanResp.getState())) {
orderInfo.setStatus("paying"); orderInfo.setStatus("paying");
orderInfo.setPayOrderNo(payment.getTradeNumber()); orderInfo.setPayOrderNo(payment.getTradeNumber());
@@ -310,13 +313,13 @@ public class TbPayServiceImpl implements TbPayService {
payment.setUpdatedAt(System.currentTimeMillis()); payment.setUpdatedAt(System.currentTimeMillis());
orderPaymentService.updateById(payment); orderPaymentService.updateById(payment);
return orderInfo;
} }
} }
} }
} }
throw new BadRequestException("支付失败");
return orderInfo;
} }

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

@@ -147,10 +147,12 @@ public class TbShopTableServiceImpl implements TbShopTableService {
} else if (tbCashierCartMapper.selectCount(new LambdaQueryWrapper<TbCashierCart>() } else if (tbCashierCartMapper.selectCount(new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, date.getShopId()) .eq(TbCashierCart::getShopId, date.getShopId())
.eq(TbCashierCart::getTableId, date.getQrcode()) .eq(TbCashierCart::getTableId, date.getQrcode())
.eq(TbCashierCart::getTradeDay, cn.ysk.cashier.utils.DateUtils.getDay())
.eq(TbCashierCart::getStatus, "create")) < 1 || (orderId != null && .eq(TbCashierCart::getStatus, "create")) < 1 || (orderId != null &&
tbOrderDetailMapper.selectCount(new LambdaQueryWrapper<TbOrderDetail>() tbOrderDetailMapper.selectCount(new LambdaQueryWrapper<TbOrderDetail>()
.eq(TbOrderDetail::getShopId, date.getShopId()) .eq(TbOrderDetail::getShopId, date.getShopId())
.eq(TbOrderDetail::getStatus, "unpaid") .eq(TbOrderDetail::getStatus, "unpaid")
.ge(TbOrderDetail::getCreateTime, DateUtil.beginOfDay(new Date()))
.eq(TbOrderDetail::getOrderId, orderId)) < 1) .eq(TbOrderDetail::getOrderId, orderId)) < 1)
) { ) {
date.setStatus("idle"); date.setStatus("idle");