Commit Graph

4803 Commits

Author SHA1 Message Date
芋道源码
08e9772f66
!529 回退 'Pull Request !518 : 添加华为云 maven 升级依赖'
Merge pull request !529 from 芋道源码/revert-merge-518-master
2023-07-02 15:41:47 +00:00
芋道源码
11c4c950b7
回退 'Pull Request !518 : 添加华为云 maven 升级依赖' 2023-07-02 15:41:26 +00:00
芋道源码
6b42efd786
!518 添加华为云 maven 升级依赖
Merge pull request !518 from xingyu/feature/captcha
2023-07-02 15:32:13 +00:00
YunaiV
040a66965c mall + member:
1、review 积分
2023-07-02 23:19:13 +08:00
芋道源码
2f42964a96
!524 会员中心合并至member 模块
Merge pull request !524 from QingX/feature/mall_product
2023-07-02 13:51:00 +00:00
YunaiV
9b90320985 mall + trade:
1、增加配送信息
2023-07-02 12:55:15 +08:00
congqing
1b558a02b0 修复member_user pg脚本中没有默认值导致创建用户失败的bug 2023-07-02 01:33:59 +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
0a20f7fe9e Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-30 22:45:09 +08:00
YunaiV
3750dc76c7 mall + trade:
1、获取订单结算信息,增加积分的 mock 返回
2023-06-30 22:45:03 +08:00
jason
3a1e5c1b5f pay : 会员电子钱包表结构 2023-06-30 10:24:36 +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
congqing
a918b54b28 Merge remote-tracking branch 'origin/dev-fix-sql4pg' into master-cq 2023-06-29 00:01:58 +08:00
congqing
c1e020a286 将master数据库中pg数据库的引用数据库名称变量改为master 2023-06-28 23:28:19 +08:00
xiaqing
0200fa6e53 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/pom.xml
2023-06-28 22:55:53 +08:00
xiaqing
c7ced55a6c 会员中心代码、sql脚本提交
1.合并积分模块只member module
2.初始化sql放入mysql/member_point.sql
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
2023-06-28 22:49:19 +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
xingyu
3e9768374b chore: up justauth 1.0.1 captcha-plus 1.0.5 2023-06-26 22:19:20 +08:00
xingyu
7ad3b6ad2b chore: use com.xingyuv.justauth 2023-06-26 21:08:56 +08:00
YunaiV
7036a6652c mall + member:
1、调整收获地址的返回
2023-06-26 20:07:46 +08:00
xingyu
8ea46b8fc2 fix: getNewPhoneNoInfo 已过期 2023-06-26 16:53:08 +08:00
xingyu
9826bd614b docs: up Lombok 1.18.28 2023-06-26 16:50:41 +08:00
xingyu
c1782c432f chore: up deps version 2023-06-26 16:50:20 +08:00
xingyu
d44c29296d chore: up hutool 5.8.20 Lombok 1.18.28 2023-06-26 16:49:33 +08:00
xingyu
4393c5da1c docs: up Druid 1.2.18 2023-06-26 16:30:00 +08:00
xingyu
02fe0329e4 chore: up druid 1.2.18 2023-06-26 16:29:26 +08:00
xingyu
0899f5fd29 docs: up springboot 2.10.12 2023-06-26 16:27:06 +08:00
xingyu
bdb18b4ced chore: up springboot 2.7.13 2023-06-26 16:26:38 +08:00
YunaiV
5c9a99c83e mall + promotion:
1、mock 优惠劵模版分页
2、mock 批量删除收藏
2023-06-25 17:40:04 +08:00
xiaqing
e5c556f106 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-25 15:49:30 +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