YunaiV
|
eeeafcc10c
|
1.9.0 版本发布
|
2 years ago |
|
芋道源码
|
fa1aa51c96
|
!771 同步最新的 CRM 代码
Merge pull request !771 from 芋道源码/feature/crm
|
2 years ago |
Ai3_刘小龙
|
7b587a79ca
|
返回使用过优惠券逻辑---->状态字段取错了
Signed-off-by: Ai3_刘小龙 <wisty0317@163.com>
|
2 years ago |
puhui999
|
79600774ec
|
crm-客户：分页查询 mapper 还是得拆成两个，怎么查逻辑交给 service 去做处理
|
2 years ago |
|
YunaiV
|
989d7c44d0
|
code review 店铺装修
|
2 years ago |
|
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
|
2 years ago |
owen
|
bdfb5b8894
|
营销：装修页面适配
|
2 years ago |
|
owen
|
9996608da6
|
营销：装修模板APP接口
|
2 years ago |
|
owen
|
32499be98f
|
营销：完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断
|
2 years ago |
|
YunaiV
|
d048daf7d6
|
mq 重构：默认的 mq 实现，采用 event，减少对 redis、rocketmq 等消息队列的依赖
|
2 years ago |
|
owen
|
c637a172ec
|
营销：装修代码整理
|
2 years ago |
|
owen
|
3a2ccc9d6b
|
营销：装修模板、装修页面
|
2 years ago |
|
YunaiV
|
3a9ac56f96
|
修复 banner 返回字段不对
|
2 years ago |
|
YunaiV
|
c11300d33a
|
解决启动问题
|
2 years ago |
|
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
|
2 years ago |
|
YunaiV
|
07dbfc5546
|
code review：sign 签到逻辑
|
2 years ago |
|
puhui999
|
ff3b1e942a
|
Banner: market ==> promotion
|
2 years ago |
|
YunaiV
|
df00126fa4
|
统一 boot 和 cloud 代码
|
2 years ago |
|
YunaiV
|
7bff98b658
|
统一 boot 和 cloud 代码
|
2 years ago |
|
YunaiV
|
054569a3d3
|
promotion：去除已经不使用的代码
|
2 years ago |
|
puhui999
|
6723cae781
|
营销活动：完善 review 提到的问题
|
2 years ago |
|
YunaiV
|
728308cbc0
|
member：优化部分变量的命名
|
2 years ago |
|
YunaiV
|
0db4581030
|
code review：签到逻辑
|
2 years ago |
|
芋道源码
|
3e570b8b89
|
!685 完善遗留的问题
Merge pull request !685 from puhui999/feature/mall_product
|
2 years ago |
|
YunaiV
|
785fbeeb5b
|
code review：限时折扣活动
|
2 years ago |
|
芋道源码
|
90fb2c62b8
|
!683 mall模块
Merge pull request !683 from zxiaoxiu/discount
|
2 years ago |
|
puhui999
|
f363c598d8
|
Banner：完善 review 提到的问题
|
2 years ago |
|
puhui999
|
f18a4741a9
|
营销活动：完善 review 提到的问题
|
2 years ago |
|
puhui999
|
f462ac7f96
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2 years ago |
zhangshuai
|
04061b028c
|
mall模块-限时折扣功能
|
2 years ago |
|
puhui999
|
283ca908b7
|
SPU: 完善选择优惠卷
|
2 years ago |
|
puhui999
|
6e11154010
|
SPU: 添加选择优惠卷
|
2 years ago |
|
YunaiV
|
453f69931f
|
code review：营销文章
|
2 years ago |
|
puhui999
|
ffbf9278b8
|
营销文章：修正文章浏览量类型错误，新增时初始化浏览量
|
2 years ago |
|
puhui999
|
6081ce30d5
|
营销活动：完善 review 提到的问题
|
2 years ago |
|
YunaiV
|
d842708c23
|
code review：数据统计
|
2 years ago |
|
YunaiV
|
1ff9bc6a71
|
code review：文章管理
|
2 years ago |
|
puhui999
|
4273b8f09c
|
营销活动：完善 review 提到的问题
|
2 years ago |
|
puhui999
|
01ef5f7911
|
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/article/ArticleController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExcelVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExportReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/article/ArticleConvert.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/article/ArticleMapper.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImplTest.java
|
2 years ago |
|
YunaiV
|
7345933d6b
|
code review：文章管理
|
2 years ago |
|
YunaiV
|
4359c584bb
|
code review：拼团逻辑
|
2 years ago |
|
puhui999
|
0d45acaf20
|
营销活动：完善文章相关 app 端接口
|
2 years ago |
|
puhui999
|
26d3672668
|
营销活动: 文章分类管理软件包调整
|
2 years ago |
|
puhui999
|
1fe6c82899
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2 years ago |
|
puhui999
|
55eed1377a
|
营销活动: 新增文章管理
|
2 years ago |
|
puhui999
|
a47ab32800
|
营销活动: 新增文章分类管理
|
2 years ago |
|
YunaiV
|
ca5e3f7bd1
|
优化最新的商城的 sql
|
2 years ago |
|
puhui999
|
a4613f0af9
|
拼团活动: 完善 review 提到的问题
|
2 years ago |
|
YunaiV
|
670a098aa8
|
code review：拼团记录流程
|
2 years ago |
|
YunaiV
|
b0179457ce
|
重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（补全各种排重逻辑）
|
2 years ago |