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

688 Commits

Author SHA1 Message Date
YunaiV 421bb7d154 code review：分销逻辑 2023-09-24 11:56:00 +08: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
YunaiV b4587fd79e product：订单表，增加 vip 优惠字段 2023-09-24 00:45:32 +08:00
YunaiV 53e789dfdc trade：订单表，增加 vip 优惠字段 2023-09-23 23:58:22 +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 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 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
owen 7a8a440eb6 分佣: 佣金记录 2023-09-22 18:49:26 +08:00
owen eddc897cd8 分佣: 提现记录 2023-09-22 18:48:16 +08:00
owen 637ae8ce1d 分佣: 提现记录 2023-09-22 18:35:43 +08:00
owen c146c98b72 分佣: 提现 2023-09-22 18:06:11 +08:00
owen f72a087007 分佣: 我的推广统计接口 2023-09-22 15:42:59 +08:00
owen a7de955926 trade: 分销业务 - 提现申请 2023-09-22 00:27:45 +08:00
owen 5ed99a9105 trade: 分销业务 - 整理包名 2023-09-22 00:26:32 +08:00
YunaiV 5949727c8d trade：全局配送价格配置 2023-09-21 22:02:22 +08:00
puhui999 8060aeb5e7 秒杀: app 端返回增加秒杀活动状态 2023-09-21 09:07:37 +08:00
YunaiV 35569c5ec8 trade：下单时，如果是门店自提，增加核销码的生成 2023-09-20 23:21:00 +08:00
YunaiV 1b477aaa0d trade：优化下单逻辑的实现 2023-09-20 20:21:41 +08:00
puhui999 583a0a2dd5 砍价+拼团: 修复 selectList limit 条件执行报错问题 2023-09-20 16:28:41 +08:00
puhui999 6ef94ade6a 完善订单和活动 review 提到的问题 2023-09-20 16:06:29 +08:00
puhui999 52848d6341 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/controller/app/seckill/AppSeckillActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
 2023-09-20 10:14:43 +08:00
puhui999 1d2a6ad065 拼团活动: 完善 app 端获取活动分页、列表、详情接口 2023-09-20 10:09:15 +08:00
YunaiV c766f7daa5 code review：砍价、秒杀的逻辑 2023-09-20 01:07:41 +08:00
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
xingyu 437131cc7a Merge remote-tracking branch 'origin/master' into feature/auth 
# Conflicts:
#	yudao-dependencies/pom.xml
 2023-09-13 12:00:10 +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
YunaiV 8b50cd9661 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
 Conflicts:
	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
 2023-09-11 16:19:55 +08:00
xingyu 5e9e41c045 fix: required 过期 2023-09-11 12:30:33 +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
芋道源码 fcf8ec98a0
!608 Date转localDateTime 
Merge pull request !608 from GamePlayer-Joker/master
 2023-09-09 02:22:13 +00: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
dhb52 d7488e70b0 使用下划线分割ErrorCodeConstants的ErrorCode 2023-09-09 01:30:51 +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
GamePlayer-Joker 1bf182c341
补充 
Signed-off-by: GamePlayer-Joker <13317488+gameplayer-joker@user.noreply.gitee.com>
 2023-09-07 02:18:41 +00:00
GamePlayer-Joker 76a8fb8a0a
AppCombinationRecordRespVO中的expireTime过期时间是LocalDateTime, 现在用的是new Date() 2023-09-07 01:41:46 +00: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