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
7,540 Commits 1 Branch 0 Tags 176 MiB
6e56ca4b2e
Commit Graph

158 Commits

Author SHA1 Message Date
puhui999
2c0f1121ca 拼团活动：完善 review 提到的问题 2023-10-08 17:46:48 +08:00
puhui999
2e559ebe06 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/service/combination/CombinationRecordServiceImpl.java
 2023-10-08 17:33:21 +08:00
puhui999
c8a9d68933 拼团活动：完善 review 提到的问题 2023-10-08 12:08:17 +08:00
YunaiV
01e6140d67 code review：拼团记录流程 2023-10-08 09:53:09 +08:00
YunaiV
99649bfdb8 code review：拼团记录流程 2023-10-08 07:43:25 +08:00
puhui999
c485c6e04d 订单：重构拼团下单流程更改为订单支付后再创建拼团记录 2023-10-07 16:30:28 +08:00
puhui999
f40bd23f6a 拼团记录：完善拼团记录创建前的条件校验规则 2023-10-07 14:30:25 +08:00
YunaiV
c7b5df930e promotion：修复拼团下单时，相关字段记录不正确的情况。 2023-10-07 07:09:15 +08:00
puhui999
f732e7a750 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/bargain/BargainRecordApiImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainRecordServiceImpl.java
 2023-10-06 00:05:28 +08:00
YunaiV
aec8e853e4 trade：完善砍价的下单流程 2023-10-05 23:24:44 +08:00
puhui999
0b2943ba8b 拼团活动：完善拼团下单金额结算 2023-10-05 21:28:38 +08:00
YunaiV
1bda3c8b53 promotion：完善砍价 API ~ 提交下，准备出门吃饭！！！！ 2023-10-05 17:22:17 +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
8dbabb9efc trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算 2023-10-04 11:29:38 +08:00
YunaiV
20f5834d9a trade：价格计算时，接入优惠劵逻辑 2023-10-04 00:30:03 +08:00
puhui999
82210a9583 订单：完善拼团活动 2023-09-30 23:34:45 +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
owen
26628913cb 错误码分段 2023-09-29 21:34:38 +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
owen
0a3a6825d5 优惠券：完善APP优惠券查询接口 2023-09-26 20:44:22 +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
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
53e789dfdc trade：订单表，增加 vip 优惠字段 2023-09-23 23:58:22 +08:00
YunaiV
aa5525d1f5 code review：营销活动 & 交易订单的对接 2023-09-23 22:21:23 +08:00
owen
052328c5fa 积分：完善积分获得、退还、使用 相关逻辑 2023-09-23 14:11:16 +08:00
YunaiV
71d6311bd4 code review：拼团、秒杀等逻辑 2023-09-23 09:27:29 +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
puhui999
408df683d8 秒杀活动: 完善 app 端获取活动分页、列表、详情接口 2023-09-19 18:57:28 +08:00
puhui999
a10d77cdfe mall+order: 完善部分 TODO 提到的问题 2023-09-13 12:04:13 +08:00
YunaiV
e8bdd8349c code review：订单部分逻辑 2023-09-12 13:54:52 +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
puhui999
7fb455096c 商城活动: 完善活动商品并发库存扣减逻辑 2023-09-11 00:13:45 +08:00
puhui999
57f0ea04f7 mall-order: 完善活动商品库存扣减逻辑（并发更新库存下一提交实现） 2023-09-10 11:06:39 +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
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
puhui999
2591ab5d36 订单中心+营销活动：完善部分 TODO 提到的问题 2023-09-06 11:29:51 +08:00
owen
8bbaaf1ce9 promotion: 优惠券模板 productSpuIds 改成 productScopeValues 2023-09-02 09:53:37 +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
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
owen
530ec7ab24 mall: 完善后台发送优惠券 2023-08-26 22:29:56 +08:00
YunaiV
94a32d34b2 1. 会员用户，增加 point 积分字段 
2. 增加获得优惠劵、收藏数量的 API 接口
 2023-08-19 17:00:40 +08:00
YunaiV
c3de25e760 营销： 
1. 调整店铺装修接口
 2023-08-16 22:11:18 +08:00
YunaiV
159c74ce15 订单： 
1. review 发货
2. review 拼团逻辑
 2023-08-15 21:04:20 +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
651725e3e8 fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 2023-08-14 21:20:03 +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
d156d43d63 fix：完善 review 拼团、秒杀活动的实现提到的问题 2023-07-31 18:34:56 +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
259807600a feat：拼团订单集成 2023-07-21 16:47:04 +08:00
puhui999
7cdb321fe4 fix：完善拼团活动CRUD 2023-07-14 17:08:37 +08:00
puhui999
78b3d2a20f fix：mall promotion Combination 2023-07-05 11:31:16 +08:00
puhui999
41d996f7f3 feat：mall promotion CombinationProduct 2023-07-04 11:21:03 +08:00
puhui999
409ec555e8 feat：mall CombinationActivity 2023-07-03 08:07:05 +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
芋道源码
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
331be53b8b fix：完善时段配置管理 2023-06-19 08:58:11 +08:00
YunaiV
4f5ac0edbb mall + promotion：增加营销活动的 mock 接口 2023-06-10 17:51:15 +08:00
puhui999
ba380ea615 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/price/PriceServiceTest.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/test/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceTest.java
 2023-06-03 20:55:45 +08:00
YunaiV
1452f6b231 mall + trade：增肌爱 TradeCouponPriceCalculator 的单元测试 2023-06-03 11:53:40 +08:00
YunaiV
5de8fa2e42 mall + trade：解决报错问题 2023-05-31 21:17:35 +08:00
puhui999
35daee84e7 fix: 解决合并代码后项目运行失败的问题，相关问题已标注 TODO 2023-05-30 10:26:42 +08:00
YunaiV
0631c51d93 mall + trade：review 配置管理列表 2023-05-28 23:16:11 +08:00
YunaiV
02fa6fc5c6 mall + trade：调整价格字段，更易懂 2023-05-26 23:58:26 +08:00
崔家辉
fbeaa06100 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误 2023-05-19 10:47:23 +08:00
halfninety
54baad165d 秒杀时段新增修改时间段冲突校验。 
秒杀活动新增，修改，删除时对秒杀时段的秒杀活动数量进行修改
 2022-11-29 23:25:00 +08:00
halfninety
7bc1ae5f35 秒杀活动增删改查 2022-11-29 23:25:00 +08:00
halfninety
cd62c4d220 秒杀时段相关 2022-11-29 23:25:00 +08:00
halfninety
83ee1c6129 秒杀活动，添加商品，分页查询 2022-11-29 23:24:59 +08:00
YunaiV
16f5d0f5a4 trade：增加优惠劵使用、商品库存的扣减 2022-11-09 23:56:00 +08:00
YunaiV
01d10b518c trade：优化创建订单接口的后端实现 2022-11-08 22:50:03 +08:00
YunaiV
edc5d0f1d0 promotion：增加获得优惠劵匹配结果的列表 2022-11-08 00:40:53 +08:00
YunaiV
d10f49b6a7 promotion：优化价格计算的接口，增加 orderPrice 字段 2022-11-06 22:25:02 +08:00
YunaiV
636cc794dd promotion：完善价格计算，重新接入限时折扣的多种优惠方式 2022-11-06 18:41:27 +08:00
YunaiV
d4b7f4aaa0 promotion：增加限时折扣的基础代码 2022-11-05 19:13:43 +08:00
YunaiV
00f90e75d9 promotion：增加满减送活动的关闭功能 2022-11-05 10:52:09 +08:00
YunaiV
79304b3a73 promotion：增加满减送活动的排重校验、单元测试 2022-11-05 09:57:45 +08:00
YunaiV
0e5b7734ac promotion：增加满减送活动的后端 20% 2022-11-04 23:19:28 +08:00
YunaiV
873b530652 promotion：增加优惠劵的回收操作 2022-11-04 21:17:37 +08:00