修复支付以及订单相关的问题

internal/service/client_order/service.go

@@ -418,7 +418,7 @@ func (s *Service) createForceRechargeOrder(
 		return nil, errors.Wrap(errors.CodeDatabaseError, err, "创建充值订单失败")
 	}
 
-	paymentNo := generateClientRechargeNo()
+	paymentNo := generateClientPaymentNo()
 	payment := &model.Payment{
 		PaymentNo:       paymentNo,
 		OrderID:         rechargeOrder.ID,
@@ -433,7 +433,7 @@ func (s *Service) createForceRechargeOrder(
 		return nil, errors.Wrap(errors.CodeDatabaseError, err, "创建支付记录失败")
 	}
 
-	paymentResult, err := paymentProvider.CreateJSAPIPayment(ctx, rechargeOrderNo, "余额充值", openID, int(rechargeOrder.Amount))
+	paymentResult, err := paymentProvider.CreateJSAPIPayment(ctx, paymentNo, "余额充值", openID, int(rechargeOrder.Amount))
 	if err != nil {
 		return nil, err
 	}
@@ -809,6 +809,10 @@ func generateClientRechargeNo() string {
 	return fmt.Sprintf("CRCH%d%06d", time.Now().UnixNano()/1e6, rand.Intn(1000000))
 }
 
+func generateClientPaymentNo() string {
+	return fmt.Sprintf("PAY%d%06d", time.Now().UnixNano()/1e6, rand.Intn(1000000))
+}
+
 // ListOrders 查询 C 端订单列表。
 func (s *Service) ListOrders(ctx context.Context, customerID uint, req *dto.ClientOrderListRequest) ([]dto.ClientOrderListItem, int64, error) {
 	skipCtx := context.WithValue(ctx, constants.ContextKeySubordinateShopIDs, []uint{})
@@ -1012,15 +1016,41 @@ func (s *Service) PayOrder(ctx context.Context, customerID uint, orderID uint, r
 			return nil, err
 		}
 
-		// 记录本次支付使用的微信配置，供支付回调验签使用
-		if err := s.db.WithContext(skipCtx).Model(&model.Order{}).
-			Where("id = ?", orderID).
-			Update("payment_config_id", activeConfig.ID).Error; err != nil {
-			return nil, errors.Wrap(errors.CodeDatabaseError, err, "更新订单支付配置失败")
+		paymentNo := generateClientPaymentNo()
+		payment := &model.Payment{
+			PaymentNo:       paymentNo,
+			OrderID:         order.ID,
+			OrderType:       model.PaymentOrderTypePackage,
+			PaymentMethod:   model.PaymentByWechat,
+			Amount:          order.TotalAmount,
+			Status:          model.PaymentRecordStatusPending,
+			PaymentConfigID: &activeConfig.ID,
 		}
 
-		paymentResult, err := paymentProvider.CreateJSAPIPayment(skipCtx, order.OrderNo, "套餐购买", openID, int(order.TotalAmount))
+		if err := s.db.WithContext(skipCtx).Transaction(func(tx *gorm.DB) error {
+			// 订单仍保留最近一次支付配置，兼容旧 ORD 回调。
+			if err := tx.Model(&model.Order{}).
+				Where("id = ?", orderID).
+				Update("payment_config_id", activeConfig.ID).Error; err != nil {
+				return errors.Wrap(errors.CodeDatabaseError, err, "更新订单支付配置失败")
+			}
+			if err := s.paymentStore.CreateWithTx(skipCtx, tx, payment); err != nil {
+				return errors.Wrap(errors.CodeDatabaseError, err, "创建支付记录失败")
+			}
+			return nil
+		}); err != nil {
+			return nil, err
+		}
+
+		paymentResult, err := paymentProvider.CreateJSAPIPayment(skipCtx, paymentNo, "套餐购买", openID, int(order.TotalAmount))
 		if err != nil {
+			if updateErr := s.paymentStore.UpdateStatus(skipCtx, payment.ID, model.PaymentRecordStatusFailed); updateErr != nil {
+				s.logger.Warn("标记支付记录失败状态失败",
+					zap.Uint("payment_id", payment.ID),
+					zap.String("payment_no", paymentNo),
+					zap.Error(updateErr),
+				)
+			}
 			return nil, err
 		}
 		return &dto.ClientPayOrderResponse{