hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-10-31 10:18:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,263 Commits 20 Branches 0 Tags
bee6f41211ce9702aef054e4577d059f9faedd9e
Commit Graph

5263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
kehaiyou
b13f71424b feat: 工作流-》流程实例的任务节点回退 2023-09-23 14:47:34 +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
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
594e4d5fee system: uniapp增加字典数据查询接口 2023-09-22 15:11:06 +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
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
samisgod
b94f89b4f5 refresh after task add 2023-09-21 15:08:35 +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
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
YunaiV
9630f236f8 Merge branch 'feature/auth' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
 Conflicts:
	README.md
 2023-09-19 22:28:45 +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