95 Commits (0763c720d2a5ba4f91cd3cbea6d8d8575eead5a4)

Author SHA1 Message Date
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
芋道源码 f9b4874ee9
!320 秒杀活动相关
Merge pull request !320 from halfninety/feature/1.8.0-uniapp
3 years ago
YunaiV 4a2cb33cd7 product:优化商品属性值的代码 3 years ago
YunaiV 98ca807d4b product:优化商品属性项的代码 3 years ago
YunaiV 7f131a3853 trade:增加用户 App 的订单分页和详情接口 3 years ago
YunaiV b7d78a24a4 trade:完成管理后台的订单详情的简单对接 3 years ago
YunaiV c5408965eb trade:增加管理后台的订单详情接口 3 years ago
YunaiV fc48ab4928 trade:前端订单管理,联调接口 3 years ago
YunaiV fc49f000ce trade:前端订单管理,联调接口 3 years ago
YunaiV fac3e7c726 product:商品规格,调整成商品属性,避免和 sku 概念冲突 3 years ago
halfninety 6808d3c163 完成秒杀时段todo,秒杀时段商品添加timeIds 3 years ago
halfninety 61c4053cbb 前端修改秒杀相关文件存放地址 3 years ago
YunaiV d884303df6 trade:【交易售后】查询分页列表 3 years ago
YunaiV 00e66216c5 trade:【交易售后】查询分页列表的前端 3 years ago
YunaiV af71a19241 trade:【商品】sku 表增加 spu_name 字段,冗余 3 years ago
LAPTOP-CNV4CMCJ\cheng b3cea2d4bf Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 3 years ago
LAPTOP-CNV4CMCJ\cheng 78ae018320 新增退款列表页 调整商品列表页的tab切换 3 years ago
xingyu4j 7083d991fe refactor: verify 4 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
4 years ago
xingyu4j 011dc23699 替换var 为const/let
删除未使用import
替换 == 为 ===
4 years ago
xingyu4j c9e11e7636 fix slot-scope 4 years ago
LAPTOP-CNV4CMCJ\cheng fb45f22533 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 4 years ago
LAPTOP-CNV4CMCJ\cheng ea5e6b2c0e 新增了订单详情 4 years ago
YunaiV 941782fb10 promotion:完善限时折扣的修改逻辑 4 years ago
YunaiV 6d48bd1ed8 promotion:完善限时折扣的添加逻辑 4 years ago
YunaiV d4b7f4aaa0 promotion:增加限时折扣的基础代码 4 years ago
YunaiV 00f90e75d9 promotion:增加满减送活动的关闭功能 4 years ago
YunaiV 873b530652 promotion:增加优惠劵的回收操作 4 years ago
YunaiV 47c2dfa623 promotion:增加优惠劵的前端分页界面 100% 4 years ago
YunaiV 86b6b85934 promotion:增加优惠劵的前端分页界面 80% 4 years ago
YunaiV 8ae8a4a652 promotion:完善优惠劵模板的单元测试、禁用功能 4 years ago
YunaiV e3a700b2d2 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 4 years ago
YunaiV bd661296c0 promotion:完善优惠劵模板的功能 4 years ago
LAPTOP-CNV4CMCJ\cheng 63cb9eb47e Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 4 years ago
LAPTOP-CNV4CMCJ\cheng 89fefc5f81 处理了商品订单的TODO 4 years ago
YunaiV 035c2cf28c promotion:完善 优惠劵模板 表~ 4 years ago
luowenfeng 7dd12a3e81 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 4 years ago
YunaiV e1d5cfe8fe 微调 trade 交易表的设计 4 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 4 years ago
YunaiV 356642ecea review 商品的 save 界面 4 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
4 years ago
YunaiV 7bf37fcb64 优化管理后台的商品分页的查询 4 years ago
YunaiV c00ded3ed3 优化商品的 index 界面 4 years ago
luowenfeng dc4e3fcd6e feature(商城): 商城review改 4 years ago
luowenfeng 31f5b27d01 feature(uniapp分类): review 4 years ago
zhijiantianya@gmail.com c25791047f mall: 商品的代码 review 4 years ago
luowenfeng c7a2ed4a0b feature(管理后台): 商品管理 4 years ago
luowenfeng 77a676ee07 feature(管理后台): 商品列表 4 years ago