release-20260330 - 修改为手机开门,不扫码。

This commit is contained in:
2026-03-30 10:58:00 +08:00
parent 0d5c4af3a6
commit c0b011c098
13 changed files with 260 additions and 96 deletions

View File

@@ -187,7 +187,7 @@ public class ServerMessageHandlerAdapter implements MessageService {
BarcodeOrderTime lastOrder = barcodeOrderTimeMapper.findLastOrder(member.getId(), venueBarCode.getVenueId());
lastOrder.setLastOut(new Date());
// 不需要补交钱且需要退钱
if (lastOrder.getPayMoney() != null && lastOrder.getPayMoney() > 0) {
if (lastOrder.getPayMoney() != null && lastOrder.getPayMoney().compareTo(java.math.BigDecimal.ZERO) > 0) {
lastOrder.setModifiedTime(new Date());
}
barcodeOrderTimeMapper.updateByPrimaryKey(lastOrder);

View File

@@ -42,15 +42,14 @@ public class WxServiceTest {
MemberRefund memberRefund = new MemberRefund();
memberRefund.setMemberId(memberId);
memberRefund.setLessonId(1);
memberRefund.setMoney(order.getPrice());
// memberRefund.setMoney(new BigDecimal(0.01));
memberRefund.setMoney(new BigDecimal(0.01));
memberRefund.setOrderSn(orderSn);
memberRefund.setTransactionId(order.getTradeSn());
memberRefund.setOrderId(order.getId());
memberRefund.setOutRefundNo(orderService.createSn());//商户退款单号
memberRefund.setPlatformId(1);
memberRefundMapper.insert(memberRefund);
wechatPayService.refundInputMoney(memberRefund,new BigDecimal(0.01));
wechatPayService.refundInputMoney(memberRefund, order.getPrice(), new BigDecimal(0.01));
}