owen
|
9856e17974
|
分销：根据商品，计算推广员可以得到的佣金
|
3 years ago |
dhb52
|
96d4e7bc56
|
fix: 需要填充错误信息中的参数
|
3 years ago |
YunaiV
|
ffdaf3a859
|
bpm：简化流程驳回的逻辑实现，提升可读性
|
3 years ago |
|
owen
|
e9fd377772
|
分销：Review代码修改
|
3 years ago |
xingyu
|
63fee66657
|
chore: update okio fix minio bug
|
3 years ago |
|
xingyu
|
cfec4b12ca
|
docs: update springboot 2.7.16
|
3 years ago |
|
xingyu
|
13f135abe9
|
chore: update deps
|
3 years ago |
|
xingyu
|
a98a7c7645
|
chore: lombok 1.18.30
|
3 years ago |
|
xingyu
|
22041b6f8d
|
chore: hutool 5.8.22
|
3 years ago |
|
xingyu
|
8187398bdf
|
chore: springboot 2.7.16
|
3 years ago |
|
YunaiV
|
0b649fd3e1
|
bpm：简化获得可回退节点的实现
|
3 years ago |
kehaiyou
|
4efa93b03b
|
feat: 【工作流】--委派
|
3 years ago |
|
芋道源码
|
3826846368
|
!629 工作流-》流程实例的任务节点回退
Merge pull request !629 from Youkehai/master
|
3 years ago |
|
kehaiyou
|
921f99d39d
|
fix: 方法，变量名词，注释规范
|
3 years ago |
|
YunaiV
|
421bb7d154
|
code review：分销逻辑
|
3 years ago |
jason
|
60f766f35c
|
钱包充值允许多次退款
|
3 years ago |
|
芋道源码
|
51899c4c13
|
!627 trade: 分销业务 - 提现申请
Merge pull request !627 from 疯狂的世界/brokerate
|
3 years ago |
|
owen
|
f7296d18b9
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
# Conflicts:
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java
|
3 years ago |
|
芋道源码
|
b420c5b8fe
|
!630 对具有软删除的表去除UNIQUE INDEX
Merge pull request !630 from dhb52/master
|
3 years ago |
|
芋道源码
|
9b8312f596
|
!626 发起流程成功后，用户流程列表未刷新
Merge pull request !626 from samisgod/master
|
3 years ago |
|
owen
|
29b806e675
|
Framework：增加LocalDate、LocalTime序列化
|
3 years ago |
|
芋道源码
|
798ae7c2c7
|
Merge pull request #344 from Shimada666/patch-1
fix: 使初始化数据脚本兼容 mysql5.7
|
3 years ago |
|
dhb52
|
2a9aa357cb
|
fix: 对具有软删除的表去除UNIQUE INDEX
|
3 years ago |
|
YunaiV
|
b4587fd79e
|
product：订单表，增加 vip 优惠字段
|
3 years ago |
|
YunaiV
|
53e789dfdc
|
trade：订单表，增加 vip 优惠字段
|
3 years ago |
|
owen
|
bf0e7d2c77
|
System：字典数据列表过滤已关闭的数据
|
3 years ago |
|
YunaiV
|
aa5525d1f5
|
code review：营销活动 & 交易订单的对接
|
3 years ago |
|
YunaiV
|
1da14a3f53
|
trade：删除订单的实现
|
3 years ago |
|
YunaiV
|
a9485ad6bf
|
trade：取消订单、确认收货，增加订单日志
|
3 years ago |
|
YunaiV
|
e9c9ac0cab
|
trade：确认收货时，增加订单日志
|
3 years ago |
|
kehaiyou
|
b13f71424b
|
feat: 工作流-》流程实例的任务节点回退
|
3 years ago |
|
owen
|
052328c5fa
|
积分：完善积分获得、退还、使用 相关逻辑
|
3 years ago |
|
YunaiV
|
71d6311bd4
|
code review：拼团、秒杀等逻辑
|
3 years ago |
|
芋道源码
|
54fe0174bc
|
!625 完善订单和活动 review 提到的问题，完善 app 端获取拼团活动分页、列表、详情接口
Merge pull request !625 from puhui999/feature/mall_product
|
3 years ago |
|
YunaiV
|
9451342aae
|
trade：营销商品（拼团、砍价）不能使用优惠劵
|
3 years ago |
|
owen
|
dc46dff62c
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
3 years ago |
|
owen
|
f30fa39067
|
修改Review代码
|
3 years ago |
|
owen
|
bbd18afbcc
|
分佣: 简化推广用户关系树查询方式
|
3 years ago |
|
owen
|
6e6486ccae
|
Trade: 完善配置
|
3 years ago |
|
owen
|
ad0513c87c
|
分佣: 推广人列表
|
3 years ago |
|
YunaiV
|
bf40767fa1
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
YunaiV
|
7c4fbc63dc
|
trade：物流费用计算，增加金额 divide 分拆逻辑
|
3 years ago |
|
owen
|
ee15b802b2
|
分佣: 推广人排行
|
3 years ago |
|
owen
|
972b01c001
|
分佣: 佣金排行
|
3 years ago |
|
jason
|
92f6c8f4d6
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
jason
|
910ffa7a5a
|
钱包充值退款
|
3 years ago |
|
owen
|
7a8a440eb6
|
分佣: 佣金记录
|
3 years ago |
|
owen
|
eddc897cd8
|
分佣: 提现记录
|
3 years ago |
|
owen
|
637ae8ce1d
|
分佣: 提现记录
|
3 years ago |
|
owen
|
c146c98b72
|
分佣: 提现
|
3 years ago |