Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(word): create word lists #322

Merged
merged 8 commits into from
Sep 3, 2023
Merged

feat(word): create word lists #322

merged 8 commits into from
Sep 3, 2023

Conversation

CapooL
Copy link
Collaborator

@CapooL CapooL commented Sep 3, 2023

No description provided.

CapooL and others added 8 commits August 6, 2023 00:22
商品和头衔过滤器bug修改完毕,传入参数不齐仍然可以运行
用户信息返回新增level,utils里新增折合等级函数

Closes e-dialect#316 e-dialect#315
1.修复了用户微信注册提示错误但注册成功的后端bug,但是有关头像的问题还未解决,可能需要前端
e-dialect#317
2.rewards模块下的orders、transactions、products查询均增加完整的分页器,但transactions模块还没法实现不同类型半角逗号隔开功能
e-dialect#312
3.utils里not_found修改之前写错的部分
4.修改一个小bug e-dialect#302

Closes e-dialect#314
Closes e-dialect#312
@lin594 lin594 changed the title feat: create word lists feat(word): create word lists Sep 3, 2023
@lin594
Copy link
Member

lin594 commented Sep 3, 2023

先合并,然后找错误)

@lin594 lin594 merged commit 93b0a1c into e-dialect:develop Sep 3, 2023
3 checks passed
lin594 pushed a commit that referenced this pull request Sep 3, 2023
* feat(pronunciation): add paginators to MC0205 (#305)

在PN0205接口中加入了分页器,添加了请求参数page和pageSize,扩展了Paginator类,使其能显示相邻页码数

* feat(tools):add tools and introductions (#303)

* feat: add filter

* feat:add tools and introduction

* refactor: Delete redundant code

* style: formate code

* style: formate code

* feat: add tools

完全不记得pr这件事了2333333

* style: rename file

* style(word): black migrations

---------

Co-authored-by: sheeplin <[email protected]>

* docs(test): update test README for CI  (#310)

* feat(rewards): init rewards module (#307)

* feat(user/rewards): creat rewards and add some information to users

user.models.py新增用户总积分、当前积分、积分变动时间、积分变动原因
user_all.py新增用户总积分、当前积分,新增(def)points_change返回用户积分变动记录
US0204
获取用户积分信息
US0205 获取用户积分变动记录
US0306 更改用户积分
新增积分商城板块rewards
RE0101
上传新商品
RE0102	删除商品
RE0103	更新商品信息
RE0104	获取指定商品信息
RE0105	上传新头衔
RE0106	删除头衔
RE0107	更新头衔信息
RE0108	获取指定头衔信息


* feat(user/rewards/article/word/quiz): reformat the code and add some functions

一、重构rewards代码,分为products、titles、orders、transactions四个模块
二、utils新增:
①积分折合头衔,根据points_sum折合头衔,在user_all时返回头衔,头衔的信息待定可改
②新增generate_id,用于rewards里四个模块的特定递增id生成,如(JL000001)
③将积分增减和交易记录功能写在Rewards_action里,功能已经用于贡献语音、题库等模块
三、新增orders模块用于处理订单信息


* refactor: reorganize migrations

* style: refactor migrations

* refactor(rewards): rename models

* style: reformat for black

* style: reformat for latest black

* fix(order): fix points_change

* style(order): reformat for black

* tests(orders): fix orders_403.json

* fix(user): fix avatar uploading

* tests(user): fix user-US0301-200.json

* refactor: rename Forms

* fix(rewards): fix urls for rename

* style(rewards): rename some variables

改回了全局替换的部分
重新设计了加减积分和积分记录的结构

* style(rewards): rename some variables again

---------

Co-authored-by: sheeplin <[email protected]>

* fix(rewards): use optional args in filters (#318)

* fix(rewards): fix a bug about filter

商品和头衔过滤器bug修改完毕,传入参数不齐仍然可以运行
用户信息返回新增level,utils里新增折合等级函数

Closes #316 #315

* refactor(user): reformat for black

* fix(points): fix missing paginators (#320)

* fix(rewards): fix a bug about filter

商品和头衔过滤器bug修改完毕,传入参数不齐仍然可以运行
用户信息返回新增level,utils里新增折合等级函数

Closes #316 #315

* refactor(user): reformat for black

* fix(rewards/user): fix some bugs

1.修复了用户微信注册提示错误但注册成功的后端bug,但是有关头像的问题还未解决,可能需要前端
#317
2.rewards模块下的orders、transactions、products查询均增加完整的分页器,但transactions模块还没法实现不同类型半角逗号隔开功能
#312
3.utils里not_found修改之前写错的部分
4.修改一个小bug #302

Closes #314
Closes #312

* test(user): test: add a test file

* test(user): test: fix a test file

* revert #314

---------

Co-authored-by: sheeplin <[email protected]>

* reafactor(pronunciation): adjust notifications (#323)

* fix(pronunciation): format response message

* refactor(pronunciation): refactor ManageApproval

* refactor(pronunciation): manage one pronunciation

* refactor(pronunciation): add get by id function

* fix(pronunciation): fix token pass

* fix(pronunciation): split approval urls

* style: reformat for black

* feat(word): create word lists (#322)

* feat(word): create word lists
增加词单功能

* style(word): style: reformat for black

* revert #314

---------

Co-authored-by: sheeplin <[email protected]>
Co-authored-by: sheeplin <[email protected]>

---------

Co-authored-by: CapooL <[email protected]>
Co-authored-by: Norton_Lin <[email protected]>
Co-authored-by: Topology2333 <[email protected]>
@CapooL CapooL deleted the new branch September 7, 2023 07:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants