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

fix(points): fix missing paginators #320

Merged
merged 7 commits into from
Sep 3, 2023
Merged

fix(points): fix missing paginators #320

merged 7 commits into from
Sep 3, 2023

Conversation

CapooL
Copy link
Collaborator

@CapooL CapooL commented Aug 31, 2023

Closes #312
close #302

CapooL added 5 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
Copy link
Member

lin594 commented Aug 31, 2023

你把 close #314 close #312 放到PR的描述里
以及你这个当时开分支的时候没处理好hhh

@CapooL
Copy link
Collaborator Author

CapooL commented Aug 31, 2023

我现在分支也乱,代码那边也有地方卡住,有点想全删了重来

@lin594
Copy link
Member

lin594 commented Aug 31, 2023

我现在分支也乱,代码那边也有地方卡住,有点想全删了重来

不至于删掉重来,你可以从主分支那里重新fork,然后呢把有效改动一点一点粘贴过去

@CapooL
Copy link
Collaborator Author

CapooL commented Aug 31, 2023

image
image
这个我已经删了
image
apifox里也删了,我再看看为什么会报错

@lin594
Copy link
Member

lin594 commented Aug 31, 2023

image image 这个我已经删了 image apifox里也删了,我再看看为什么会报错

测试用例里这个接口有没有同步?、 有可能接口里删了,但是当时这个测试用例里没有自动同步,所以哪怕你重新导出也还是包含了这个东西

@lin594
Copy link
Member

lin594 commented Aug 31, 2023

测试用例里这个接口有没有同步?、 有可能接口里删了,但是当时这个测试用例里没有自动同步,所以哪怕你重新导出也还是包含了这个东西

现在是 Apifox 的测试用例仍然认为你需要有 listend 这个字段,但实际上不应该有
你的重新导出你可以从 git 里看出差异,显然没有删除对于这个 listend 的监听需求

@CapooL
Copy link
Collaborator Author

CapooL commented Aug 31, 2023

image
这部分算监听需求吗,我看了一下都同步了,自动化测试用例返回的数据也没有listened

@lin594
Copy link
Member

lin594 commented Aug 31, 2023 via email

Copy link
Member

@lin594 lin594 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

哪怕一不小心写到同一个分支里,分成不同的commit来提交就还有抢救的机会

@lin594 lin594 changed the title fix: fix some bugs fix(points): fix missing paginators Sep 3, 2023
@lin594 lin594 merged commit 531be2e 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 bug branch September 7, 2023 07:56
@lin594 lin594 linked an issue Sep 15, 2023 that may be closed by this pull request
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.

微信小程序注册bug RE0302真正实现筛选功能 管理页面修改拼音上限只有30
2 participants