hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-11-04 12:18:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,634 Commits 20 Branches 0 Tags
bfc72a98028ab2be2becfee78339513109081873
Commit Graph

61 Commits

Author SHA1 Message Date
YunaiV
5dd6e5bee8 营销： 
1. 售后订单，增加对 afterSaleId 的更新
 2023-08-17 22:32:30 +08:00
YunaiV
c3de25e760 营销： 
1. 调整店铺装修接口
 2023-08-16 22:11:18 +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
651725e3e8 fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 2023-08-14 21:20:03 +08:00
YunaiV
503c996acd 订单： 
1、移除 deliverStatus 发货状态，暂时没作用
2、无需发货时，使用 logisticsId 进行实现
3、订单详情，增加 logisticsId 和 logisticsName 返回
 2023-08-13 20:12:24 +08:00
YunaiV
ba31d5f6fb 优化拼团活动的管理后台代码 2023-08-13 00:06:46 +08:00
YunaiV
6fdd4da0b3 优化秒杀活动的管理后台代码 2023-08-12 16:05:47 +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
b78f814552 fix：mall promotion SeckillActivity 2023-07-05 22:05:05 +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
YunaiV
4a3703e302 mall + promotion：review 页面装修 2023-06-25 11:24:55 +08:00
jason
050f0bb6a2 页面装修 review 修改 2023-06-24 21:09:49 +08:00
jason
ad1f656dfa 页面装修修改,后端只负责存取 2023-06-24 00:11:04 +08: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
9517ffdfb8 fix：修复 mall product promotion 测试 sql 2023-06-20 09:06:32 +08:00
puhui999
331be53b8b fix：完善时段配置管理 2023-06-19 08:58:11 +08:00
puhui999
1871a01944 fix：seckill：调整相关类属性和表字段对齐 2023-06-17 22:14:23 +08:00
puhui999
32cca12cd2 fix：seckillTime => seckillConfig 2023-06-17 21:17:02 +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
73a781cbbe mall + trade：增加 TradeRewardActivityPriceCalculatorTest 的单元测试 2023-06-03 13:36:07 +08:00
YunaiV
0d08c814ec mall + trade：增加 TradeDiscountActivityPriceCalculator 的单元测试 2023-06-03 13:14:47 +08:00
YunaiV
1452f6b231 mall + trade：增肌爱 TradeCouponPriceCalculator 的单元测试 2023-06-03 11:53:40 +08:00
YunaiV
2a9a869e01 mall + trade：获得订单结算信息，接入支付接口 2023-06-03 00:46:56 +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
YunaiV
102d56ff7d 修复单测报错的问题 2023-03-05 19:39:00 +08:00
YunaiV
a83b8e8fbc 修复报错的单元测试 2022-12-30 00:27:14 +08:00
YunaiV
92632c046c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue
 2022-12-23 19:12:45 +08:00
halfninety
abbb076859 完成秒杀时段，秒杀活动相关todo 2022-12-02 22:33:07 +08:00
halfninety
fc3245a06b 修改秒杀相关文件地址 2022-11-29 23:25:00 +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
xingyu
0d0f64e30a feat: 删除过期方法 2022-11-23 22:54:44 +08:00
YunaiV
38f67d4130 将 mall 使用到 Date 的部分，迁移到 LocalDateTime 中 2022-11-13 21:23:38 +08:00
YunaiV
12d045ea58 修复部分单元测试报错的问题 2022-11-13 21:08:15 +08:00
YunaiV
d7a1c8f7ca promotion：增加获得优惠劵匹配结果的列表的单元测试 2022-11-08 19:32:49 +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
c87bc084e6 promotion：RewardActivityServiceImpl 的 getMatchRewardActivities 逻辑 2022-11-06 16:36:14 +08:00
YunaiV
941782fb10 promotion：完善限时折扣的修改逻辑 2022-11-06 12:38:13 +08:00
YunaiV
544597d6e2 promotion：完善限时折扣，补充相关的单元测试 2022-11-05 19:57:50 +08:00
YunaiV
d4b7f4aaa0 promotion：增加限时折扣的基础代码 2022-11-05 19:13:43 +08:00