fuhao
/
ciqihuo-video-approve
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,993 Commits 2 Branches 0 Tags 169 MiB
Commit Graph

646 Commits

Author SHA1 Message Date
YunaiV 2278ad4652 Merge branch 'feature/mall_product' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
 2023-09-20 00:03:18 +08:00
YunaiV 962f2bbf69 code review：提现逻辑 2023-09-19 23:58:16 +08:00
芋道源码 de7699d972
!624 trade: 分销业务 - 佣金提现 
Merge pull request !624 from 疯狂的世界/brokerate
 2023-09-19 14:25:43 +00:00
owen e22c577f7a trade: 分销业务 - 佣金提现后台管理 2023-09-19 22:20:32 +08:00
YunaiV 8cfb738db3 code review：分销逻辑 2023-09-19 22:16:25 +08:00
owen 32e1fc66ce trade: 分销业务 - 佣金提现后台管理 2023-09-19 22:03:28 +08:00
puhui999 04a391cd4b Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationActivityApiImpl.java
 2023-09-19 18:58:53 +08:00
puhui999 408df683d8 秒杀活动: 完善 app 端获取活动分页、列表、详情接口 2023-09-19 18:57:28 +08:00
owen a3e161a9a3 trade: 分销业务review代码修改 2023-09-19 16:50:43 +08:00
owen a3e8b42be6 trade: 分销业务review代码修改 2023-09-19 16:37:51 +08:00
puhui999 af6016bba5 砍价活动: 完善 app 端获取活动分页、列表、详情接口 2023-09-19 16:35:21 +08:00
jason ebd4ea548c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationApiImpl.java
 2023-09-14 16:59:05 +08:00
jason 0e1b8126dd 新增钱包充值。启动报错修复 2023-09-14 16:55:31 +08:00
YunaiV 1b9a3f9f63 code review：调整操作日志的封装 2023-09-13 23:25:52 +08:00
puhui999 a10d77cdfe mall+order: 完善部分 TODO 提到的问题 2023-09-13 12:04:13 +08:00
YunaiV 9358639c41 code review：订单部分逻辑 2023-09-12 23:01:12 +08:00
YunaiV e8bdd8349c code review：订单部分逻辑 2023-09-12 13:54:52 +08:00
YunaiV bdd81e4cbc Merge branch 'feature/mall_product' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
 2023-09-12 12:22:55 +08:00
YunaiV 82c6354e1d code review：分销逻辑 2023-09-12 09:20:42 +08:00
puhui999 254d7828aa mall+order: 订单活动特殊逻辑的抽离 2023-09-11 17:48:01 +08:00
owen 77daa0085e trade: 分销业务review代码修改 2023-09-11 00:54:12 +08:00
puhui999 7fb455096c 商城活动: 完善活动商品并发库存扣减逻辑 2023-09-11 00:13:45 +08:00
owen cddeb37289 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/BrokerageRecordConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/BrokerageUserConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java
 2023-09-10 23:56:00 +08:00
owen 290d1671a2 trade: 分销业务后台功能：推广订单列表 2023-09-10 23:36:38 +08:00
owen 6c193f723f trade: 分销业务后台功能：推广订单列表 2023-09-10 23:30:43 +08:00
puhui999 3976011af0 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-10 22:54:01 +08:00
owen 499a054eb9 trade: 分销业务后台功能：推广用户列表 2023-09-10 22:32:39 +08:00
puhui999 57f0ea04f7 mall-order: 完善活动商品库存扣减逻辑（并发更新库存下一提交实现） 2023-09-10 11:06:39 +08:00
puhui999 c023209aa5 订单管理：完善订单调价分摊逻辑 2023-09-10 00:50:13 +08:00
puhui999 51dab96889 支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突 2023-09-10 00:48:30 +08:00
puhui999 50354462fe spu：分佣属性和分佣保持一致 2023-09-09 23:18:09 +08:00
puhui999 95d8be0455 订单管理：完善订单聚合搜索 2023-09-09 23:04:13 +08:00
YunaiV 4265441e1d 分销：增加商品的分佣金额计算 api mock 2023-09-09 22:28:01 +08:00
YunaiV a47d744f64 分销：绑定分销的 url 调整 2023-09-09 21:05:44 +08:00
owen 797680895b trade: 分销业务后台功能：佣金格式化 2023-09-09 20:00:57 +08:00
YunaiV 426594ae00 分销：调整 app 的 price 到 brokeragePrice 2023-09-09 19:34:50 +08:00
owen 643602d038 trade: 分销业务后台功能：修改上级推广人 2023-09-09 19:20:12 +08:00
owen ca55e61dd2 trade: 分销业务后台功能：清除推广员、修改推广资格 2023-09-09 14:38:47 +08:00
YunaiV 557b09a157 code review：分销逻辑 2023-09-09 09:41:57 +08:00
芋道源码 3b5215db21
!611 分销用户管理、Review代码修改 
Merge pull request !611 from 疯狂的世界/brokerate
 2023-09-09 00:48:00 +00:00
owen 4e9be7a181 trade: 分销业务后台功能：修改推广资格 2023-09-09 01:58:46 +08:00
owen 259734964d trade: 分销业务后台功能：清除推广员、修改推广员 2023-09-09 01:54:48 +08:00
owen f97c7a0f6e trade: 分销业务绑定推广员 2023-09-09 01:46:42 +08:00
YunaiV 87c55784c4 code review：营销活动+订单 2023-09-09 01:27:55 +08:00
owen 6ef36d5ca6 trade: 增加分销 API 2023-09-08 23:33:02 +08:00
owen 1ead368595 trade: 优化分销用户佣金字段名称 2023-09-08 23:10:04 +08:00
owen 4b43304c76 trade: 优化分销用户绑定用户编号、绑定时间字段名称 2023-09-08 22:51:05 +08:00
owen f36a6c5d6c trade: 优化修改推广员接口字段名称 2023-09-08 22:40:49 +08:00
owen b85d660a5c trade: 分销业务完善校验 2023-09-08 22:33:44 +08:00
owen 0a0c3c0ede trade: 分销业务相关类型移除Trade前缀 2023-09-08 12:56:34 +08:00
owen ddcebb1986 common: MoneyUtils 移到 common 模块 2023-09-08 12:46:43 +08:00
owen 1cc2dfc963 trade: 分销Review代码修改 2023-09-08 12:29:38 +08:00
owen 166b1b31c0 trade: 分销用户管理 2023-09-08 11:03:57 +08:00
puhui999 5d6bb84d25 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-08 00:59:53 +08:00
puhui999 0e8755972c 营销活动+订单：完善大部分 TODO 提到的问题 2023-09-08 00:35:54 +08:00
YunaiV 5808f77ade code review：订单分佣 2023-09-08 00:29:25 +08:00
YunaiV eb342d5abf Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
 2023-09-06 23:50:55 +08:00
YunaiV 62a4e8242b 分销：增加提现接口 2023-09-06 23:50:23 +08:00
芋道源码 ea26691967
!607 member: 佣金解冻 
Merge pull request !607 from 疯狂的世界/brokerate_unfreeze
 2023-09-06 15:49:39 +00:00
puhui999 2591ab5d36 订单中心+营销活动：完善部分 TODO 提到的问题 2023-09-06 11:29:51 +08:00
owen fa53a3b15e trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord 2023-09-06 00:35:40 +08:00
owen 9336a0a102 trade: 分销业务从 member 模块 转移到 trade模块 2023-09-06 00:16:47 +08:00
YunaiV e4b153a866 分佣：增加获得分销排行分页 API mock 2023-09-05 23:49:35 +08:00
owen a68691f2d9 trade: 增加分销用户表 2023-09-05 23:45:53 +08:00
owen 6474502738 trade: 增加交易中心配置表 2023-09-05 22:31:36 +08:00
YunaiV 0329f13fbf 分佣：增加获得分销排行分页 API mock 2023-09-05 21:32:34 +08:00
owen 9eb7837b67 member: 佣金失效 2023-09-05 19:43:07 +08:00
芋道源码 a58d7d63ed
!606 会员：分销佣金计算 
Merge pull request !606 from 疯狂的世界/brokerage
 2023-09-05 01:58:11 +00:00
owen c7ef8519c8 member: 分销增加佣金 2023-09-05 08:56:39 +08:00
YunaiV 6a819da0b6 分佣：增加用户分销统计 API mock 2023-09-03 21:21:33 +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
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
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 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
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
puhui999 1f9968d784 订单中心：修改获取售后订单详情接口，修改订单管理后台物流获取接口 2023-09-01 12:12:15 +08:00
YunaiV d982a95fdd Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-08-31 20:38:59 +08:00
YunaiV f28b960319 调整最新图片 url 2023-08-31 20:06:02 +08:00
YunaiV 60d4aa97fb code review：售后详情接口 2023-08-30 20:18:40 +08:00
YunaiV 059202a588 购物车：调整购物车接口 2023-08-30 19:14:28 +08:00
chenchen 73f1636daa 售后日志添加售前售后状态 2023-08-30 10:58:37 +08:00
YunaiV 3e4b1c0552 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-08-30 08:43:13 +08:00
YunaiV 5a788af084 购物车：简化 cart 表命名 2023-08-30 08:43:07 +08:00
puhui999 d5fe7708ce 订单售后退款：添加获取售后订单详情接口 2023-08-29 09:54:14 +08:00
puhui999 0411b3464a 订单售后退款：添加获取售后订单详情接口 2023-08-28 17:21:29 +08:00
puhui999 498edfffb1 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-08-28 09:24:04 +08:00
puhui999 655eefc340 订单管理：完善订单管理提到的一些问题 2023-08-28 09:23:30 +08:00