Commit Graph

523 Commits

Author SHA1 Message Date
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
5c4b61f5ff 暂存调整 Price 接口 2022-10-28 22:44:12 +08:00
d91655f3c4 feature(商城): 修改单元测试 2022-10-27 11:00:14 +08:00
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
e1d5cfe8fe 微调 trade 交易表的设计 2022-10-26 21:25:29 +08:00
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
356642ecea review 商品的 save 界面 2022-10-25 22:13:31 +08:00
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
7bf37fcb64 优化管理后台的商品分页的查询 2022-10-24 22:12:47 +08:00
c00ded3ed3 优化商品的 index 界面 2022-10-24 21:27:13 +08:00
8c4e3db32b feature(商城): 商城review改 2022-10-24 10:28:07 +08:00
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
412c017f21 code review 商品模块 2022-10-23 22:15:26 +08:00
aea763e96e feature(单元测试): ProductSpuServiceImpl单元测试 2022-10-22 17:51:26 +08:00
a13fb61359 优化 pom.xml 文件,减少无用的多租户引用 2022-10-18 23:32:42 +08:00
31f5b27d01 feature(uniapp分类): review 2022-10-17 19:55:46 +08:00
8940375efa fix mall build error 2022-10-17 13:44:54 +08:00
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
fbee21de5f mall: 商品的代码 review 2022-09-30 08:54:28 +00:00
c25791047f mall: 商品的代码 review 2022-09-30 08:30:04 +00:00
d3c37c41d2 feature(管理后台): 商品管理 2022-09-22 11:41:18 +08:00
77a676ee07 feature(管理后台): 商品列表 2022-09-21 19:40:07 +08:00
fdb2d7339f feature(管理后台): 商品列表 2022-09-21 15:57:32 +08:00
9054a772b0 feat: 升级依赖 2022-09-20 18:00:43 +08:00
9cf470df94 创建交易订单-单元测试-冲突合并 2022-09-15 17:28:08 +08:00
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
5889093a64 创建交易订单-单元测试 2022-09-15 16:57:04 +08:00
e1e55dc841 feature(商品添加): 规格调整连带商品调整 2022-09-14 11:57:30 +08:00
15798cea10 mall:价格计算的 API 简单实现 2022-09-12 21:37:24 +08:00
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
c06077e3a6 mall:code review 商品的代码 2022-09-05 21:02:44 +08:00
2cc60deb97 mall:code review 商品规格、规格值的代码 2022-09-05 20:29:27 +08:00
9632c33d27 mall:优化商品的分类、品牌的代码 2022-09-05 20:03:13 +08:00
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
f4324a22f2 mall: code review 商品模块的代码 2022-09-04 23:15:29 +08:00
02aede0417 1、修改coupon的页面、以及增加coupon的enum 2022-09-04 22:52:28 +08:00
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
ab6fd30551 feature(uniapp商品): 商品功能完善 2022-09-01 15:28:05 +08:00
198b1189e8 feature(uniapp商品): 商品修改 2022-09-01 11:00:40 +08:00
96db6b97ad mall:解决 ProductSkuDO.properties 属性 2022-08-31 23:26:17 +08:00
4207b2b61d feature(uniapp商品): 商品加载 2022-08-31 18:52:26 +08:00
19a703b8c9 创建订单接口定义 2022-08-26 17:47:43 +08:00
4a39f2d9f8 feature(uniapp商品): 代码调整 2022-08-25 17:10:26 +08:00
0bc2ef1d39 feature(uniapp商品): 商品业务代码调整 2022-08-24 14:08:32 +08:00
c2fd24f597 mall:code review 商品 spu 的后端代码 2022-08-23 23:58:22 +08:00
8ad1439fda feature(uniapp商品): 新增商品 2022-08-23 20:27:39 +08:00
81666e3b62 mall:code review 商品的添加和修改 VO;微调商品的 SPU/SKU 表 2022-08-23 00:38:49 +08:00
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