YunaiV
|
98697ee075
|
⬆️
|
3 years ago |
|
YunaiV
|
eeeafcc10c
|
1.9.0 版本发布
|
3 years ago |
|
YunaiV
|
126dc610b1
|
1.8.3 版本发布
|
3 years ago |
|
YunaiV
|
728308cbc0
|
member：优化部分变量的命名
|
3 years ago |
owen
|
6fbb7d6d6d
|
终端类型参数改为从Controller传入
|
3 years ago |
|
YunaiV
|
6f4c04d944
|
trade：完善退款详情
|
3 years ago |
|
YunaiV
|
d4417d2474
|
code review：积分、优惠劵、佣金等逻辑
|
3 years ago |
|
owen
|
abfebebdd5
|
交易：增加 积分抵扣计算器 单元测试
|
3 years ago |
|
owen
|
afd306a71d
|
交易：增加 赠送积分计算器 单元测试
|
3 years ago |
|
YunaiV
|
b9018baa03
|
trade：简化价格调整的逻辑
|
3 years ago |
|
YunaiV
|
debf568750
|
code review：增加取消售后的优化建议
|
3 years ago |
|
YunaiV
|
a8c78f3097
|
trade：增加自动收货的 job
|
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 |
|
YunaiV
|
b4587fd79e
|
product：订单表，增加 vip 优惠字段
|
3 years ago |
|
YunaiV
|
53e789dfdc
|
trade：订单表，增加 vip 优惠字段
|
3 years ago |
|
YunaiV
|
9451342aae
|
trade：营销商品（拼团、砍价）不能使用优惠劵
|
3 years ago |
|
owen
|
dc46dff62c
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
3 years ago |
|
YunaiV
|
7c4fbc63dc
|
trade：物流费用计算，增加金额 divide 分拆逻辑
|
3 years ago |
|
owen
|
a7de955926
|
trade: 分销业务 - 提现申请
|
3 years ago |
|
owen
|
5ed99a9105
|
trade: 分销业务 - 整理包名
|
3 years ago |
|
YunaiV
|
5949727c8d
|
trade：全局配送价格配置
|
3 years ago |
|
YunaiV
|
35569c5ec8
|
trade：下单时，如果是门店自提，增加核销码的生成
|
3 years ago |
|
YunaiV
|
1b477aaa0d
|
trade：优化下单逻辑的实现
|
3 years ago |
|
YunaiV
|
962f2bbf69
|
code review：提现逻辑
|
3 years ago |
|
owen
|
e22c577f7a
|
trade: 分销业务 - 佣金提现后台管理
|
3 years ago |
|
owen
|
32e1fc66ce
|
trade: 分销业务 - 佣金提现后台管理
|
3 years ago |
|
owen
|
1ead368595
|
trade: 优化分销用户佣金字段名称
|
3 years ago |
|
owen
|
4b43304c76
|
trade: 优化分销用户绑定用户编号、绑定时间字段名称
|
3 years ago |
|
owen
|
0a0c3c0ede
|
trade: 分销业务相关类型移除Trade前缀
|
3 years ago |
|
owen
|
1cc2dfc963
|
trade: 分销Review代码修改
|
3 years ago |
|
YunaiV
|
5808f77ade
|
code review：订单分佣
|
3 years ago |
|
owen
|
fa53a3b15e
|
trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord
|
3 years ago |
|
owen
|
9336a0a102
|
trade: 分销业务从 member 模块 转移到 trade模块
|
3 years ago |
|
owen
|
a68691f2d9
|
trade: 增加分销用户表
|
3 years ago |
|
owen
|
8bbaaf1ce9
|
promotion: 优惠券模板 productSpuIds 改成 productScopeValues
|
3 years ago |
puhui999
|
d29c5a556c
|
订单管理：添加修改备注、订单调价、修改地址接口
|
3 years ago |
|
puhui999
|
716f11e80b
|
fix: 合并差异
|
3 years ago |
|
puhui999
|
8123354f09
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressServiceImpl.java
|
3 years ago |
|
puhui999
|
c2b6c0d72a
|
fix: 订单列表重构 ①
|
3 years ago |
|
YunaiV
|
5dd6e5bee8
|
营销：
1. 售后订单，增加对 afterSaleId 的更新
|
3 years ago |
|
YunaiV
|
a159a983a2
|
订单：
1. 拆分读写 OrderService，避免单 Service 逻辑过重。
|
3 years ago |
|
YunaiV
|
e4a2c738b2
|
订单：
1. 增加查询物流接口
|
3 years ago |
|
YunaiV
|
503c996acd
|
订单：
1、移除 deliverStatus 发货状态，暂时没作用
2、无需发货时，使用 logisticsId 进行实现
3、订单详情，增加 logisticsId 和 logisticsName 返回
|
3 years ago |
|
YunaiV
|
2485a5ebc9
|
mall + pay：
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
|
3 years ago |
|
YunaiV
|
9b90320985
|
mall + trade：
1、增加配送信息
|
3 years ago |
|
YunaiV
|
6fc724545b
|
mall + trade：
1、取消订单 mock 接口
2、删除订单 mock 接口
|
3 years ago |
chenchen
|
2f0aaee823
|
售后日志优化
|
3 years ago |
|
陈賝
|
59e16795be
|
!514 mall交易日志封装
* 交易日志封装
* 交易日志封装
* 交易日志模块
|
3 years ago |
|
YunaiV
|
0d47d6cead
|
mall + trade：code review 快递客户端的实现，没啥问题咧，搞下单测就 ok 拉
|
3 years ago |
|
YunaiV
|
59d5fef592
|
mall + trade：优化运费模版的代码
|
3 years ago |