YunaiV
|
b9018baa03
|
trade：简化价格调整的逻辑
|
2023-09-27 19:14:48 +08:00 |
|
YunaiV
|
c5f2d07c87
|
商城：增加 stat 统计设计
|
2023-09-27 19:14:32 +08:00 |
|
YunaiV
|
26dfbfb2ac
|
trade：发货逻辑，增加订单日志
|
2023-09-27 09:55:04 +08:00 |
|
YunaiV
|
53bd1b9ec1
|
trade：订单评论超时时，自动评论
|
2023-09-26 23:50:54 +08:00 |
|
YunaiV
|
cf41347cb3
|
trade：支付订单成功时，记录订单日志
|
2023-09-26 22:48:21 +08:00 |
|
YunaiV
|
debf568750
|
code review：增加取消售后的优化建议
|
2023-09-26 20:57:10 +08:00 |
|
YunaiV
|
ad535e674f
|
trade：积分相关的价格计算
|
2023-09-26 20:11:54 +08:00 |
|
YunaiV
|
a8c78f3097
|
trade：增加自动收货的 job
|
2023-09-26 19:27:37 +08:00 |
|
YunaiV
|
9e99b04375
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-26 00:04:18 +08:00 |
|
YunaiV
|
826d792ff2
|
trade：增加自动取消的 job
|
2023-09-26 00:04:11 +08:00 |
|
jason
|
437185cb1d
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-25 10:48:32 +08:00 |
|
jason
|
6fcff0863a
|
支付宝统一退款接口 subCode == ACQ.SYSTEM_ERROR 返回 WAITING 状态
|
2023-09-25 10:43:23 +08:00 |
|
YunaiV
|
e384b810bf
|
code review：分销逻辑
|
2023-09-25 09:39:39 +08:00 |
|
芋道源码
|
c92365128a
|
!635 分销Review代码修改
Merge pull request !635 from 疯狂的世界/feature/mall_product
|
2023-09-25 00:39:16 +00:00 |
|
owen
|
16af31d980
|
分销：@Select sql语句增加逻辑删除字段过滤
|
2023-09-25 08:36:55 +08:00 |
|
jason
|
0f0e6eb8ba
|
Pay Client 新增转账接口
|
2023-09-25 08:34:58 +08:00 |
|
owen
|
3dca66eefa
|
分销：提现统计
|
2023-09-25 08:05:29 +08:00 |
|
owen
|
0b84c18736
|
分销：修正分享海报
|
2023-09-24 23:18:51 +08:00 |
|
owen
|
967e578d54
|
分销：重命名提现类型字段
|
2023-09-24 22:32:13 +08:00 |
|
owen
|
9856e17974
|
分销：根据商品，计算推广员可以得到的佣金
|
2023-09-24 22:27:24 +08:00 |
|
owen
|
e9fd377772
|
分销：Review代码修改
|
2023-09-24 20:28:44 +08:00 |
|
YunaiV
|
421bb7d154
|
code review：分销逻辑
|
2023-09-24 11:56:00 +08:00 |
|
jason
|
60f766f35c
|
钱包充值允许多次退款
|
2023-09-24 10:49:13 +08:00 |
|
芋道源码
|
51899c4c13
|
!627 trade: 分销业务 - 提现申请
Merge pull request !627 from 疯狂的世界/brokerate
|
2023-09-24 02:15:39 +00:00 |
|
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
|
2023-09-24 10:10:53 +08:00 |
|
owen
|
29b806e675
|
Framework：增加LocalDate、LocalTime序列化
|
2023-09-24 09:57:09 +08:00 |
|
YunaiV
|
b4587fd79e
|
product：订单表，增加 vip 优惠字段
|
2023-09-24 00:45:32 +08:00 |
|
YunaiV
|
53e789dfdc
|
trade：订单表，增加 vip 优惠字段
|
2023-09-23 23:58:22 +08:00 |
|
owen
|
bf0e7d2c77
|
System：字典数据列表过滤已关闭的数据
|
2023-09-23 23:42:20 +08:00 |
|
YunaiV
|
aa5525d1f5
|
code review：营销活动 & 交易订单的对接
|
2023-09-23 22:21:23 +08:00 |
|
YunaiV
|
1da14a3f53
|
trade：删除订单的实现
|
2023-09-23 20:23:28 +08:00 |
|
YunaiV
|
a9485ad6bf
|
trade：取消订单、确认收货，增加订单日志
|
2023-09-23 18:13:35 +08:00 |
|
YunaiV
|
e9c9ac0cab
|
trade：确认收货时，增加订单日志
|
2023-09-23 17:47:39 +08:00 |
|
owen
|
052328c5fa
|
积分：完善积分获得、退还、使用 相关逻辑
|
2023-09-23 14:11:16 +08:00 |
|
YunaiV
|
71d6311bd4
|
code review：拼团、秒杀等逻辑
|
2023-09-23 09:27:29 +08:00 |
|
芋道源码
|
54fe0174bc
|
!625 完善订单和活动 review 提到的问题，完善 app 端获取拼团活动分页、列表、详情接口
Merge pull request !625 from puhui999/feature/mall_product
|
2023-09-23 01:03:00 +00:00 |
|
YunaiV
|
9451342aae
|
trade：营销商品（拼团、砍价）不能使用优惠劵
|
2023-09-22 23:54:18 +08:00 |
|
owen
|
dc46dff62c
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
2023-09-22 23:15:31 +08:00 |
|
owen
|
f30fa39067
|
修改Review代码
|
2023-09-22 23:15:10 +08:00 |
|
owen
|
bbd18afbcc
|
分佣: 简化推广用户关系树查询方式
|
2023-09-22 23:13:39 +08:00 |
|
owen
|
6e6486ccae
|
Trade: 完善配置
|
2023-09-22 22:51:46 +08:00 |
|
owen
|
ad0513c87c
|
分佣: 推广人列表
|
2023-09-22 22:12:15 +08:00 |
|
YunaiV
|
bf40767fa1
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-22 21:56:17 +08:00 |
|
YunaiV
|
7c4fbc63dc
|
trade：物流费用计算，增加金额 divide 分拆逻辑
|
2023-09-22 21:56:09 +08:00 |
|
owen
|
ee15b802b2
|
分佣: 推广人排行
|
2023-09-22 21:12:09 +08:00 |
|
owen
|
972b01c001
|
分佣: 佣金排行
|
2023-09-22 20:55:05 +08:00 |
|
jason
|
92f6c8f4d6
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-22 19:05:20 +08:00 |
|
jason
|
910ffa7a5a
|
钱包充值退款
|
2023-09-22 19:04:59 +08:00 |
|
owen
|
7a8a440eb6
|
分佣: 佣金记录
|
2023-09-22 18:49:26 +08:00 |
|
owen
|
eddc897cd8
|
分佣: 提现记录
|
2023-09-22 18:48:16 +08:00 |
|