xingyu
|
0b3640a522
|
fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
|
2023-05-08 10:06:17 +08:00 |
|
jason
|
14d02bdfb3
|
商品收藏修改
|
2023-05-06 11:58:27 +08:00 |
|
YunaiV
|
96e2bf020f
|
REVIEW 商品收藏的逻辑
|
2023-05-05 23:38:31 +08:00 |
|
YunaiV
|
cd86620b74
|
REVIEW 商品管理的逻辑
|
2023-05-05 23:01:23 +08:00 |
|
jason
|
7345d80b53
|
新增商品收藏功能
|
2023-05-04 15:52:42 +08:00 |
|
puhui999
|
810c7ed040
|
完善商品管理
|
2023-05-04 01:32:25 +08:00 |
|
puhui999
|
c233ce1a20
|
合并分支修复差异
|
2023-05-03 22:18:27 +08:00 |
|
puhui999
|
e163ae8b70
|
完成商品保存和编辑数据回显
|
2023-05-03 02:31:50 +08:00 |
|
puhui999
|
70816371e5
|
初步完成商品CRUD
|
2023-05-02 02:33:14 +08:00 |
|
YunaiV
|
da162853ec
|
商城:完善购物车的逻辑
|
2023-04-30 20:32:01 +08:00 |
|
puhui999
|
15ced47b17
|
添加多租户
|
2023-04-30 17:35:38 +08:00 |
|
puhui999
|
c10ea9d9de
|
移除ProductSku相关的status属性,修改Property
|
2023-04-30 17:35:05 +08:00 |
|
puhui999
|
24a56bb45f
|
移除ProductSku相关的status属性,修改Property
|
2023-04-30 17:34:56 +08:00 |
|
puhui999
|
f56d394830
|
修改ProductSpuBaseVO第一版
|
2023-04-29 21:28:09 +08:00 |
|
puhui999
|
668d493b7f
|
Product相关Do添加TenantBaseDO
|
2023-04-29 21:22:52 +08:00 |
|
YunaiV
|
2113e825d7
|
完善 App 商品详情逻辑的 10%
|
2023-04-27 22:43:37 +08:00 |
|
YunaiV
|
3ced6a3240
|
完善 App 商品搜索的逻辑
|
2023-04-26 20:13:12 +08:00 |
|
puhui999
|
4068548c45
|
移除ProductSpuSpecTypeEnum及相关引用
|
2023-04-26 17:38:42 +08:00 |
|
YunaiV
|
a5f018104e
|
调整商品分类的实现
|
2023-04-25 21:33:59 +08:00 |
|
puhui999
|
c3e36ba9da
|
修正相关问题让服务正常启动,改动位置都已加上TODO记录
|
2023-04-24 10:50:40 +08:00 |
|
puhui999
|
6786aa352b
|
修正DO对齐数据库表字段,VO对齐前端
|
2023-04-24 10:29:02 +08:00 |
|
YunaiV
|
32da5aae84
|
商城:product:完善 ProductSpuDO 表
|
2023-04-19 18:07:22 +08:00 |
|
YunaiV
|
63542b4ccb
|
商城:product:完善 ProductSkuDO 表
|
2023-04-19 16:30:57 +08:00 |
|
YunaiV
|
b30fc28021
|
商城:product:完善 ProductSpuDO 表
|
2023-04-19 10:55:43 +08:00 |
|
lizs
|
d5a48e63a3
|
fix: 新建商品时商品分类状态判断错误
|
2023-04-16 21:53:24 +08:00 |
|
wangzhs
|
38d7d75f7f
|
[新增][商品评价]管理后台/APP端
1. 增加头像返回字段
2. 调整商户自评userId
3. 控制评论图片数量判断
|
2023-03-23 14:06:14 +08:00 |
|
wangzhs
|
6fe5f4bc0d
|
[新增][商品评价]管理后台/APP端
|
2023-03-21 11:09:10 +08:00 |
|
wangzhs
|
cbf5ef5953
|
[新增][商品评价]管理后台
1. 显示 / 隐藏评论
2. 商家回复
|
2023-03-19 22:07:07 +08:00 |
|
wangzhs
|
da53a041da
|
[新增][商品评价]管理后台分页查询
|
2023-03-19 18:59:51 +08:00 |
|
wangzhs
|
f69d8503a2
|
[新增][商品评价]
1. 实体类
2. h2.sql
|
2023-03-19 15:47:49 +08:00 |
|
wangzhs
|
b0c73b786a
|
[测试][商品分类]测试创建商品分类
|
2023-03-15 14:23:42 +08:00 |
|
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 |
|