p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,419 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

224 Commits

Author SHA1 Message Date
YunaiV a88eda340b 调整 price 接口，参考 taobao 的技术文档 2022-10-28 23:49:15 +08:00
YunaiV 3b506006dd Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-10-28 22:44:18 +08:00
YunaiV 5c4b61f5ff 暂存调整 Price 接口 2022-10-28 22:44:12 +08:00
luowenfeng d91655f3c4 feature(商城): 修改单元测试 2022-10-27 11:00:14 +08:00
luowenfeng 7dd12a3e81 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-10-27 10:30:27 +08:00
YunaiV e1d5cfe8fe 微调 trade 交易表的设计 2022-10-26 21:25:29 +08:00
luowenfeng 20c79b7053 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-10-26 14:57:45 +08:00
YunaiV 356642ecea review 商品的 save 界面 2022-10-25 22:13:31 +08:00
luowenfeng d92d257619 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
 2022-10-25 11:15:17 +08:00
YunaiV 7bf37fcb64 优化管理后台的商品分页的查询 2022-10-24 22:12:47 +08:00
YunaiV c00ded3ed3 优化商品的 index 界面 2022-10-24 21:27:13 +08:00
luowenfeng 8c4e3db32b feature(商城): 商城review改 2022-10-24 10:28:07 +08:00
YunaiV 2bd2cb56a1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/pom.xml
 2022-10-23 22:16:54 +08:00
YunaiV 412c017f21 code review 商品模块 2022-10-23 22:15:26 +08:00
luowenfeng aea763e96e feature(单元测试): ProductSpuServiceImpl单元测试 2022-10-22 17:51:26 +08:00
YunaiV a13fb61359 优化 pom.xml 文件，减少无用的多租户引用 2022-10-18 23:32:42 +08:00
luowenfeng 31f5b27d01 feature(uniapp分类): review 2022-10-17 19:55:46 +08:00
zhijiantianya 8940375efa fix mall build error 2022-10-17 13:44:54 +08:00
zhijiantianya@gmail.com 67436ea4c6 mall: 下单的代码 review 2022-09-30 09:53:45 +00:00
芋道源码 952e6aa4a8
!266 接口实现-交易订单 单元测试 
Merge pull request !266 from LeeYan9/ly_uniapp
 2022-09-30 08:56:13 +00:00
zhijiantianya@gmail.com fbee21de5f mall: 商品的代码 review 2022-09-30 08:54:28 +00:00
zhijiantianya@gmail.com c25791047f mall: 商品的代码 review 2022-09-30 08:30:04 +00:00
luowenfeng d3c37c41d2 feature(管理后台): 商品管理 2022-09-22 11:41:18 +08:00
luowenfeng 77a676ee07 feature(管理后台): 商品列表 2022-09-21 19:40:07 +08:00
luowenfeng fdb2d7339f feature(管理后台): 商品列表 2022-09-21 15:57:32 +08:00
xingyu 9054a772b0 feat: 升级依赖 2022-09-20 18:00:43 +08:00
ex_yang.li@ca-nio.com 9cf470df94 创建交易订单-单元测试-冲突合并 2022-09-15 17:28:08 +08:00
ex_yang.li@ca-nio.com f21ce954ec Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into ly_uniapp 
# Conflicts:
#	yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/api/price/PriceApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.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/convert/order/TradeOrderItemConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
#	yudao-server/src/main/resources/application.yaml
 2022-09-15 17:09:17 +08:00
ex_yang.li@ca-nio.com 5889093a64 创建交易订单-单元测试 2022-09-15 16:57:04 +08:00
luowenfeng e1e55dc841 feature(商品添加): 规格调整连带商品调整 2022-09-14 11:57:30 +08:00
YunaiV 15798cea10 mall：价格计算的 API 简单实现 2022-09-12 21:37:24 +08:00
YunaiV 67d365475c 🐛修复创建订单的流程，使用到 API Bean 未声明的报错 2022-09-10 21:41:21 +08:00
芋道源码 61b0624a59
!262 接口实现-交易订单创建(未完全实现) 
Merge pull request !262 from LeeYan9/ly_uniapp
 2022-09-05 13:16:11 +00:00
YunaiV c06077e3a6 mall：code review 商品的代码 2022-09-05 21:02:44 +08:00
YunaiV 2cc60deb97 mall：code review 商品规格、规格值的代码 2022-09-05 20:29:27 +08:00
YunaiV 9632c33d27 mall：优化商品的分类、品牌的代码 2022-09-05 20:03:13 +08:00
YunaiV 37e948cc1b Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-09-04 23:15:36 +08:00
YunaiV f4324a22f2 mall： code review 商品模块的代码 2022-09-04 23:15:29 +08:00
wuxiran 02aede0417 1、修改coupon的页面、以及增加coupon的enum 2022-09-04 22:52:28 +08:00
YunaiV 833fd33844 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	sql/optional/mall/mall.sql
 2022-09-04 21:06:28 +08:00
luowenfeng ab6fd30551 feature(uniapp商品): 商品功能完善 2022-09-01 15:28:05 +08:00
luowenfeng 198b1189e8 feature(uniapp商品): 商品修改 2022-09-01 11:00:40 +08:00
YunaiV 96db6b97ad mall：解决 ProductSkuDO.properties 属性 2022-08-31 23:26:17 +08:00
luowenfeng 4207b2b61d feature(uniapp商品): 商品加载 2022-08-31 18:52:26 +08:00
ex_yang.li@ca-nio.com 19a703b8c9 创建订单接口定义 2022-08-26 17:47:43 +08:00
luowenfeng 4a39f2d9f8 feature(uniapp商品): 代码调整 2022-08-25 17:10:26 +08:00
luowenfeng 0bc2ef1d39 feature(uniapp商品): 商品业务代码调整 2022-08-24 14:08:32 +08:00
YunaiV c2fd24f597 mall：code review 商品 spu 的后端代码 2022-08-23 23:58:22 +08:00
luowenfeng 8ad1439fda feature(uniapp商品): 新增商品 2022-08-23 20:27:39 +08:00
YunaiV 81666e3b62 mall：code review 商品的添加和修改 VO；微调商品的 SPU/SKU 表 2022-08-23 00:38:49 +08:00
YunaiV a11dd1be28 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
 2022-08-23 00:37:24 +08:00
YunaiV f03d679f2c mall：code review 商品的添加和修改 VO；微调商品的 SPU/SKU 表 2022-08-23 00:33:28 +08:00
luowenfeng 8de29d302c feature(uniapp商品): 新增商品数据 2022-08-22 21:20:49 +08:00
luowenfeng 617573a59b feature(uniapp分类): 商品创建功能以及查询功能正常使用 2022-08-22 20:43:12 +08:00
YunaiV 405bf497ef mall：新增 discount 限时折扣、reward 满减送 2022-08-17 01:10:13 +08:00
YunaiV 96fc252348 mall：新增价格计算的接口 2022-08-16 09:17:46 +08:00
YunaiV cfd0f3679f Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-08-16 08:57:25 +08:00
YunaiV 5948be86a8 mall：新增价格计算的接口 2022-08-16 08:57:18 +08:00
wuxiran c8ec5c8952 mall:上传enum类，做后端模板添加判定、前端页面添加 2022-08-16 00:26:44 +08:00
YunaiV 515c0de78d Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-08-12 00:04:11 +08:00
YunaiV 00863fdbac mall：调整 trade 订单的设计 2022-08-12 00:04:05 +08:00
wuxiran ac8f62a2be mall:上传自动化生成的模板文件 2022-08-09 22:10:48 +08:00
YunaiV face9cae76 mall：调整 trade 的接口 2022-08-06 19:10:28 +08:00
YunaiV cfde3dcacb mall：优化订单表的设计 2022-08-05 00:28:40 +08:00
YunaiV 33a01e78bf mall：优化商品表的设计 2022-08-04 23:25:44 +08:00
YunaiV c612487198 mall：优化订单表的设计 2022-08-04 20:39:10 +08:00
YunaiV fd4cf0c7f7 mall：优化订单表的设计 2022-08-03 23:48:56 +08:00
YunaiV f5037015da mall：优化 spu、sku 的表结构 2022-08-03 22:30:18 +08:00
YunaiV 4ce76e82fc mall：完善收件地址 2022-08-01 22:49:51 +08:00
zy 7a164ecdff fix：打开系统接口，控制台报错 2022-08-01 14:54:21 +08:00
YunaiV 96e2a27d07 mall：初始化 trade 表结构 2022-08-01 00:53:16 +08:00
YunaiV 2b71a1588c mall：初始化 trade 交易模块 2022-07-31 22:36:06 +08:00
YunaiV 022e5b8519 mall：完善商品模块的表设计 2022-07-31 22:26:26 +08:00
YunaiV 9577f9b17d mall：调整部分 Spu、Sku、Property、Group、Shop 的表设计 2022-07-31 13:13:26 +08:00
YunaiV 2340f09c68 mall：调整部分 SPU、SKU 的表设计 2022-07-31 02:19:18 +08:00
YunaiV fa9823161e mall：完善商品品牌的前后端实现 2022-07-30 22:15:03 +08:00
YunaiV efd4942129 mall：完善商品分类的 APP 后端接口 2022-07-30 21:24:05 +08:00
YunaiV 969c387764 mall：完善商品分类的管理后台界面 2022-07-30 20:28:01 +08:00
YunaiV 6a0f713452 mall：完善商品分类的后端接口 2022-07-30 19:37:31 +08:00
YunaiV 1976571ae8 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 
# Conflicts:
#	yudao-ui-admin/src/views/mall/product/spu/index.vue
 2022-07-29 23:44:54 +08:00
luowenfeng af6a022450 feature(uniapp商品): 商品详情 2022-07-27 16:04:53 +08:00
xingyu f84f3a3631 refactor: 时间区间查询传入数组-测试模块 2022-07-22 10:24:59 +08:00
xingyu dad10d858a refactor: 时间区间查询传入数组 2022-07-21 23:22:51 +08:00
luowenfeng e2a6530acb feature(uniapp分类): 分类列表以及商品加载 2022-07-11 12:05:48 +08:00
franky be370ba2cf spu 修改调整，组合分类和规格属性，方便前端修改的回显展示 2022-07-05 22:33:11 +08:00
franky 613eef3758 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-07-05 17:30:49 +08:00
franky 1bc812fd05 spu 查询分类展示 2022-07-05 17:30:30 +08:00
YunaiV 2b9b302368 同步最新的 master 代码 2022-07-04 20:01:04 +08:00
YunaiV abbfbd5f25 code review：商品 spu、sku 的逻辑 2022-06-11 11:36:19 +08:00
franky 407cbb109f spu 调整一波 2022-06-08 18:38:14 +08:00
franky-mgmg-pc 2382ddfb37 spu sku review调整一波 2022-06-07 18:04:21 +08:00
franky-mgmg-pc c118d8198b Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
 2022-06-07 17:18:32 +08:00
franky-mgmg-pc 4bcc6c374e spu 保存，propertyValue合并到productProperty中 2022-06-07 17:16:58 +08:00
YunaiV 766afbacbf code review：商品 spu、sku 的逻辑 2022-06-07 00:32:05 +08:00
franky f07bf8b0fd spu保存校验添加 2022-06-05 22:43:20 +08:00
franky 6dca8e082b 商品调整 2022-06-05 15:45:36 +08:00
YunaiV 7c3015a67a code review banner 模块的代码 2022-05-31 19:25:24 +08:00
franky b368a54b36 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-05-31 18:39:57 +08:00
franky eb5bdda344 SPU名字重构 2022-05-31 18:39:44 +08:00
xiaxiaoYY bb0edc2a65 Banner app api for reveiew 2022-05-31 18:30:24 +08:00
xiaxiaoYY 247d299cca Banner模块 for review 2022-05-31 16:08:10 +08:00
xiaxiaoYY e31091c0df Banner管理-for review 2022-05-31 15:57:30 +08:00
shuaidawang 493b139590 重命名增加Product前缀 2022-05-19 18:07:29 +08:00
shuaidawang 204a5ba284 规格增删改查接口及页面提交 2022-05-19 17:25:28 +08:00
shuaidawang a270db821d 规格加个枚举，去掉TODO 2022-05-19 14:43:11 +08:00
shuaidawang 733a3c4615 商品规格实体类增加Product前缀 2022-05-19 14:39:23 +08:00
YunaiV 9dad9e555f code review 商品模块的表结构与模块划分 2022-05-18 19:35:25 +08:00
franky a86cbde090 商品spu和sku测试类调整 2022-05-18 14:47:58 +08:00
franky e314f4aaeb 商品规格属性代码生成 2022-05-18 14:42:58 +08:00
franky 2bbfa40265 调整商品代码生成模块 2022-05-17 22:16:48 +08:00
franky 279127298b spu和sku 自动代码生成 2022-05-17 21:12:12 +08:00
franky 9f9004624b 商品规格属性代码生成 2022-05-15 22:55:18 +08:00
jeromesoar 0d017e4b1c fix: 删除品牌和分类的无用接口 2022-05-12 17:21:26 +08:00
jeromesoar d9d473dcf0 fix: TODO 分类合理性 2022-05-12 17:09:18 +08:00
jeromesoar ff307a4c86 fix: TODO pid 改成 parentId 字段 2022-05-12 16:57:33 +08:00
YunaiV e6893db1c3 uniapp：code review 商品分类、商品品牌 2022-05-05 00:52:25 +08:00
shuaidawang 14a1d70cbb 【促销活动】-代码生成 2022-04-28 16:18:57 +08:00
JeromeSoar cc6c3d2759 品牌代码生成 2022-04-25 16:11:30 +08:00
jeromesoar 760344727d 【修复】包异常 2022-04-24 20:29:18 +08:00
JeromeSoar e4ca2e25f9 树化 2022-04-24 17:37:52 +08:00
JeromeSoar d3edaec2b1 商品分类维护 2022-04-24 17:01:10 +08:00
JeromeSoar 4e67b6bbcf 商品分类代码生成 2022-04-24 14:42:51 +08:00
JeromeSoar 09722c0cd6 【修复】mall 父模块 artifactId 2022-04-24 10:12:31 +08:00
shuaidawang c4f9f489fa 【营销模块】新建模块重命名 2022-04-23 23:32:24 +08:00