Merge remote-tracking branch 'origin/wyn-课程表' into wyn

# Conflicts: # src/main/java/com/peanut/modules/common/service/CourseMedicineService.java
2026-05-19 10:42:00 +08:00
parent 032b16aba5 7e39f3f5f9
commit 24264b82ff
6 changed files with 22 additions and 10 deletions
--- a/src/main/java/com/peanut/modules/common/controller/UserVipController.java
+++ b/src/main/java/com/peanut/modules/common/controller/UserVipController.java
@@ -405,6 +405,7 @@ public class UserVipController {
        String timeId = IdWorker.getTimeId().substring(0, 32);
        buyOrder.setOrderSn(timeId);
        buyOrder.setUserId(uid);
+        buyOrder.setPaymentDate(new Date());
        buyOrderService.save(buyOrder);
        BigDecimal totalPrice = buyOrder.getRealMoney();
        if (Constants.PAYMENT_METHOD_VIRTUAL.equals(buyOrder.getPaymentMethod())) {