wangzhs
|
5674bfafc8
|
[修改][商品分类]分类只能存在2级
|
2023-03-15 14:03:00 +08:00 |
|
wangzhs
|
b89d7ff384
|
[修改][商品分类]
1. 删除 description 分类描述字段
2. 新增big_pic_url PC端分类图字段
|
2023-03-15 13:44:13 +08:00 |
|
wangzhs
|
4a01348e0b
|
[新增][商品分类] 列表查询筛选增加 status、parentId 字段
|
2023-03-15 11:36:45 +08:00 |
|
YunaiV
|
6bf5eb0133
|
适配 mall 模块的 openapi
|
2023-02-04 13:06:54 +08:00 |
|
YunaiV
|
c3eb9022b8
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
# yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
# yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
# yudao-server/pom.xml
|
2023-02-04 10:21:45 +08:00 |
|
xingyu
|
854ba3315c
|
marge master
|
2023-01-04 10:57:19 +08:00 |
|
xingyu
|
7b98a3f3f3
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
# README.md
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyListReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.java
# 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/sku/vo/ProductSkuCreateOrUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.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/controller/admin/spu/vo/ProductSpuDetailRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/property/AppProductPropertyValueDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayNotifyOrderReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayRefundOrderReqVO.java
# yudao-server/pom.xml
# yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/app/AppShopOrderController.java
|
2023-01-04 10:48:18 +08:00 |
|
dengxiaobing
|
df2c137fe2
|
清理单元测试 sql 脚本
|
2022-12-30 10:10:43 +08:00 |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
2022-12-30 00:27:14 +08:00 |
|
YunaiV
|
92632c046c
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
# yudao-ui-admin/src/views/mall/trade/order/index.vue
|
2022-12-23 19:12:45 +08:00 |
|
YunaiV
|
7a4a6a3046
|
product：优化管理后台相关的接口
area：增加地区列表界面
|
2022-12-23 18:47:59 +08:00 |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
2022-12-22 00:25:22 +08:00 |
|
YunaiV
|
92dde0b48b
|
product：优化更新 SKU 的代码
|
2022-12-15 21:31:52 +08:00 |
|
YunaiV
|
d453301455
|
product：完善 App 商品分页接口
|
2022-12-15 19:48:21 +08:00 |
|
YunaiV
|
652428a723
|
product：完善 App 商品详情接口
|
2022-12-14 22:02:07 +08:00 |
|
YunaiV
|
2f9eef589b
|
product：优化商品分类的代码
|
2022-12-14 20:32:44 +08:00 |
|
YunaiV
|
4a2cb33cd7
|
product：优化商品属性值的代码
|
2022-12-12 23:40:23 +08:00 |
|
YunaiV
|
98ca807d4b
|
product：优化商品属性项的代码
|
2022-12-12 22:25:31 +08:00 |
|
xingyu4j
|
9fc6e0f00b
|
refactor: springdoc 替换 springfox
|
2022-12-09 13:43:15 +08:00 |
|
YunaiV
|
fe1ae23b71
|
trade：增加管理后台的订单分页接口
|
2022-12-09 00:20:38 +08:00 |
|
YunaiV
|
fac3e7c726
|
product：商品规格，调整成商品属性，避免和 sku 概念冲突
|
2022-12-08 21:12:35 +08:00 |
|
xingyu
|
0d0f64e30a
|
feat: 删除过期方法
|
2022-11-23 22:54:44 +08:00 |
|
YunaiV
|
73b92190c6
|
trade：【交易售后】增加申请售后的单元测试
|
2022-11-19 14:34:59 +08:00 |
|
YunaiV
|
af71a19241
|
trade：【商品】sku 表增加 spu_name 字段，冗余
|
2022-11-19 12:25:53 +08:00 |
|
YunaiV
|
e95402ab92
|
trade：【交易订单】调整交易订单的 afterSale 字段
|
2022-11-19 09:18:19 +08:00 |
|
YunaiV
|
f6420e301e
|
修复部分单元测试报错的问题
|
2022-11-13 22:05:13 +08:00 |
|
YunaiV
|
38f67d4130
|
将 mall 使用到 Date 的部分，迁移到 LocalDateTime 中
|
2022-11-13 21:23:38 +08:00 |
|
YunaiV
|
afc76973ce
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartItemDO.java
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
# yudao-server/pom.xml
# yudao-server/src/main/resources/application-local.yaml
# yudao-server/src/main/resources/application.yaml
# yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
# yudao-ui-admin/src/views/mall/product/property/index.vue
# yudao-ui-admin/src/views/mall/product/spu/index.vue
# yudao-ui-admin/src/views/mall/product/spu/save.vue
# yudao-ui-admin/src/views/system/role/index.vue
|
2022-11-13 12:07:59 +08:00 |
|
YunaiV
|
c51ab6ad73
|
优化 Vue3 SQL 导入脚本，避免误解
|
2022-11-11 09:09:25 +08:00 |
|
YunaiV
|
84f6ec10bc
|
trade：增加优惠劵使用、商品库存的扣减
|
2022-11-10 00:32:35 +08:00 |
|
YunaiV
|
16f5d0f5a4
|
trade：增加优惠劵使用、商品库存的扣减
|
2022-11-09 23:56:00 +08:00 |
|
xingyu4j
|
632a132a6a
|
refactor: Date ==> LocalDateTime
|
2022-11-09 11:14:46 +08:00 |
|
YunaiV
|
01d10b518c
|
trade：优化创建订单接口的后端实现
|
2022-11-08 22:50:03 +08:00 |
|
YunaiV
|
6d48bd1ed8
|
promotion：完善限时折扣的添加逻辑
|
2022-11-06 00:48:07 +08:00 |
|
YunaiV
|
bd661296c0
|
promotion：完善优惠劵模板的功能
|
2022-11-02 22:19:33 +08:00 |
|
luowenfeng
|
d91655f3c4
|
feature(商城): 修改单元测试
|
2022-10-27 11:00:14 +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 |
|
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 |
|
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
|
f4324a22f2
|
mall： code review 商品模块的代码
|
2022-09-04 23:15:29 +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 |
|
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
|
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
|
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
|
1bc812fd05
|
spu 查询分类展示
|
2022-07-05 17:30:30 +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 |
|
franky
|
eb5bdda344
|
SPU名字重构
|
2022-05-31 18:39:44 +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 |
|
JeromeSoar
|
cc6c3d2759
|
品牌代码生成
|
2022-04-25 16:11:30 +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 |
|