Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
张松
2025-01-06 16:51:06 +08:00
9 changed files with 134 additions and 107 deletions

View File

@@ -113,7 +113,7 @@ public class WuyouController {
payDetailsDao.insert(payDetails);
} else {
payDetails.setTradeNo(AliPayOrderUtil.createOrderId());
payDetailsDao.updateById(payDetails);
payDetailsDao.update(payDetails, new LambdaQueryWrapper<PayDetails>().eq(PayDetails::getId, payDetails.getId()).eq(PayDetails::getUserId, payDetails.getUserId()));
}
if (order.getPayMoney().compareTo(BigDecimal.ZERO) == 0) {