308 Commits (9f63e1e2947be6ddcc9b7019d9a796ef9b88ee04)

Author SHA1 Message Date
YunaiV 5c9a99c83e mall + promotion:
1、mock 优惠劵模版分页
2、mock 批量删除收藏
3 years ago
YunaiV bb0bb2a4fa mall + promotion:商品列表 3 years ago
YunaiV b582206003 mall + promotion:review 页面装修 3 years ago
YunaiV 2efdbf93cb mall + promotion:review 秒杀、评论代码 3 years ago
puhui999 ab30ff6480 fix:完善 mall seckill 相关 ② 3 years ago
puhui999 666925da6e fix:mall vo @Schema required = true => requiredMode = Schema.RequiredMode.REQUIRED 3 years ago
puhui999 700d95a43d fix:完善商品评论 review 提到的问题 3 years ago
puhui999 9517ffdfb8 fix:修复 mall product promotion 测试 sql 3 years ago
YunaiV fc570b6062 mall + promotion:完善秒杀活动的 mock 返回 3 years ago
YunaiV 35df912be7 code review:商品评价哈 3 years ago
芋道源码 08535d6019
!509 完善商品评论
Merge pull request !509 from puhui999/feature/mall_product
3 years ago
xingyu e23fb5024a fix: required = true 已过期 3 years ago
xingyu 573ad59edc Merge remote-tracking branch 'origin/master' into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.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/spu/vo/ProductSpuBaseVO.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-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
3 years ago
puhui999 60172274ec fix:合并代码后修改差异完善商品评论相关 3 years ago
puhui999 5cfcaa1a6e Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppCommentController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentRespVO.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/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
3 years ago
puhui999 9ff873fe53 fix:完善商品评论测试 sql 3 years ago
puhui999 20100aa78b fix:完善商品评论 3 years ago
YunaiV 4f5ac0edbb mall + promotion:增加营销活动的 mock 接口 3 years ago
YunaiV 9e894e0430 mall + promotion:增加优惠劵的 mock 接口 3 years ago
YunaiV bb8e44a268 mall + product:增加评论 mock 逻辑 3 years ago
YunaiV 1e1a22c256 mall + product:评论的 review 3 years ago
YunaiV 84b365a707 mall + product:简化收藏逻辑,去掉 type 字段 3 years ago
YunaiV f2d803c111 mall + product:review 评论接口 3 years ago
YunaiV 4126e37d91 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/pom.xml
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
3 years ago
YunaiV f75f4e8846 mall + product:完善商品详情接口 3 years ago
puhui999 91e357e59d fix:移动 app 商品评论分页相关常量到 AppCommentPageReqVO 中 3 years ago
puhui999 8f7efbe4e2 fix:测试 app 商品评论页获取评论分页接口和相关评论分类数量接口,修复测试时发现的问题 3 years ago
puhui999 151e58daa1 fix:完善 app 商品评论页获取评论分页接口和相关评论分类数量接口 3 years ago
puhui999 db7e47faa2 fix:完善 TODO 提到的问题 3 years ago
YunaiV dd93215139 mall + trade:review 商品管理 3 years ago
puhui999 ba380ea615 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/price/PriceServiceTest.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
#	yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceTest.java
3 years ago
YunaiV 36ce968893 mall + trade:review 运费价格计算 3 years ago
jason f1fa8eadd2 mall - trade - 新增 TradeDeliveryPriceCalculator 3 years ago
YunaiV 2a9a869e01 mall + trade:获得订单结算信息,接入支付接口 3 years ago
puhui999 8d2bcc57aa fix: 完善商品管理 3 years ago
puhui999 e86214015d fix: 完善商品管理 3 years ago
puhui999 b065a2a741 fix:修复商品 review 提到的问题 3 years ago
YunaiV c62da6a056 mall:review 商品接口 3 years ago
puhui999 a70c7ca855 fix:完善 mall.sql 3 years ago
puhui999 d08b9530a2 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
#	sql/mysql/optional/mall.sql
3 years ago
puhui999 cac5545762 fix:完善商品管理, 完善 mall.sql, 完善 product 测试相关sql, 完善 ProductSpuServiceImplTest 测试 3 years ago
YunaiV 8ed52701fd 调整商品收藏的命名 3 years ago
jason 4b643a7b34 物流配送管理表结构修改 3 years ago
jason 7a792a7d48 商品收藏相关修改 3 years ago
YunaiV 7fef594390 订单接口的梳理 3 years ago
YunaiV c21e88860f REVIEW 物流管理相关的表 3 years ago
YunaiV 467811a42e REVIEW 商品收藏的逻辑 v2 3 years ago
jason 0ffa7ff4c8 发货配送模块表结构 3 years ago
xingyu 0b3640a522 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 3 years ago
jason 14d02bdfb3 商品收藏修改 3 years ago
YunaiV 96e2bf020f REVIEW 商品收藏的逻辑 3 years ago
YunaiV cd86620b74 REVIEW 商品管理的逻辑 3 years ago
jason 7345d80b53 新增商品收藏功能 3 years ago
puhui999 810c7ed040 完善商品管理 3 years ago
puhui999 c233ce1a20 合并分支修复差异 3 years ago
puhui999 e163ae8b70 完成商品保存和编辑数据回显 3 years ago
puhui999 70816371e5 初步完成商品CRUD 3 years ago
YunaiV da162853ec 商城:完善购物车的逻辑 3 years ago
puhui999 15ced47b17 添加多租户 3 years ago
puhui999 c10ea9d9de 移除ProductSku相关的status属性,修改Property 3 years ago
puhui999 24a56bb45f 移除ProductSku相关的status属性,修改Property 3 years ago
puhui999 f56d394830 修改ProductSpuBaseVO第一版 3 years ago
puhui999 668d493b7f Product相关Do添加TenantBaseDO 3 years ago
YunaiV 2113e825d7 完善 App 商品详情逻辑的 10% 3 years ago
YunaiV 3ced6a3240 完善 App 商品搜索的逻辑 3 years ago
puhui999 4068548c45 移除ProductSpuSpecTypeEnum及相关引用 3 years ago
YunaiV a5f018104e 调整商品分类的实现 3 years ago
puhui999 c3e36ba9da 修正相关问题让服务正常启动,改动位置都已加上TODO记录 3 years ago
puhui999 6786aa352b 修正DO对齐数据库表字段,VO对齐前端 3 years ago
YunaiV 32da5aae84 商城:product:完善 ProductSpuDO 表 3 years ago
YunaiV 63542b4ccb 商城:product:完善 ProductSkuDO 表 3 years ago
YunaiV b30fc28021 商城:product:完善 ProductSpuDO 表 3 years ago
lizs d5a48e63a3 fix: 新建商品时商品分类状态判断错误 3 years ago
wangzhs 38d7d75f7f [新增][商品评价]管理后台/APP端
1. 增加头像返回字段
2. 调整商户自评userId
3. 控制评论图片数量判断
3 years ago
wangzhs 6fe5f4bc0d [新增][商品评价]管理后台/APP端 3 years ago
wangzhs cbf5ef5953 [新增][商品评价]管理后台
1. 显示 / 隐藏评论
2. 商家回复
3 years ago
wangzhs da53a041da [新增][商品评价]管理后台分页查询 3 years ago
wangzhs f69d8503a2 [新增][商品评价]
1. 实体类
2. h2.sql
3 years ago
wangzhs b0c73b786a [测试][商品分类]测试创建商品分类 3 years ago
wangzhs 5674bfafc8 [修改][商品分类]分类只能存在2级 3 years ago
wangzhs b89d7ff384 [修改][商品分类]
1. 删除 description 分类描述字段
2. 新增big_pic_url PC端分类图字段
3 years ago
wangzhs 4a01348e0b [新增][商品分类] 列表查询筛选增加 status、parentId 字段 3 years ago
YunaiV 6bf5eb0133 适配 mall 模块的 openapi 3 years ago
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
3 years ago
xingyu 854ba3315c marge master 3 years ago
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
3 years ago
dengxiaobing df2c137fe2 清理单元测试 sql 脚本 3 years ago
YunaiV a83b8e8fbc 修复报错的单元测试 3 years ago
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
3 years ago
YunaiV 7a4a6a3046 product:优化管理后台相关的接口
area:增加地区列表界面
3 years ago
xingyu cacefb4eea feat: knife4j springdoc 3 years ago
YunaiV 92dde0b48b product:优化更新 SKU 的代码 3 years ago
YunaiV d453301455 product:完善 App 商品分页接口 3 years ago
YunaiV 652428a723 product:完善 App 商品详情接口 3 years ago
YunaiV 2f9eef589b product:优化商品分类的代码 3 years ago
YunaiV 4a2cb33cd7 product:优化商品属性值的代码 3 years ago
YunaiV 98ca807d4b product:优化商品属性项的代码 3 years ago
xingyu4j 9fc6e0f00b refactor: springdoc 替换 springfox 3 years ago
YunaiV fe1ae23b71 trade:增加管理后台的订单分页接口 3 years ago
YunaiV fac3e7c726 product:商品规格,调整成商品属性,避免和 sku 概念冲突 3 years ago
xingyu 0d0f64e30a feat: 删除过期方法 3 years ago
YunaiV 73b92190c6 trade:【交易售后】增加申请售后的单元测试 3 years ago
YunaiV af71a19241 trade:【商品】sku 表增加 spu_name 字段,冗余 3 years ago
YunaiV e95402ab92 trade:【交易订单】调整交易订单的 afterSale 字段 3 years ago
YunaiV f6420e301e 修复部分单元测试报错的问题 3 years ago
YunaiV 38f67d4130 将 mall 使用到 Date 的部分,迁移到 LocalDateTime 中 3 years ago
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
3 years ago
YunaiV c51ab6ad73 优化 Vue3 SQL 导入脚本,避免误解 3 years ago
YunaiV 84f6ec10bc trade:增加优惠劵使用、商品库存的扣减 3 years ago
YunaiV 16f5d0f5a4 trade:增加优惠劵使用、商品库存的扣减 3 years ago
xingyu4j 632a132a6a refactor: Date ==> LocalDateTime 3 years ago
YunaiV 01d10b518c trade:优化创建订单接口的后端实现 3 years ago
YunaiV 6d48bd1ed8 promotion:完善限时折扣的添加逻辑 3 years ago
YunaiV bd661296c0 promotion:完善优惠劵模板的功能 3 years ago
luowenfeng d91655f3c4 feature(商城): 修改单元测试 3 years ago
luowenfeng 20c79b7053 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 3 years ago
YunaiV 356642ecea review 商品的 save 界面 3 years ago
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
3 years ago
YunaiV 7bf37fcb64 优化管理后台的商品分页的查询 3 years ago
YunaiV c00ded3ed3 优化商品的 index 界面 3 years ago
luowenfeng 8c4e3db32b feature(商城): 商城review改 3 years ago
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
3 years ago
YunaiV 412c017f21 code review 商品模块 3 years ago
luowenfeng aea763e96e feature(单元测试): ProductSpuServiceImpl单元测试 3 years ago
YunaiV a13fb61359 优化 pom.xml 文件,减少无用的多租户引用 3 years ago
luowenfeng 31f5b27d01 feature(uniapp分类): review 3 years ago
zhijiantianya 8940375efa fix mall build error 3 years ago
zhijiantianya@gmail.com 67436ea4c6 mall: 下单的代码 review 4 years ago
芋道源码 952e6aa4a8
!266 接口实现-交易订单 单元测试
Merge pull request !266 from LeeYan9/ly_uniapp
4 years ago
zhijiantianya@gmail.com fbee21de5f mall: 商品的代码 review 4 years ago
zhijiantianya@gmail.com c25791047f mall: 商品的代码 review 4 years ago
luowenfeng d3c37c41d2 feature(管理后台): 商品管理 4 years ago
luowenfeng 77a676ee07 feature(管理后台): 商品列表 4 years ago
luowenfeng fdb2d7339f feature(管理后台): 商品列表 4 years ago
ex_yang.li@ca-nio.com 9cf470df94 创建交易订单-单元测试-冲突合并 4 years ago
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
4 years ago
ex_yang.li@ca-nio.com 5889093a64 创建交易订单-单元测试 4 years ago
luowenfeng e1e55dc841 feature(商品添加): 规格调整连带商品调整 4 years ago
YunaiV 15798cea10 mall:价格计算的 API 简单实现 4 years ago
YunaiV 67d365475c 🐛修复创建订单的流程,使用到 API Bean 未声明的报错 4 years ago
YunaiV c06077e3a6 mall:code review 商品的代码 4 years ago
YunaiV 2cc60deb97 mall:code review 商品规格、规格值的代码 4 years ago
YunaiV 9632c33d27 mall:优化商品的分类、品牌的代码 4 years ago
YunaiV f4324a22f2 mall: code review 商品模块的代码 4 years ago
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
4 years ago
luowenfeng ab6fd30551 feature(uniapp商品): 商品功能完善 4 years ago
luowenfeng 198b1189e8 feature(uniapp商品): 商品修改 4 years ago
YunaiV 96db6b97ad mall:解决 ProductSkuDO.properties 属性 4 years ago
luowenfeng 4207b2b61d feature(uniapp商品): 商品加载 4 years ago
luowenfeng 4a39f2d9f8 feature(uniapp商品): 代码调整 4 years ago