Merge branch 'devlop' into yongxu-dev

# Conflicts:
#	.cursor/skills/miniprogram-dev/SKILL.md   resolved by devlop version
#	miniprogram/pages/index/index.js   resolved by devlop version
#	miniprogram/pages/index/index.wxml   resolved by devlop version
#	miniprogram/pages/my/my.wxml   resolved by devlop version
#	miniprogram/pages/read/read.wxml   resolved by devlop version
#	miniprogram/pages/read/read.wxss   resolved by devlop version
#	soul-admin/dist/index.html   resolved by devlop version
#	soul-admin/src/pages/content/ChapterTree.tsx   resolved by devlop version
#	soul-admin/src/pages/content/ContentPage.tsx   resolved by devlop version
#	soul-admin/src/pages/distribution/DistributionPage.tsx   resolved by devlop version
#	soul-api/internal/handler/book.go   resolved by devlop version
#	soul-api/internal/handler/ckb.go   resolved by devlop version
#	soul-api/internal/handler/db_book.go   resolved by devlop version
#	soul-api/internal/handler/db_ckb_leads.go   resolved by devlop version
#	soul-api/internal/handler/db_person.go   resolved by devlop version
#	soul-api/internal/model/chapter.go   resolved by devlop version
This commit is contained in:
Alex-larget
2026-03-24 14:27:07 +08:00
470 changed files with 60847 additions and 3748 deletions

View File

@@ -167,7 +167,7 @@ func AdminWithdrawalsList(c *gin.Context) {
"amount": w.Amount, "status": st, "createdAt": w.CreatedAt,
"method": "wechat", "account": account,
"userConfirmedAt": userConfirmedAt,
"remark": remark,
"remark": remark,
})
}
@@ -325,10 +325,10 @@ func AdminWithdrawalsAction(c *gin.Context) {
switch body.Action {
case "reject":
err := db.Model(&model.Withdrawal{}).Where("id = ?", body.ID).Updates(map[string]interface{}{
"status": "failed",
"error_message": reason,
"fail_reason": reason,
"processed_at": now,
"status": "failed",
"error_message": reason,
"fail_reason": reason,
"processed_at": now,
}).Error
if err != nil {
c.JSON(http.StatusOK, gin.H{"success": false, "error": err.Error()})