huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-12-05 05:31:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,252 Commits 1 Branch 0 Tags 176 MiB
878b56a7d6
Commit Graph

1014 Commits

Author SHA1 Message Date
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
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
芋道源码
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
YunaiV
8b98d13d8b Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-08-27 21:05:42 +08:00
YunaiV
02bc9d28de 解决 MapStruct 的时区问题 2023-08-27 11:19:48 +08:00
owen
530ec7ab24 mall: 完善后台发送优惠券 2023-08-26 22:29:56 +08:00
YunaiV
f5c5d38303 code review：商品评论 2023-08-26 21:23:01 +08:00
owen
1e2c83d90f mall: 商品评论表增加冗余 SKU 的图片地址, 规格 2023-08-26 14:40:16 +08:00
owen
02abe86253 member: 
1.用户积分变动方法, 提取到单独的接口中
2.规范代码
 2023-08-26 13:52:20 +08:00
YunaiV
b75d777670 code review：订单评论、订单积分的变更 2023-08-26 10:54:45 +08:00
owen
d4acacec60 trade: 1.支付成功后，增加用户积分；2.退款成功后，扣减用户积分 2023-08-25 23:07:54 +08:00
owen
dad56fd096 trade: 1.支付成功后，增加用户经验；2.退款成功后，扣减用户经验 2023-08-25 22:21:14 +08:00
owen
2132de9dd1 商品：完善后台商品评论功能 2023-08-25 21:02:49 +08:00
shizhong
eb4434ecbc 解决MapStruct的时区问题 2023-08-23 12:11:47 +08:00
YunaiV
5932e8e931 code review：订单列表、详情 2023-08-23 00:46:28 +08:00
puhui999
002475f33a 订单管理：完善订单管理 补全相关接口 2023-08-22 18:55:00 +08:00
puhui999
d2c135eda9 订单管理：添加修改备注、订单调价、修改地址接口 2023-08-22 16:31:28 +08:00
puhui999
d29c5a556c 订单管理：添加修改备注、订单调价、修改地址接口 2023-08-22 12:19:25 +08:00
puhui999
716f11e80b fix: 合并差异 2023-08-22 00:57:36 +08:00
puhui999
8123354f09 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/controller/admin/order/TradeOrderController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressService.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressServiceImpl.java
 2023-08-22 00:46:47 +08:00
puhui999
c2b6c0d72a fix: 订单列表重构 ① 2023-08-22 00:42:20 +08:00
YunaiV
94a32d34b2 1. 会员用户，增加 point 积分字段 
2. 增加获得优惠劵、收藏数量的 API 接口
 2023-08-19 17:00:40 +08:00
YunaiV
61fbb9909a 订单： 
1、简化交易订单的逻辑
 2023-08-18 19:59:30 +08:00
YunaiV
fe07e223e4 订单： 
1、简化交易订单的逻辑
 2023-08-18 19:28:36 +08:00
YunaiV
f217ba0807 售后： 
1、完善整个流程的实现
 2023-08-18 19:22:08 +08:00
YunaiV
5dd6e5bee8 营销： 
1. 售后订单，增加对 afterSaleId 的更新
 2023-08-17 22:32:30 +08:00
YunaiV
c3de25e760 营销： 
1. 调整店铺装修接口
 2023-08-16 22:11:18 +08:00
YunaiV
a159a983a2 订单： 
1. 拆分读写 OrderService，避免单 Service 逻辑过重。
 2023-08-15 21:19:13 +08:00
YunaiV
159c74ce15 订单： 
1. review 发货
2. review 拼团逻辑
 2023-08-15 21:04:20 +08:00
芋道源码
60171ce7e4
!571 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 
Merge pull request !571 from puhui999/feature/mall_product
 2023-08-15 12:29:51 +00:00
YunaiV
e4a2c738b2 订单： 
1. 增加查询物流接口
 2023-08-15 20:18:22 +08:00
puhui999
5c2723c7bf fix: 修复合并差异 2023-08-15 00:02:50 +08:00
puhui999
de828e3d04 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/admin/bargain/BargainActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityCreateReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityUpdateReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityCreateReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityPageReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/product/BargainProductBaseVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/activity/CombinationActivityPageReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/bargain/BargainActivityConvert.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckill/seckillactivity/SeckillActivityConvert.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/bargain/BargainActivityDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/bargain/BargainProductDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationServiceImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImplTest.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
 2023-08-14 21:42:11 +08:00
puhui999
e2a8f7b389 fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 2023-08-14 21:26:07 +08:00
puhui999
651725e3e8 fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 2023-08-14 21:20:03 +08:00
YunaiV
715c42574f 订单： 
1、订单评价的接入
 2023-08-13 21:44:48 +08:00
YunaiV
7dc398717a 订单： 
1、实现确认收货接口
 2023-08-13 20:27:19 +08:00
YunaiV
503c996acd 订单： 
1、移除 deliverStatus 发货状态，暂时没作用
2、无需发货时，使用 logisticsId 进行实现
3、订单详情，增加 logisticsId 和 logisticsName 返回
 2023-08-13 20:12:24 +08:00
YunaiV
e159b2e500 code review：砍价的代码 2023-08-13 00:49:35 +08:00
YunaiV
ba31d5f6fb 优化拼团活动的管理后台代码 2023-08-13 00:06:46 +08:00
YunaiV
6fdd4da0b3 优化秒杀活动的管理后台代码 2023-08-12 16:05:47 +08:00
zhijiantianya@gmail.com
ba59ec85e0 code review 各种活动 2023-08-07 19:30:26 +08:00
puhui999
384359c9d4 fix: 完善拼团、秒杀、砍价活动管理 2023-08-06 20:21:53 +08:00
puhui999
5f9184904a fix: 完善拼团、秒杀、砍价活动管理 2023-08-06 17:46:16 +08:00
YunaiV
5e2fa48f20 code review：拼团、秒杀活动的代码 2023-08-05 20:51:48 +08:00
puhui999
92b10e2ecf Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-07-31 18:37:13 +08:00
puhui999
f5079b1c57 feat: 添加砍价活动相关 DO 2023-07-31 18:36:21 +08:00
puhui999
d156d43d63 fix：完善 review 拼团、秒杀活动的实现提到的问题 2023-07-31 18:34:56 +08:00
wcz
a6ffb5d650 BaseMapperX.java少了几个方法，TradeCartMapper.java方法调整，BpmProcessInstanceServiceImpl.java多了 2023-07-28 19:33:23 +08:00
puhui999
446951bd11 fix：封装函数 convertCDUMap 作用：数据划分为需要新增的、还是删除的、还是更新的。 2023-07-28 16:30:38 +08:00
YunaiV
b84f7825c5 review 拼团、秒杀活动的实现 2023-07-26 19:09:47 +08:00
puhui999
7957cfa50d fix：优化拼团与订单集成逻辑 2023-07-24 17:29:51 +08:00
puhui999
8d13ecc9c8 fix：优化订单发货逻辑使其支持一单分发 2023-07-24 15:14:16 +08:00
puhui999
f23e1b857a fix：合并差异修正 2023-07-21 16:54:58 +08:00
puhui999
a73e078593 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/service/order/TradeOrderServiceImpl.java
 2023-07-21 16:53:36 +08:00
puhui999
259807600a feat：拼团订单集成 2023-07-21 16:47:04 +08:00
zhijiantianya@gmail.com
3f410c2735 by gateway: 
1. 补全 channel 单元测试
2. 完善部分 order 单元测试
 2023-07-18 20:21:25 +08:00
puhui999
d80bf5a368 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-07-18 09:06:02 +08:00
YunaiV
6f475f8c85 mall + pay： 
1. 优化 PayClient 支付逻辑，返回业务失败 errorCode + errorMsg 错误码
 2023-07-18 07:37:03 +08:00
puhui999
147cd271b8 fix：完善拼团活动列表展示 2023-07-14 17:34:37 +08:00
puhui999
7cdb321fe4 fix：完善拼团活动CRUD 2023-07-14 17:08:37 +08:00
puhui999
927f71c7e2 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-07-14 14:28:26 +08:00
YunaiV
ca4afc2909 mall + pay： 
1. 调整 cashier 的 channels 的读取实现方式
 2023-07-10 18:28:43 +08:00
YunaiV
2485a5ebc9 mall + pay： 
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
 2023-07-10 17:35:26 +08:00
puhui999
e7d8643665 fix：修复 mall review @puhui999 2023-07-10 16:35:49 +08:00
chenchen
284506b356 mall 下单日志 2023-07-07 14:06:56 +08:00
chenchen
f492797fba update 售后日志 2023-07-07 14:06:56 +08:00
chenchen
2865c28a9f 售后日志优化，map->抽方法 2023-07-07 14:06:56 +08:00
chenchen
75afab1f86 售后日志优化 2023-07-07 14:06:56 +08:00
puhui999
b697ee3298 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceTest.java
 2023-07-05 22:08:12 +08:00
puhui999
b78f814552 fix：mall promotion SeckillActivity 2023-07-05 22:05:05 +08:00
puhui999
78b3d2a20f fix：mall promotion Combination 2023-07-05 11:31:16 +08:00
YunaiV
20eb0a2a88 mall + pay： 
1、调整 returnUrl 的实现
 2023-07-04 23:43:16 +08:00
puhui999
41d996f7f3 feat：mall promotion CombinationProduct 2023-07-04 11:21:03 +08:00
puhui999
c563051841 feat：mall product 新增通过 spuIds 获取相关 spu 详情列表的接口 2023-07-03 14:44:27 +08:00
puhui999
409ec555e8 feat：mall CombinationActivity 2023-07-03 08:07:05 +08:00
YunaiV
9b90320985 mall + trade： 
1、增加配送信息
 2023-07-02 12:55:15 +08:00
YunaiV
6fc724545b mall + trade： 
1、取消订单 mock 接口
2、删除订单 mock 接口
 2023-07-02 00:15:28 +08:00
YunaiV
6206dd94e2 mall + trade： 
1、获取订单结算信息，增加门店自提编号
 2023-07-01 00:26:09 +08:00
YunaiV
3750dc76c7 mall + trade： 
1、获取订单结算信息，增加积分的 mock 返回
 2023-06-30 22:45:03 +08:00
YunaiV
ef656cf762 mall + promotion： 
1、增加获得符合条件的优惠劵
 2023-06-29 20:20:00 +08:00
YunaiV
b3c1be108c mall + trade： 
1、增加门店自提的 mock 接口
 2023-06-29 00:24:45 +08:00
YunaiV
5ffea93731 mall + product： 
1、完善商品评论列表的 mock
 2023-06-28 00:25:44 +08:00
YunaiV
846405d8b1 mall + promotion： 
1、增加 article mock 接口
 2023-06-27 22:44:38 +08:00
YunaiV
7036a6652c mall + member： 
1、调整收获地址的返回
 2023-06-26 20:07:46 +08:00
YunaiV
5c9a99c83e mall + promotion： 
1、mock 优惠劵模版分页
2、mock 批量删除收藏
 2023-06-25 17:40:04 +08:00
YunaiV
bb0bb2a4fa mall + promotion：商品列表 2023-06-25 11:25:13 +08:00
YunaiV
4a3703e302 mall + promotion：review 页面装修 2023-06-25 11:24:55 +08:00
jason
050f0bb6a2 页面装修 review 修改 2023-06-24 21:09:49 +08:00
YunaiV
b582206003 mall + promotion：review 页面装修 2023-06-24 12:54:59 +08:00
jason
ad1f656dfa 页面装修修改,后端只负责存取 2023-06-24 00:11:04 +08:00
YunaiV
1dfbe45913 mall + order：review 售后日志 2023-06-23 21:50:57 +08:00
YunaiV
07884ef423 Merge branch 'mall_trade_aftersalelog' of https://gitee.com/chen934298133/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/vo/AppTradeAfterSaleCreateReqVO.java
 2023-06-23 21:37:21 +08:00
YunaiV
bc54e2fb35 mall + order：订单详情 2023-06-23 21:34:30 +08:00
芋道源码
b92ed60136
!519 订单详情后端修改 
Merge pull request !519 from 矿泉水/feature/mall_product
 2023-06-23 13:30:53 +00:00
YunaiV
2efdbf93cb mall + promotion：review 秒杀、评论代码 2023-06-23 21:14:36 +08:00
芋道源码
b16632ea41
!522 mall seckill 
Merge pull request !522 from puhui999/feature/mall_product
 2023-06-23 06:04:47 +00:00
jason
6b1d996b66 页面装修数据结构定义 2023-06-23 10:53:29 +08:00
puhui999
26f563df57 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-06-23 00:57:49 +08:00
puhui999
ab30ff6480 fix：完善 mall seckill 相关 ② 2023-06-23 00:57:27 +08:00
YunaiV
b0fcd96dfe mall + promotion：增加砍价记录的 mock 2023-06-23 00:26:04 +08:00
YunaiV
f5b2bb4d7d mall + promotion：增加砍价记录的 mock 2023-06-22 23:06:16 +08:00
YunaiV
c33bd38b5d mall + promotion：增加砍价记录的 mock 2023-06-21 23:45:59 +08:00
puhui999
b44ad3a0f7 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-06-21 08:42:36 +08:00
puhui999
666925da6e fix：mall vo @Schema required = true => requiredMode = Schema.RequiredMode.REQUIRED 2023-06-21 08:41:45 +08:00
YunaiV
772a982b5f mall + promotion：增加拼团记录的 mock 2023-06-21 00:29:50 +08:00
puhui999
700d95a43d fix：完善商品评论 review 提到的问题 2023-06-20 18:12:39 +08:00
puhui999
8dfb298376 fix：完善 mall seckill 相关 ① 2023-06-20 09:08:15 +08:00
puhui999
9517ffdfb8 fix：修复 mall product promotion 测试 sql 2023-06-20 09:06:32 +08:00
YunaiV
bf7f68a04b mall + promotion：增加拼团的 mock 返回 2023-06-19 23:35:28 +08:00
YunaiV
8a7f7fd641 mall + promotion：增加拼团的 mock 返回 2023-06-19 20:35:43 +08:00
chenchen
2f0aaee823 售后日志优化 2023-06-19 17:04:07 +08:00
xiaobai
32b348a2d3 Merge branch 'feature/mall_product' of https://gitee.com/joly_xiaobai/ruoyi-vue-pro into mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
 2023-06-19 13:06:00 +08:00
xiaobai
6b3af71735 订单详情修改20230619 2023-06-19 12:50:28 +08:00
chenchen
b7c0fef63f Merge branch 'feature/mall_product' into mall_product_aftersalelog 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-biz-trade/pom.xml
#	yudao-module-mall/yudao-module-trade-biz/pom.xml
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java
#	yudao-server/pom.xml
 2023-06-19 10:22:05 +08:00
chenchen
a93b9a616f 售后日志优化 2023-06-19 10:19:29 +08:00
puhui999
331be53b8b fix：完善时段配置管理 2023-06-19 08:58:11 +08:00
puhui999
49d726019a Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-06-19 08:33:48 +08:00
YunaiV
fc570b6062 mall + promotion：完善秒杀活动的 mock 返回 2023-06-18 21:23:50 +08:00
YunaiV
d795dbc7ac mall + promotion：优化限购、库存的返回结果 2023-06-18 20:15:34 +08:00
puhui999
cd4940d710 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-06-18 13:17:36 +08:00
YunaiV
a93acd2a74 mall + promotion：mock 秒杀列表 2023-06-18 02:05:10 +08:00
YunaiV
6573849f56 mall + promotion：mock 拼团列表 2023-06-18 00:35:22 +08:00
chenchen
7d0e9ea762 fix 依赖启动问题 2023-06-17 23:47:38 +08:00
YunaiV
60b24e36d5 code review：售后日志逻辑 2023-06-17 22:15:03 +08:00
puhui999
1871a01944 fix：seckill：调整相关类属性和表字段对齐 2023-06-17 22:14:23 +08:00
陈賝
59e16795be !514 mall交易日志封装 
* 交易日志封装
* 交易日志封装
* 交易日志模块
 2023-06-17 14:00:10 +00:00
YunaiV
35df912be7 code review：商品评价哈 2023-06-17 21:57:52 +08:00
芋道源码
08535d6019
!509 完善商品评论 
Merge pull request !509 from puhui999/feature/mall_product
 2023-06-17 13:39:35 +00:00
puhui999
16f2a5b91a Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-06-17 21:19:02 +08:00
puhui999
32cca12cd2 fix：seckillTime => seckillConfig 2023-06-17 21:17:02 +08:00
YunaiV
0d47d6cead mall + trade：code review 快递客户端的实现，没啥问题咧，搞下单测就 ok 拉 2023-06-17 11:59:38 +08:00
YunaiV
59d5fef592 mall + trade：优化运费模版的代码 2023-06-17 11:35:31 +08:00
YunaiV
07fe52939d mall + promotion：mock banner mock 接口 2023-06-17 00:47:47 +08:00
YunaiV
5b324f90a4 mall + promotion：mock 拼团活动列表 2023-06-16 23:27:27 +08:00