fix: 设备最后上数时间,新增字段,接口调用,小程序显示。

This commit is contained in:
tianyongbao
2026-06-04 13:53:30 +08:00
parent 2596fe6551
commit f4bd1c6942
13 changed files with 259 additions and 0 deletions

View File

@@ -262,6 +262,7 @@ public class WeixinController extends BaseController {
// 9. 构建返回结果
WxPayOrderVo result = new WxPayOrderVo();
result.setPrepayId(prepayId);
result.setOutTradeNumber(order.getOutTradeNumber());
result.setTotalAmount(order.getTotalAmount());
result.setTimestamp(payParams.get("timeStamp"));
result.setNonceStr(payParams.get("nonceStr"));
@@ -278,6 +279,27 @@ public class WeixinController extends BaseController {
}
}
@Operation(summary = "主动确认微信支付订单")
@PostMapping("/pay/confirm_order")
public R<Boolean> confirmOrder(@RequestBody Map<String, String> request) {
try {
if (payOrderBusinessService == null) {
return R.fail("支付服务未启用");
}
String outTradeNumber = request != null ? request.get("outTradeNumber") : null;
if (outTradeNumber == null || outTradeNumber.isEmpty()) {
return R.fail("商户订单号不能为空");
}
boolean success = payOrderBusinessService.confirmPaidOrder(outTradeNumber);
return success ? R.ok(true) : R.fail("订单未支付成功或确认失败");
} catch (Exception e) {
log.error("确认支付订单失败", e);
return R.fail("确认支付订单失败: " + e.getMessage());
}
}
@Operation(summary = "微信支付回调通知")
@PostMapping("/pay_notify")
public Map<String, String> payNotify(