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 |
|
luowenfeng
|
d91655f3c4
|
feature(商城): 修改单元测试
|
2022-10-27 11:00:14 +08:00 |
|
YunaiV
|
356642ecea
|
review 商品的 save 界面
|
2022-10-25 22:13:31 +08:00 |
|
YunaiV
|
7bf37fcb64
|
优化管理后台的商品分页的查询
|
2022-10-24 22:12:47 +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
|
c06077e3a6
|
mall：code review 商品的代码
|
2022-09-05 21:02:44 +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
|
c2fd24f597
|
mall：code review 商品 spu 的后端代码
|
2022-08-23 23:58:22 +08:00 |
|
YunaiV
|
f03d679f2c
|
mall：code review 商品的添加和修改 VO；微调商品的 SPU/SKU 表
|
2022-08-23 00:33:28 +08:00 |
|
YunaiV
|
face9cae76
|
mall：调整 trade 的接口
|
2022-08-06 19:10:28 +08:00 |
|
YunaiV
|
4ce76e82fc
|
mall：完善收件地址
|
2022-08-01 22:49:51 +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
|
6a0f713452
|
mall：完善商品分类的后端接口
|
2022-07-30 19:37:31 +08:00 |
|
xingyu
|
f84f3a3631
|
refactor: 时间区间查询传入数组-测试模块
|
2022-07-22 10:24:59 +08:00 |
|
franky
|
407cbb109f
|
spu 调整一波
|
2022-06-08 18:38:14 +08:00 |
|
franky
|
6dca8e082b
|
商品调整
|
2022-06-05 15:45:36 +08:00 |
|
franky
|
eb5bdda344
|
SPU名字重构
|
2022-05-31 18:39:44 +08:00 |
|
franky
|
a86cbde090
|
商品spu和sku测试类调整
|
2022-05-18 14:47: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
|
ff307a4c86
|
fix: TODO pid 改成 parentId 字段
|
2022-05-12 16:57:33 +08:00 |
|
JeromeSoar
|
cc6c3d2759
|
品牌代码生成
|
2022-04-25 16:11:30 +08:00 |
|
JeromeSoar
|
4e67b6bbcf
|
商品分类代码生成
|
2022-04-24 14:42:51 +08:00 |
|