Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
S
service
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • aimeiyue
  • service
  • Merge Requests
  • !1

Open
Opened Mar 24, 2025 by lizhilin@lizhilin 
  • Report abuse
Report abuse

历史提交

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b yink origin/yink

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff yink

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 0
  • Commits 28
  • Changes 99
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • liuyingkang @liuyingkang

    added 1 commit

    • e7fb63e2 - 测试

    Compare with previous version

    Mar 24, 2025

    added 1 commit

    • e7fb63e2 - 测试

    Compare with previous version

    added 1 commit * e7fb63e2 - 测试 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=562&start_sha=172ca9a153e10b8c7bd8de510718c1414bfb75a1)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 1 commit

    • 0abbcdec - 对账单下载对接50%

    Compare with previous version

    Mar 24, 2025

    added 1 commit

    • 0abbcdec - 对账单下载对接50%

    Compare with previous version

    added 1 commit * 0abbcdec - 对账单下载对接50% [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=563&start_sha=e7fb63e23bbb1d79efa21a5b982c8c698461c541)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 1 commit

    • a38e0337 - 对账单下载

    Compare with previous version

    Mar 25, 2025

    added 1 commit

    • a38e0337 - 对账单下载

    Compare with previous version

    added 1 commit * a38e0337 - 对账单下载 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=564&start_sha=0abbcdec758ddefdf7489de8f58bb19765c629e7)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 1 commit

    • 914a049f - refactor(日志和分账): 优化日志记录和分账逻辑

    Compare with previous version

    Apr 02, 2025

    added 1 commit

    • 914a049f - refactor(日志和分账): 优化日志记录和分账逻辑

    Compare with previous version

    added 1 commit * 914a049f - refactor(日志和分账): 优化日志记录和分账逻辑 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=566&start_sha=a38e0337d915e46449ceeeb6a7844c652aa320f6)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 1 commit

    • 53940f55 - feat: 添加手动分账功能并更新订单导出功能

    Compare with previous version

    Apr 27, 2025

    added 1 commit

    • 53940f55 - feat: 添加手动分账功能并更新订单导出功能

    Compare with previous version

    added 1 commit * 53940f55 - feat: 添加手动分账功能并更新订单导出功能 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=579&start_sha=914a049f4ea62dd25f54c63aecd291d0fe4ea9a6)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 1 commit

    • 75115354 - 2025-04-27更新分账逻辑备份

    Compare with previous version

    Apr 27, 2025

    added 1 commit

    • 75115354 - 2025-04-27更新分账逻辑备份

    Compare with previous version

    added 1 commit * 75115354 - 2025-04-27更新分账逻辑备份 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=580&start_sha=53940f557f70f55f371ce956fa7c194fa4b4faf1)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 1 commit

    • 523cc838 - feat(订单): 新增积分支付功能并优化订单处理逻辑

    Compare with previous version

    Apr 30, 2025

    added 1 commit

    • 523cc838 - feat(订单): 新增积分支付功能并优化订单处理逻辑

    Compare with previous version

    added 1 commit * 523cc838 - feat(订单): 新增积分支付功能并优化订单处理逻辑 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=583&start_sha=751153544fa877e4f1cc90c6c62bb57f07be871d)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 1 commit

    • 5ab76182 - feat: 新增员工管理功能并优化日志处理

    Compare with previous version

    May 01, 2025

    added 1 commit

    • 5ab76182 - feat: 新增员工管理功能并优化日志处理

    Compare with previous version

    added 1 commit * 5ab76182 - feat: 新增员工管理功能并优化日志处理 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=585&start_sha=523cc838a6250406a982f3bb56fdc0da9391fa0e)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 1 commit

    • 657119da - feat: 添加订单退款功能并优化积分解冻逻辑

    Compare with previous version

    May 02, 2025

    added 1 commit

    • 657119da - feat: 添加订单退款功能并优化积分解冻逻辑

    Compare with previous version

    added 1 commit * 657119da - feat: 添加订单退款功能并优化积分解冻逻辑 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=586&start_sha=5ab7618218f197bd98da568bc0c0cccc3ee6b239)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 1 commit

    • 033d5f6c - feat: 新增用户积分列表和员工绑定用户列表接口

    Compare with previous version

    May 02, 2025

    added 1 commit

    • 033d5f6c - feat: 新增用户积分列表和员工绑定用户列表接口

    Compare with previous version

    added 1 commit * 033d5f6c - feat: 新增用户积分列表和员工绑定用户列表接口 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=587&start_sha=657119da1614ca77aff1e69a970127bfb6afa0de)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 1 commit

    • aa4189f3 - refactor: 优化用户积分计算逻辑并调整商品价格计算方式

    Compare with previous version

    May 16, 2025

    added 1 commit

    • aa4189f3 - refactor: 优化用户积分计算逻辑并调整商品价格计算方式

    Compare with previous version

    added 1 commit * aa4189f3 - refactor: 优化用户积分计算逻辑并调整商品价格计算方式 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=588&start_sha=033d5f6c16a8b905c867f20670c4d8bb7c8b3d51)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 2 commits

    • c038de20 - feat: 添加用户积分记录管理功能
    • c360f1d5 - fix: 修复API接口错误并优化代码

    Compare with previous version

    May 16, 2025

    added 2 commits

    • c038de20 - feat: 添加用户积分记录管理功能
    • c360f1d5 - fix: 修复API接口错误并优化代码

    Compare with previous version

    added 2 commits * c038de20 - feat: 添加用户积分记录管理功能 * c360f1d5 - fix: 修复API接口错误并优化代码 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=589&start_sha=aa4189f38cd28bec35d6467a07f48240b9982275)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 1 commit

    • d75710c0 - fix: 修复订单状态、积分解冻及分账逻辑

    Compare with previous version

    May 19, 2025

    added 1 commit

    • d75710c0 - fix: 修复订单状态、积分解冻及分账逻辑

    Compare with previous version

    added 1 commit * d75710c0 - fix: 修复订单状态、积分解冻及分账逻辑 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=590&start_sha=c360f1d5d0619343454d72538816f76e77173057)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 2 commits

    • ea6c7efb - feat: 新增支付记录功能并优化订单管理
    • 758d00b5 - feat: 添加汇付个人用户管理功能并优化分账逻辑

    Compare with previous version

    May 21, 2025

    added 2 commits

    • ea6c7efb - feat: 新增支付记录功能并优化订单管理
    • 758d00b5 - feat: 添加汇付个人用户管理功能并优化分账逻辑

    Compare with previous version

    added 2 commits * ea6c7efb - feat: 新增支付记录功能并优化订单管理 * 758d00b5 - feat: 添加汇付个人用户管理功能并优化分账逻辑 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=591&start_sha=d75710c002c653ad7e9a19707bec24090b6b229f)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 1 commit

    • f977d088 - refactor: 优化订单分佣逻辑和日志记录

    Compare with previous version

    May 21, 2025

    added 1 commit

    • f977d088 - refactor: 优化订单分佣逻辑和日志记录

    Compare with previous version

    added 1 commit * f977d088 - refactor: 优化订单分佣逻辑和日志记录 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=592&start_sha=758d00b54739b02a791295fb925c07aa3cb1866c)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 1 commit

    • 0f1a9aa9 - refactor(OrderInfoController, OrderDivideRecordController): 优化筛选条件查询和字段映射

    Compare with previous version

    May 21, 2025

    added 1 commit

    • 0f1a9aa9 - refactor(OrderInfoController, OrderDivideRecordController): 优化筛选条件查询和字段映射

    Compare with previous version

    added 1 commit * 0f1a9aa9 - refactor(OrderInfoController, OrderDivideRecordController): 优化筛选条件查询和字段映射 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=593&start_sha=f977d0886a8f58490ebffe7d144f2d9d847480fe)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 1 commit

    • 829e82b3 - feat: 在多个控制器中添加新字段和功能

    Compare with previous version

    May 22, 2025

    added 1 commit

    • 829e82b3 - feat: 在多个控制器中添加新字段和功能

    Compare with previous version

    added 1 commit * 829e82b3 - feat: 在多个控制器中添加新字段和功能 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=594&start_sha=0f1a9aa97c5c3fcd7d85b67c18bb1065a56260eb)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 2 commits

    • 60a190ca - refactor: 优化订单处理和分账逻辑
    • 232aea23 - refactor: 优化代码逻辑和样式,修复错误

    Compare with previous version

    May 23, 2025

    added 2 commits

    • 60a190ca - refactor: 优化订单处理和分账逻辑
    • 232aea23 - refactor: 优化代码逻辑和样式,修复错误

    Compare with previous version

    added 2 commits * 60a190ca - refactor: 优化订单处理和分账逻辑 * 232aea23 - refactor: 优化代码逻辑和样式,修复错误 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=595&start_sha=829e82b3966a62680c13a4bec28faaf074237952)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 2 commits

    • 0e86f962 - refactor: 移除多余空行并优化代码结构
    • ebe2fd7a - fix: 修复多处逻辑错误和优化代码

    Compare with previous version

    May 26, 2025

    added 2 commits

    • 0e86f962 - refactor: 移除多余空行并优化代码结构
    • ebe2fd7a - fix: 修复多处逻辑错误和优化代码

    Compare with previous version

    added 2 commits * 0e86f962 - refactor: 移除多余空行并优化代码结构 * ebe2fd7a - fix: 修复多处逻辑错误和优化代码 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=597&start_sha=232aea237a4dcefaa0a1297a870c6366a0747823)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 2 commits

    • e2fa1c48 - fix(结算账户): 修复商家角色结算账户查询和删除逻辑
    • 1328dacb - fix: 修正变量名拼写错误

    Compare with previous version

    May 26, 2025

    added 2 commits

    • e2fa1c48 - fix(结算账户): 修复商家角色结算账户查询和删除逻辑
    • 1328dacb - fix: 修正变量名拼写错误

    Compare with previous version

    added 2 commits * e2fa1c48 - fix(结算账户): 修复商家角色结算账户查询和删除逻辑 * 1328dacb - fix: 修正变量名拼写错误 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=598&start_sha=ebe2fd7ae35d6ecbe902e79f15aee51d4e4405ea)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 1 commit

    • 20ab9b18 - fix: 修复订单分佣记录显示及库存验证问题

    Compare with previous version

    Jun 04, 2025

    added 1 commit

    • 20ab9b18 - fix: 修复订单分佣记录显示及库存验证问题

    Compare with previous version

    added 1 commit * 20ab9b18 - fix: 修复订单分佣记录显示及库存验证问题 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=601&start_sha=1328dacb232a900103cc496ec62244926b0141c5)
    Toggle commit list
  • liuyingkang @liuyingkang

    added 1 commit

    • 762c96ed - feat(订单分佣): 优化商户分佣记录统计逻辑和展示

    Compare with previous version

    Jun 06, 2025

    added 1 commit

    • 762c96ed - feat(订单分佣): 优化商户分佣记录统计逻辑和展示

    Compare with previous version

    added 1 commit * 762c96ed - feat(订单分佣): 优化商户分佣记录统计逻辑和展示 [Compare with previous version](http://git.nyinhong.com/aimeiyue/service/merge_requests/1/diffs?diff_id=602&start_sha=20ab9b186f6d76756649beb52684a8724f161372)
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: aimeiyue/service!1