owen
|
31a28cb40d
|
Review代码修改
|
2024-01-11 12:38:17 +08:00 |
|
YunaiV
|
a259e032e1
|
✨ MALL：增加商品列表的分类编号数组、商品编号的筛选
|
2024-01-06 20:42:32 +08:00 |
|
YunaiV
|
98697ee075
|
⬆️
|
2023-12-07 20:48:11 +08:00 |
|
YunaiV
|
787de1be94
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# sql/mysql/mall.sql
# sql/mysql/ruoyi-vue-pro.sql
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java
|
2023-11-04 20:48:27 +08:00 |
|
owen
|
32499be98f
|
营销：完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断
|
2023-10-31 16:01:23 +08:00 |
|
owen
|
3a2ccc9d6b
|
营销：装修模板、装修页面
|
2023-10-27 14:58:04 +08:00 |
|
YunaiV
|
52e735f360
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java
|
2023-10-24 19:09:01 +08:00 |
|
YunaiV
|
07dbfc5546
|
code review：sign 签到逻辑
|
2023-10-24 19:08:08 +08:00 |
|
YunaiV
|
054569a3d3
|
promotion：去除已经不使用的代码
|
2023-10-23 19:24:04 +08:00 |
|
YunaiV
|
ec27a1bae5
|
修复报错的单元测试
|
2023-10-22 08:24:47 +08:00 |
|
芋道源码
|
3e570b8b89
|
!685 完善遗留的问题
Merge pull request !685 from puhui999/feature/mall_product
|
2023-10-21 11:31:56 +00:00 |
|
YunaiV
|
785fbeeb5b
|
code review：限时折扣活动
|
2023-10-21 18:16:09 +08:00 |
|
puhui999
|
f363c598d8
|
Banner：完善 review 提到的问题
|
2023-10-21 17:09:04 +08:00 |
|
puhui999
|
6e11154010
|
SPU: 添加选择优惠卷
|
2023-10-20 11:35:16 +08:00 |
|
puhui999
|
4273b8f09c
|
营销活动：完善 review 提到的问题
|
2023-10-16 18:53:25 +08:00 |
|
YunaiV
|
4359c584bb
|
code review：拼团逻辑
|
2023-10-16 09:07:02 +08:00 |
|
puhui999
|
55eed1377a
|
营销活动: 新增文章管理
|
2023-10-15 16:16:41 +08:00 |
|
puhui999
|
a47ab32800
|
营销活动: 新增文章分类管理
|
2023-10-15 01:29:30 +08:00 |
|
puhui999
|
a4613f0af9
|
拼团活动: 完善 review 提到的问题
|
2023-10-13 12:07:28 +08:00 |
|
YunaiV
|
670a098aa8
|
code review：拼团记录流程
|
2023-10-11 11:04:22 +08:00 |
|
puhui999
|
245f14b8f1
|
秒杀活动：完成订单取消时恢复活动库存和商品库存
|
2023-10-10 10:25:57 +08:00 |
|
puhui999
|
53e67c0437
|
拼团活动：完善 review 提到的问题
|
2023-10-09 11:53:02 +08:00 |
|
YunaiV
|
7b727d5ce2
|
code review：拼团记录流程
|
2023-10-08 21:14:54 +08:00 |
|
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 |
|