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
02 Oct, 2023
4 commits
  • trade:新增是否自提的配置项
    1f910992
    YunaiV authored
    2023-10-02 21:18:52 +0800  
    Browse Dir »
  • trade:优化运费模版的实现
    fdb10aec
    YunaiV authored
    2023-10-02 18:30:14 +0800  
    Browse Dir »
  • trade:完善退款详情
    6f4c04d9
    YunaiV authored
    2023-10-02 15:44:41 +0800  
    Browse Dir »
  • trade:完善订单详情
    0c1f5c95
    YunaiV authored
    2023-10-02 10:34:52 +0800  
    Browse Dir »

01 Oct, 2023
7 commits
  • code review:积分、优惠劵、佣金等逻辑
    d4417d24
    YunaiV authored
    2023-10-01 23:31:07 +0800  
    Browse Dir »
  • Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pr… ...
    057952bd
    …o into feature/mall_product
    
    # Conflicts:
    #	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
    YunaiV authored
    2023-10-01 22:00:31 +0800  
    Browse Dir »
  • trade:优化订单列表的查询
    b74169ac
    YunaiV authored
    2023-10-01 21:59:51 +0800  
    Browse Dir »
  • 交易:增加 积分抵扣计算器 单元测试
    abfebebd
    owen authored
    2023-10-01 17:12:33 +0800  
    Browse Dir »
  • 交易:增加 赠送积分计算器 单元测试
    afd306a7
    owen authored
    2023-10-01 16:23:41 +0800  
    Browse Dir »
  • 会员:会员配置的积分相关字段加上point前缀
    2168145c
    owen authored
    2023-10-01 10:41:21 +0800  
    Browse Dir »
  • 会员:积分配置改为会员配置
    ab35fcbe
    owen authored
    2023-10-01 10:25:18 +0800  
    Browse Dir »

30 Sep, 2023
15 commits
  • Review代码修改
    a04a3a27
    owen authored
    2023-09-30 23:41:11 +0800  
    Browse Dir »
  • Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
    d3f03540
    puhui999 authored
    2023-09-30 23:35:19 +0800  
    Browse Dir »
  • 订单:完善拼团活动
    82210a95
    puhui999 authored
    2023-09-30 23:34:45 +0800  
    Browse Dir »
  • 分销:重构下级分销统计
    7d68bdc7
    owen authored
    2023-09-30 23:30:06 +0800  
    Browse Dir »
  • common:LocalDateTimeUtils 增加方法:月份开始时间、月份结束时间
    cafa938f
    owen authored
    2023-09-30 22:21:47 +0800  
    Browse Dir »
  • Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
    e7876b15
    owen authored
    2023-09-30 22:09:49 +0800  
    Browse Dir »
  • 优惠券:重构是否领取检查方式
    d2c5eaf9
    owen authored
    2023-09-30 22:05:11 +0800  
    Browse Dir »
  • 分销:修改佣金排名查询算法
    aaa01de2
    owen authored
    2023-09-30 19:55:18 +0800  
    Browse Dir »
  • 优惠券:新增/修改时,校验对应的商品、分类是否存在
    d0d21b27
    owen authored
    2023-09-30 19:39:02 +0800  
    Browse Dir »
  • 交易:订单增加字段 推广人编号
    42a899c5
    owen authored
    2023-09-30 17:49:38 +0800  
    Browse Dir »
  • 优惠券:新人券使用 MQ 发放
    fc432ba0
    owen authored
    2023-09-30 17:29:32 +0800  
    Browse Dir »
  • code review:数据统计
    367b45e3
    YunaiV authored
    2023-09-30 12:30:01 +0800  
    Browse Dir »
  • Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product ...
    597eacaa
    # Conflicts:
    #	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
    #	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
    puhui999 authored
    2023-09-30 11:35:51 +0800  
    Browse Dir »
  • 订单:完善拼团活动部分 TODO
    0b35d4a7
    puhui999 authored
    2023-09-30 11:27:24 +0800  
    Browse Dir »
  • 订单:添加 order handler 默认抽象实现类,子类可以选择性地实现抽象方法,而不必实现所有方法
    5ecd0d94
    puhui999 authored
    2023-09-30 11:24:52 +0800  
    Browse Dir »

29 Sep, 2023
8 commits
  • Review代码修改
    6b7f0719
    owen authored
    2023-09-29 22:47:04 +0800  
    Browse Dir »
  • 错误码分段
    26628913
    owen authored
    2023-09-29 21:34:38 +0800  
    Browse Dir »
  • Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
    929ff428
    owen authored
    2023-09-29 21:08:49 +0800  
    Browse Dir »
  • 统计:交易统计
    171161e6
    owen authored
    2023-09-29 21:08:15 +0800  
    Browse Dir »
  • promotion:增加 coupon 的 code review
    9ee0aebd
    YunaiV authored
    2023-09-29 20:52:11 +0800  
    Browse Dir »
  • trade:退款理由的维护
    666ba351
    YunaiV authored
    2023-09-29 13:35:40 +0800  
    Browse Dir »
  • trade:补全售后日志的记录
    3c643f81
    YunaiV authored
    2023-09-29 11:46:43 +0800  
    Browse Dir »
  • trade:优化售后取消订单的实现代码
    d402bdb7
    YunaiV authored
    2023-09-29 10:08:20 +0800  
    Browse Dir »

28 Sep, 2023
6 commits
  • code review:分佣剩余部分的 review
    f9bf41d7
    YunaiV authored
    2023-09-28 22:22:38 +0800  
    Browse Dir »
  • code review:解决分佣的 npe 问题
    b1ce971a
    YunaiV authored
    2023-09-28 16:39:07 +0800  
    Browse Dir »
  • 同步 master 分支代码
    9cd36abf
    YunaiV authored
    2023-09-28 15:28:40 +0800  
    Browse Dir »
  • Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product ...
    5913ee07
    # Conflicts:
    #	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
    #	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
    #	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
    #	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
    #	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
    #	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
    #	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
    #	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
    #	yudao-server/src/main/resources/application-local.yaml
    YunaiV authored
    2023-09-28 15:18:59 +0800  
    Browse Dir »
  • trade:微调交易配置的注释
    eeb8873b
    YunaiV authored
    2023-09-28 15:10:56 +0800  
    Browse Dir »
  • code review:优惠劵逻辑
    9e3564bd
    YunaiV authored
    2023-09-28 09:23:42 +0800  
    Browse Dir »