Logo white

BJ_ZTEITS-Developers / parking-cloud-yudao

Sign in
  • Sign in
  • Project
  • Files
  • Commits
  • Network
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Labels
  • Wiki
  • Commits 11,213
  • Compare
  • Branches 1
  • Tags 0
  • parking-cloud-yudao
  • yudao-module-mall
17 Oct, 2023
2 commits
  • Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product ...
    b1e01290
    # Conflicts:
    #	sql/mysql/statistics.sql
    owen authored
    2023-10-17 16:13:46 +0800  
    Browse Dir »
  • 交易:订单核销
    5e65512a
    owen authored
    2023-10-17 16:09:37 +0800  
    Browse Dir »

16 Oct, 2023
20 commits
  • code review:数据统计
    d842708c
    YunaiV authored
    2023-10-16 23:42:54 +0800  
    Browse Dir »
  • code review:文章管理
    1ff9bc6a
    YunaiV authored
    2023-10-16 22:51:19 +0800  
    Browse Dir »
  • 统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
    b89ae001
    owen authored
    2023-10-16 22:09:20 +0800  
    Browse Dir »
  • 统计:Review修改
    7aa1ecce
    owen authored
    2023-10-16 22:03:37 +0800  
    Browse Dir »
  • !668 营销活动:完善文章相关 app 端接口,完善 review 提到的问题 ...
    cebdc190
    Merge pull request !668 from puhui999/feature/mall_product
    芋道源码 authored
    2023-10-16 13:55:47 +0000  
    Browse Dir »
  • 终端类型参数改为从Controller传入
    6fbb7d6d
    owen authored
    2023-10-16 21:01:01 +0800  
    Browse Dir »
  • code review:商城统计
    b6e63e88
    zhijiantianya@gmail.com authored
    2023-10-16 20:01:25 +0800  
    Browse Dir »
  • 营销活动:完善 review 提到的问题
    4273b8f0
    puhui999 authored
    2023-10-16 18:53:25 +0800  
    Browse Dir »
  • Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product ...
    01ef5f79
    # Conflicts:
    #	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/ArticleController.java
    #	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExcelVO.java
    #	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExportReqVO.java
    #	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/article/ArticleConvert.java
    #	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/article/ArticleMapper.java
    #	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleService.java
    #	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImpl.java
    #	yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImplTest.java
    puhui999 authored
    2023-10-16 17:47:17 +0800  
    Browse Dir »
  • 1. APP增加终端Header[terminal] ...
    76f512fc
    2. 订单、会员注册记录来源终端
    owen authored
    2023-10-16 15:06:59 +0800  
    Browse Dir »
  • 统计:会员终端统计接口实现
    b6d400e0
    owen authored
    2023-10-16 14:23:53 +0800  
    Browse Dir »
  • 统计:会员分析数据接口重构
    d3385dcb
    owen authored
    2023-10-16 13:52:00 +0800  
    Browse Dir »
  • 统计:处理会员性别统计,存在未知的情况
    8e35a786
    owen authored
    2023-10-16 13:25:15 +0800  
    Browse Dir »
  • 统计:处理会员地区统计,存在未知省份的情况
    4f731e99
    owen authored
    2023-10-16 13:20:11 +0800  
    Browse Dir »
  • 统计:Review修改
    bb82c631
    owen authored
    2023-10-16 13:00:14 +0800  
    Browse Dir »
  • Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
    ea810bb5
    owen authored
    2023-10-16 10:02:04 +0800  
    Browse Dir »
  • code review:文章管理
    7345933d
    YunaiV authored
    2023-10-16 09:57:57 +0800  
    Browse Dir »
  • Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
    df704024
    owen authored
    2023-10-16 09:55:17 +0800  
    Browse Dir »
  • 商城:增加商城首页
    f5dac38c
    owen authored
    2023-10-16 09:51:20 +0800  
    Browse Dir »
  • code review:拼团逻辑
    4359c584
    YunaiV authored
    2023-10-16 09:07:02 +0800  
    Browse Dir »

15 Oct, 2023
5 commits
  • 营销活动:完善文章相关 app 端接口
    0d45acaf
    puhui999 authored
    2023-10-15 22:41:18 +0800  
    Browse Dir »
  • 营销活动: 文章分类管理软件包调整
    26d36726
    puhui999 authored
    2023-10-15 16:40:27 +0800  
    Browse Dir »
  • Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
    1fe6c828
    puhui999 authored
    2023-10-15 16:17:14 +0800  
    Browse Dir »
  • 营销活动: 新增文章管理
    55eed137
    puhui999 authored
    2023-10-15 16:16:41 +0800  
    Browse Dir »
  • 营销活动: 新增文章分类管理
    a47ab328
    puhui999 authored
    2023-10-15 01:29:30 +0800  
    Browse Dir »

14 Oct, 2023
4 commits
  • 优化最新的商城的 sql
    ca5e3f7b
    YunaiV authored
    2023-10-14 22:00:30 +0800  
    Browse Dir »
  • 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files
    3110e427
    YunaiV authored
    2023-10-14 17:45:49 +0800  
    Browse Dir »
  • code review:交易统计
    970e5240
    YunaiV authored
    2023-10-14 13:15:14 +0800  
    Browse Dir »
  • code review:会员统计
    1ac2f2b5
    YunaiV authored
    2023-10-14 01:26:06 +0800  
    Browse Dir »

13 Oct, 2023
2 commits
  • Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pr… ...
    0eb86ca2
    …o into feature/mall_product
    
    # Conflicts:
    #	yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java
    YunaiV authored
    2023-10-13 20:41:17 +0800  
    Browse Dir »
  • 拼团活动: 完善 review 提到的问题
    a4613f0a
    puhui999 authored
    2023-10-13 12:07:28 +0800  
    Browse Dir »

12 Oct, 2023
1 commit
  • code review:修复部分统计报错
    a72869b9
    YunaiV authored
    2023-10-12 21:54:06 +0800  
    Browse Dir »

11 Oct, 2023
6 commits
  • 统计:Review修改
    4be709b8
    owen authored
    2023-10-11 15:26:17 +0800  
    Browse Dir »
  • code review:统计代码
    fef808d8
    YunaiV authored
    2023-10-11 12:32:28 +0800  
    Browse Dir »
  • Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pr… ...
    704087ce
    …o into feature/mall_product
    
    # Conflicts:
    #	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
    #	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
    YunaiV authored
    2023-10-11 11:30:03 +0800  
    Browse Dir »
  • code review:拼团记录流程
    670a098a
    YunaiV authored
    2023-10-11 11:04:22 +0800  
    Browse Dir »
  • Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
    8d40f1d7
    owen authored
    2023-10-11 08:27:57 +0800  
    Browse Dir »
  • 重构:将订单的分支流程,抽到 TradeOrderHandler 实现类中(补全各种排重逻辑)
    b0179457
    YunaiV authored
    2023-10-11 07:49:23 +0800  
    Browse Dir »