完善 订单处理，以及 优化 ui

model/option.go

@@ -84,6 +84,7 @@ func InitOptionMap() {
 	common.OptionMap["CreemApiKey"] = setting.CreemApiKey
 	common.OptionMap["CreemProducts"] = setting.CreemProducts
 	common.OptionMap["CreemTestMode"] = strconv.FormatBool(setting.CreemTestMode)
+	common.OptionMap["CreemWebhookSecret"] = setting.CreemWebhookSecret
 	common.OptionMap["TopupGroupRatio"] = common.TopupGroupRatio2JSONString()
 	common.OptionMap["Chats"] = setting.Chats2JsonString()
 	common.OptionMap["AutoGroups"] = setting.AutoGroups2JsonString()
@@ -335,6 +336,8 @@ func updateOptionMap(key string, value string) (err error) {
 		setting.CreemProducts = value
 	case "CreemTestMode":
 		setting.CreemTestMode = value == "true"
+	case "CreemWebhookSecret":
+		setting.CreemWebhookSecret = value
 	case "TopupGroupRatio":
 		err = common.UpdateTopupGroupRatioByJSONString(value)
 	case "GitHubClientId":

model/topup.go

@@ -99,7 +99,7 @@ func Recharge(referenceId string, customerId string) (err error) {
 	return nil
 }
 
-func RechargeCreem(referenceId string) (err error) {
+func RechargeCreem(referenceId string, customerEmail string, customerName string) (err error) {
 	if referenceId == "" {
 		return errors.New("未提供支付单号")
 	}
@@ -131,7 +131,29 @@ func RechargeCreem(referenceId string) (err error) {
 
 		// Creem 直接使用 Amount 作为充值额度
 		quota = float64(topUp.Amount)
-		err = tx.Model(&User{}).Where("id = ?", topUp.UserId).Update("quota", gorm.Expr("quota + ?", quota)).Error
+
+		// 构建更新字段，优先使用邮箱，如果邮箱为空则使用用户名
+		updateFields := map[string]interface{}{
+			"quota": gorm.Expr("quota + ?", quota),
+		}
+
+		// 如果有客户邮箱，尝试更新用户邮箱（仅当用户邮箱为空时）
+		if customerEmail != "" {
+			// 先检查用户当前邮箱是否为空
+			var user User
+			err = tx.Where("id = ?", topUp.UserId).First(&user).Error
+			if err != nil {
+				return err
+			}
+
+			// 如果用户邮箱为空，则更新为支付时使用的邮箱
+			if user.Email == "" {
+				updateFields["email"] = customerEmail
+				fmt.Printf("更新用户邮箱：用户ID %d, 新邮箱 %s\n", topUp.UserId, customerEmail)
+			}
+		}
+
+		err = tx.Model(&User{}).Where("id = ?", topUp.UserId).Updates(updateFields).Error
 		if err != nil {
 			return err
 		}
@@ -143,7 +165,7 @@ func RechargeCreem(referenceId string) (err error) {
 		return errors.New("充值失败，" + err.Error())
 	}
 
-	RecordLog(topUp.UserId, LogTypeTopup, fmt.Sprintf("使用Creem充值成功，充值额度: %v，支付金额：%.2f", common.FormatQuota(int(quota)), topUp.Money))
+	RecordLog(topUp.UserId, LogTypeTopup, fmt.Sprintf("使用Creem充值成功，充值额度: %v，支付金额：%.2f，客户邮箱：%s", common.FormatQuota(int(quota)), topUp.Money, customerEmail))
 
 	return nil
 }

setting/payment_creem.go

@@ -3,3 +3,4 @@ package setting
 var CreemApiKey = ""
 var CreemProducts = "[]"
 var CreemTestMode = false
+var CreemWebhookSecret = ""

web/src/components/settings/PaymentSetting.js

@@ -28,6 +28,7 @@ const PaymentSetting = () => {
     StripeMinTopUp: 1,
 
     CreemApiKey: '',
+    CreemWebhookSecret: '',
     CreemProducts: '[]',
   });
 

web/src/pages/Setting/Payment/SettingsPaymentGatewayCreem.js

@@ -27,6 +27,7 @@ export default function SettingsPaymentGatewayCreem(props) {
     const [loading, setLoading] = useState(false);
     const [inputs, setInputs] = useState({
         CreemApiKey: '',
+        CreemWebhookSecret: '',
         CreemProducts: '[]',
         CreemTestMode: false,
     });
@@ -47,6 +48,7 @@ export default function SettingsPaymentGatewayCreem(props) {
         if (props.options && formApiRef.current) {
             const currentInputs = {
                 CreemApiKey: props.options.CreemApiKey || '',
+                CreemWebhookSecret: props.options.CreemWebhookSecret || '',
                 CreemProducts: props.options.CreemProducts || '[]',
                 CreemTestMode: props.options.CreemTestMode === 'true',
             };
@@ -77,6 +79,10 @@ export default function SettingsPaymentGatewayCreem(props) {
                 options.push({ key: 'CreemApiKey', value: inputs.CreemApiKey });
             }
 
+            if (inputs.CreemWebhookSecret && inputs.CreemWebhookSecret !== '') {
+                options.push({ key: 'CreemWebhookSecret', value: inputs.CreemWebhookSecret });
+            }
+
             // Save test mode setting
             options.push({ key: 'CreemTestMode', value: inputs.CreemTestMode ? 'true' : 'false' });
 
@@ -243,7 +249,7 @@ export default function SettingsPaymentGatewayCreem(props) {
                     />
 
                     <Row gutter={{ xs: 8, sm: 16, md: 24, lg: 24, xl: 24, xxl: 24 }}>
-            <Col xs={24} sm={24} md={12} lg={12} xl={12}>
+                        <Col xs={24} sm={24} md={8} lg={8} xl={8}>
                             <Form.Input
                                 field='CreemApiKey'
                                 label={t('API 密钥')}
@@ -251,11 +257,19 @@ export default function SettingsPaymentGatewayCreem(props) {
                                 type='password'
                             />
                         </Col>
-            <Col xs={24} sm={24} md={12} lg={12} xl={12}>
+                        <Col xs={24} sm={24} md={8} lg={8} xl={8}>
+                            <Form.Input
+                                field='CreemWebhookSecret'
+                                label={t('Webhook 密钥')}
+                                placeholder={t('用于验证 Webhook 请求的密钥，敏感信息不显示')}
+                                type='password'
+                            />
+                        </Col>
+                        <Col xs={24} sm={24} md={8} lg={8} xl={8}>
                             <Form.Switch
                                 field='CreemTestMode'
                                 label={t('测试模式')}
-                extraText={t('启用后将使用 Creem 测试环境，可使用测试卡号 4242 4242 4242 4242 进行测试')}
+                                extraText={t('启用后将使用 Creem Test Mode')}
                             />
                         </Col>
                     </Row>