owen
|
9eb7837b67
|
member: 佣金失效
|
2023-09-05 19:43:07 +08:00 |
|
owen
|
a708521b9d
|
member: 佣金解冻
|
2023-09-05 19:05:01 +08:00 |
|
owen
|
2f6092005b
|
member: 佣金解冻
|
2023-09-05 18:59:24 +08:00 |
|
jason
|
f99e2aec2d
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-05 12:44:43 +08:00 |
|
jason
|
f3ca0f066b
|
会员钱包 查询订单和查询退款单的实现
|
2023-09-05 12:44:34 +08:00 |
|
芋道源码
|
a58d7d63ed
|
!606 会员：分销佣金计算
Merge pull request !606 from 疯狂的世界/brokerage
|
2023-09-05 01:58:11 +00:00 |
|
owen
|
090058a2ba
|
member: 佣金不冻结时，直接就是结算状态
|
2023-09-05 09:27:12 +08:00 |
|
owen
|
c7ef8519c8
|
member: 分销增加佣金
|
2023-09-05 08:56:39 +08:00 |
|
YunaiV
|
eae8218f0d
|
分佣：增加获得分销排行分页 API mock
|
2023-09-05 00:11:41 +08:00 |
|
YunaiV
|
7389e4fb65
|
分佣：增加获得分销记录分页 API mock
|
2023-09-04 22:48:26 +08:00 |
|
YunaiV
|
fc56a15f76
|
分佣：增加用户分销记录、提现 API mock
|
2023-09-04 21:00:03 +08:00 |
|
jason
|
cc4c924717
|
钱包 review DO 类修改
|
2023-09-04 14:54:38 +08:00 |
|
jason
|
91b03e7c93
|
钱包 review 修改
|
2023-09-04 12:18:56 +08:00 |
|
YunaiV
|
6a819da0b6
|
分佣：增加用户分销统计 API mock
|
2023-09-03 21:21:33 +08:00 |
|
owen
|
991b53649b
|
member: 分销配置
|
2023-09-03 21:19:42 +08:00 |
|
YunaiV
|
36b3cfafd2
|
同步 v1.8.1 SQL 脚本
|
2023-09-03 19:15:18 +08:00 |
|
YunaiV
|
5308e309ea
|
同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/51/files
|
2023-09-03 18:44:03 +08:00 |
|
YunaiV
|
379c143dbb
|
修复：#320 支付手续费计算不正确，超过付款金额 #334
|
2023-09-03 18:39:51 +08:00 |
|
YunaiV
|
a532ba0579
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2023-09-03 18:38:02 +08:00 |
|
芋道源码
|
05fc322919
|
Merge pull request #334 from freesme/fix-master-#320-calculation-error
修复：#320 支付手续费计算不正确，超过付款金额
|
2023-09-03 18:37:52 +08:00 |
|
芋道源码
|
0cb7d8a29a
|
Merge pull request #335 from freesme/master-fix-#330wx-mini-jump-failed
修复：微信公众号菜单添加跳转小程序失败
|
2023-09-03 18:34:33 +08:00 |
|
YunaiV
|
4db3de8d86
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2023-09-03 18:30:46 +08:00 |
|
芋道源码
|
a1f6826e14
|
Merge pull request #337 from freesme/fix-master-#319-wx-pay-client-error
修复：#319 微信支付初始化 client 客户端错误，导致发起支付报错
|
2023-09-03 18:30:32 +08:00 |
|
YunaiV
|
4809e9b462
|
修复单元测试报错的问题
|
2023-09-03 18:28:29 +08:00 |
|
YunaiV
|
8f86f65884
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-09-03 18:07:05 +08:00 |
|
YunaiV
|
482a84a6f1
|
603 mall: 优惠券退还优化
|
2023-09-03 18:06:15 +08:00 |
|
芋道源码
|
670f2ef5da
|
!603 mall: 优惠券退还优化
Merge pull request !603 from 疯狂的世界/mall_order_cancel
|
2023-09-03 10:04:41 +00:00 |
|
芋道源码
|
8321d14b0b
|
!599 Crontab组件radio的label类型不一致
Merge pull request !599 from 高小牛/master
|
2023-09-03 10:02:32 +00:00 |
|
YunaiV
|
b69d4e0852
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2023-09-03 17:59:50 +08:00 |
|
芋道源码
|
80a5889757
|
!565 vben代码生成模版
Merge pull request !565 from xingyu/feature/vben_codegen
|
2023-09-03 09:58:56 +00:00 |
|
芋道源码
|
7870283bfa
|
!594 兼容spring web 配置上下文根路径的情况
Merge pull request !594 from suyh/master
|
2023-09-03 09:55:39 +00:00 |
|
芋道源码
|
e67b62f2f6
|
!604 优惠券优化
Merge pull request !604 from 疯狂的世界/coupon
|
2023-09-03 09:48:21 +00:00 |
|
YunaiV
|
9148170926
|
调整 mapper 命名，避免可能的冲突
|
2023-09-02 19:23:09 +08:00 |
|
owen
|
71efa0ed6f
|
promotion: 订单使用品类券时，根据品类过滤可用商品
|
2023-09-02 10:05:56 +08:00 |
|
owen
|
8bbaaf1ce9
|
promotion: 优惠券模板 productSpuIds 改成 productScopeValues
|
2023-09-02 09:53:37 +08:00 |
|
owen
|
6a7be19d3a
|
common: 增加InEnumCollectionValidator，用于校验枚举值列表参数的取值范围是否有䇅
|
2023-09-02 08:44:02 +08:00 |
|
owen
|
11ad7ad5e4
|
mall: 优惠券退还优化
|
2023-09-02 07:44:16 +08:00 |
|
YunaiV
|
c25bf38f50
|
code review：交易订单的取消
|
2023-09-02 00:52:31 +08:00 |
|
YunaiV
|
9c0d0c809a
|
Merge branch 'mall_order_cancel' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
Conflicts:
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
|
2023-09-02 00:45:26 +08:00 |
|
YunaiV
|
68c1113ed1
|
code review：优惠劵发放
|
2023-09-02 00:32:16 +08:00 |
|
YunaiV
|
a6ec3fefcf
|
code review：优惠劵发放
|
2023-09-02 00:31:23 +08:00 |
|
芋道源码
|
c06d3c3d26
|
!602 mall: 发送优惠券功能优化
Merge pull request !602 from 疯狂的世界/mall_coupon_take
|
2023-09-01 16:19:40 +00:00 |
|
owen
|
3fbce643ee
|
mall: 发送优惠券功能优化
|
2023-09-01 23:45:50 +08:00 |
|
YunaiV
|
76f510f247
|
code review：优惠劵发放
|
2023-09-01 22:51:28 +08:00 |
|
owen
|
b3fcefa677
|
trade: 会员取消订单
|
2023-09-01 20:37:20 +08:00 |
|
芋道源码
|
af0771a175
|
!597 优惠券
Merge pull request !597 from 疯狂的世界/owen_dev
|
2023-09-01 12:12:02 +00:00 |
|
YunaiV
|
28adfff10e
|
code review：订单逻辑
|
2023-09-01 20:00:04 +08:00 |
|
芋道源码
|
8dd600a300
|
!600 订单中心：修改获取售后订单详情接口，修改订单管理后台物流获取接口
Merge pull request !600 from puhui999/feature/mall_product
|
2023-09-01 11:49:23 +00:00 |
|
zhijiantianya@gmail.com
|
dd6adb8ee6
|
code review order
|
2023-09-01 19:08:27 +08:00 |
|
puhui999
|
e26814be31
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-09-01 12:13:11 +08:00 |
|