huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-22 23:31:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,222 Commits 1 Branch 0 Tags 176 MiB
41e5cf5285
Commit Graph

782 Commits

Author SHA1 Message Date
YunaiV
6a04d6c458 promotion：新增助力记录列表 2023-10-05 12:43:14 +08:00
YunaiV
269da3d56d promotion：新增砍价记录列表 2023-10-05 12:07:05 +08:00
YunaiV
cd45be1fe2 promotion：优化砍价活动的分页结果 2023-10-05 02:18:14 +08:00
YunaiV
16e436a0f5 promotion：增加助力砍价的接口 2023-10-05 00:05:20 +08:00
YunaiV
cc087e4eca promotion：增加创建砍价的接口 2023-10-04 21:55:05 +08:00
YunaiV
a37427c355 stat：增加用户统计的设计 2023-10-04 18:53:49 +08:00
YunaiV
c5824eedf7 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
 2023-10-04 17:33:14 +08:00
YunaiV
6f39b2c030 trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算 2023-10-04 17:30:07 +08:00
YunaiV
8dbabb9efc trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算 2023-10-04 11:29:38 +08:00
owen
7a15b340b0 交易：核销 2023-10-04 10:51:36 +08:00
owen
60ea719b46 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
 2023-10-04 09:12:48 +08:00
owen
8e905f706d 交易：核销 2023-10-04 09:11:51 +08:00
YunaiV
dc1347184f code review：拼团、砍价活动 2023-10-04 00:47:17 +08:00
YunaiV
20f5834d9a trade：价格计算时，接入优惠劵逻辑 2023-10-04 00:30:03 +08:00
YunaiV
a1e9bedf34 promotion：完善秒杀的 uniapp 接口 2023-10-03 21:45:51 +08:00
owen
5819b08740 交易：Review修改 2023-10-03 21:25:23 +08:00
owen
3c5917a6cd Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-03 21:21:48 +08:00
owen
a9e822762d 统计：交易统计定时任务 2023-10-03 21:21:11 +08:00
YunaiV
ac55a9657c promotion：完善秒杀模块 2023-10-03 18:41:41 +08:00
YunaiV
df4716d5a1 code review：分销 2023-10-03 10:23:40 +08:00
owen
b7359706db Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-02 23:52:25 +08:00
owen
d0f0bc5888 分销：调整推广人列表查询方式 2023-10-02 23:51:49 +08:00
owen
7fdd36d979 Review代码修改 2023-10-02 21:27:46 +08:00
YunaiV
1f910992d6 trade：新增是否自提的配置项 2023-10-02 21:18:52 +08:00
YunaiV
fdb10aeced trade：优化运费模版的实现 2023-10-02 18:30:14 +08:00
YunaiV
6f4c04d944 trade：完善退款详情 2023-10-02 15:44:41 +08:00
YunaiV
0c1f5c9582 trade：完善订单详情 2023-10-02 10:34:52 +08:00
YunaiV
d4417d2474 code review：积分、优惠劵、佣金等逻辑 2023-10-01 23:31:07 +08:00
YunaiV
057952bdeb Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
 2023-10-01 22:00:31 +08:00
YunaiV
b74169acfc trade：优化订单列表的查询 2023-10-01 21:59:51 +08:00
owen
abfebebdd5 交易：增加 积分抵扣计算器 单元测试 2023-10-01 17:12:33 +08:00
owen
afd306a71d 交易：增加 赠送积分计算器 单元测试 2023-10-01 16:23:41 +08:00
owen
2168145c3e 会员：会员配置的积分相关字段加上point前缀 2023-10-01 10:41:21 +08:00
owen
ab35fcbe9b 会员：积分配置改为会员配置 2023-10-01 10:25:18 +08:00
owen
a04a3a27a9 Review代码修改 2023-09-30 23:41:11 +08:00
puhui999
d3f03540f8 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-30 23:35:19 +08:00
puhui999
82210a9583 订单：完善拼团活动 2023-09-30 23:34:45 +08:00
owen
7d68bdc7c8 分销：重构下级分销统计 2023-09-30 23:30:06 +08:00
owen
cafa938ff4 common：LocalDateTimeUtils 增加方法：月份开始时间、月份结束时间 2023-09-30 22:21:47 +08:00
owen
e7876b1520 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-30 22:09:49 +08:00
owen
d2c5eaf916 优惠券：重构是否领取检查方式 2023-09-30 22:05:11 +08:00
owen
aaa01de21d 分销：修改佣金排名查询算法 2023-09-30 19:55:18 +08:00
owen
d0d21b2787 优惠券：新增/修改时，校验对应的商品、分类是否存在 2023-09-30 19:39:02 +08:00
owen
42a899c5d3 交易：订单增加字段 推广人编号 2023-09-30 17:49:38 +08:00
owen
fc432ba073 优惠券：新人券使用 MQ 发放 2023-09-30 17:29:32 +08:00
YunaiV
367b45e3bd code review：数据统计 2023-09-30 12:30:01 +08:00
puhui999
597eacaaeb Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
 2023-09-30 11:35:51 +08:00
puhui999
0b35d4a7e3 订单：完善拼团活动部分 TODO 2023-09-30 11:27:24 +08:00
puhui999
5ecd0d94eb 订单：添加 order handler 默认抽象实现类，子类可以选择性地实现抽象方法，而不必实现所有方法 2023-09-30 11:24:52 +08:00
owen
6b7f071988 Review代码修改 2023-09-29 22:47:04 +08:00
owen
26628913cb 错误码分段 2023-09-29 21:34:38 +08:00
owen
929ff4286a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-29 21:08:49 +08:00
owen
171161e6c7 统计：交易统计 2023-09-29 21:08:15 +08:00
YunaiV
9ee0aebd3f promotion：增加 coupon 的 code review 2023-09-29 20:52:11 +08:00
YunaiV
666ba351a2 trade：退款理由的维护 2023-09-29 13:35:40 +08:00
YunaiV
3c643f814c trade：补全售后日志的记录 2023-09-29 11:46:43 +08:00
YunaiV
d402bdb7e0 trade：优化售后取消订单的实现代码 2023-09-29 10:08:20 +08:00
YunaiV
f9bf41d773 code review：分佣剩余部分的 review 2023-09-28 22:22:38 +08:00
YunaiV
b1ce971a2f code review：解决分佣的 npe 问题 2023-09-28 16:39:07 +08:00
YunaiV
9cd36abf10 同步 master 分支代码 2023-09-28 15:28:40 +08:00
YunaiV
5913ee0706 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	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/bargain/vo/activity/AppBargainActivityDetailRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.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
#	yudao-server/src/main/resources/application-local.yaml
 2023-09-28 15:18:59 +08:00
YunaiV
eeb8873b1d trade：微调交易配置的注释 2023-09-28 15:10:56 +08:00
YunaiV
9e3564bd6a code review：优惠劵逻辑 2023-09-28 09:23:42 +08:00
owen
b2c608e7a5 交易：发货订单日志 2023-09-27 21:27:55 +08:00
owen
565a8e0e6b Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-27 21:24:37 +08:00
YunaiV
b9018baa03 trade：简化价格调整的逻辑 2023-09-27 19:14:48 +08:00
YunaiV
c5f2d07c87 商城：增加 stat 统计设计 2023-09-27 19:14:32 +08:00
YunaiV
26dfbfb2ac trade：发货逻辑，增加订单日志 2023-09-27 09:55:04 +08:00
owen
be426235dd Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-27 01:20:40 +08:00
owen
bc07e1dbf4 售后：重构售后更新订单的逻辑 2023-09-27 01:19:49 +08:00
owen
74ef98f8fc 售后：售后成功后，回滚 SKU 库存 2023-09-27 00:24:22 +08:00
owen
2766dd672a 优惠券：过期定时任务 2023-09-27 00:15:12 +08:00
owen
11ffa45b89 积分：Review代码修改 2023-09-26 23:54:43 +08:00
YunaiV
53bd1b9ec1 trade：订单评论超时时，自动评论 2023-09-26 23:50:54 +08:00
owen
cd2d0b7089 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-26 23:23:12 +08:00
owen
77f7763560 优惠券：完善优惠券领取接口 2023-09-26 23:21:01 +08:00
YunaiV
cf41347cb3 trade：支付订单成功时，记录订单日志 2023-09-26 22:48:21 +08:00
owen
b1ac3a0b8b 优惠券：完善优惠券匹配接口 2023-09-26 22:46:06 +08:00
owen
f9aec7d8fd 优惠券：完善我的优惠券接口 2023-09-26 21:08:11 +08:00
YunaiV
debf568750 code review：增加取消售后的优化建议 2023-09-26 20:57:10 +08:00
owen
0a3a6825d5 优惠券：完善APP优惠券查询接口 2023-09-26 20:44:22 +08:00
YunaiV
ad535e674f trade：积分相关的价格计算 2023-09-26 20:11:54 +08:00
YunaiV
a8c78f3097 trade：增加自动收货的 job 2023-09-26 19:27:37 +08:00
owen
a431bccc02 分销：Review代码修改 2023-09-26 15:11:48 +08:00
YunaiV
826d792ff2 trade：增加自动取消的 job 2023-09-26 00:04:11 +08:00
puhui999
bce96b29a6 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	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/price/bo/TradePriceCalculateReqBO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
 2023-09-25 15:06:57 +08:00
puhui999
42c47d9b44 秒回活动：订单金额计算初步设计 2023-09-25 14:56:56 +08:00
YunaiV
e384b810bf code review：分销逻辑 2023-09-25 09:39:39 +08:00
owen
16af31d980 分销：@Select sql语句增加逻辑删除字段过滤 2023-09-25 08:36:55 +08:00
owen
3dca66eefa 分销：提现统计 2023-09-25 08:05:29 +08:00
owen
0b84c18736 分销：修正分享海报 2023-09-24 23:18:51 +08:00
owen
967e578d54 分销：重命名提现类型字段 2023-09-24 22:32:13 +08:00
owen
9856e17974 分销：根据商品，计算推广员可以得到的佣金 2023-09-24 22:27:24 +08:00
owen
e9fd377772 分销：Review代码修改 2023-09-24 20:28:44 +08:00
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