lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
4,938 Commits 2 Branches 0 Tags 165 MiB
9451342aae
Commit Graph

4938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV
9451342aae trade：营销商品（拼团、砍价）不能使用优惠劵 2023-09-22 23:54:18 +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
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
YunaiV
24111c1548 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-21 22:02:30 +08:00
YunaiV
5949727c8d trade：全局配送价格配置 2023-09-21 22:02:22 +08:00
jason
c880dbfa60 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-21 17:32:43 +08:00
jason
dbd7ab5f23 code review 修改 2023-09-21 17:31:58 +08:00
YunaiV
35569c5ec8 trade：下单时，如果是门店自提，增加核销码的生成 2023-09-20 23:21:00 +08:00
YunaiV
1b477aaa0d trade：优化下单逻辑的实现 2023-09-20 20:21:41 +08:00
YunaiV
c766f7daa5 code review：砍价、秒杀的逻辑 2023-09-20 01:07:41 +08:00
YunaiV
1b154699c6 code review：处理错误的 mysql 连接 2023-09-20 00:10:18 +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
芋道源码
581f9d4101
!622 trade: 分销业务review代码修改 
Merge pull request !622 from 疯狂的世界/brokerate
 2023-09-19 13:48:07 +00: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
f998d43e68 infra: 修正 查询实体列表方法，传入的ID集合为空时，会导致异常的问题 2023-09-19 17:14:42 +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
owen
75874035a4 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-19 15:31:14 +08:00
YunaiV
be1ecf96d4 code review：会员签到逻辑 2023-09-18 22:18:42 +08:00
YunaiV
477342d324 Merge branch 'feature/mall_product' of https://gitee.com/SummerQing/ruoyi-vue-pro into feature/mall_product 2023-09-18 13:49:07 +08:00
YunaiV
080c32b9f3 code review：钱包充值 2023-09-18 13:07:54 +08:00
owen
a52e490c86 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-16 08:41:06 +08:00
xiaqing
d4a891e6c4 新增两个APP端接口 
1.获取用户个人签到信息
2.用户签到接接口
 2023-09-15 23:21:11 +08:00
xiaqing
0907ca2081 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-15 22:09:13 +08:00
jason
bbc16bb937 钱包充值 Mapper 类 2023-09-15 16:14:04 +08:00
owen
73e4976ae4 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-15 16:11:01 +08:00
xiaqing
e893cfd757 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordService.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
 2023-09-15 15:27:59 +08:00
xiaqing
9d262e8e7f 新增两个APP端接口 
1.获取用户个人签到信息
2.用户签到接接口
 2023-09-15 15:20:39 +08:00
owen
2c821d2bbf Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-15 14:13:48 +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
cfaffd3c88 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-13 23:26:38 +08:00
YunaiV
1b9a3f9f63 code review：调整操作日志的封装 2023-09-13 23:25:52 +08:00
jason
bcb3b19418 钱包充值 表结构设计 2023-09-13 17:28:42 +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
芋道源码
18c9f22560
!616 完善分销功能 
Merge pull request !616 from 疯狂的世界/brokerate
 2023-09-11 14:20:02 +00:00
owen
c67ecbf61d Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-11 20:04:23 +08:00