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 |
|
luowenfeng
|
fdb2d7339f
|
feature(管理后台): 商品列表
|
4 years ago |
|
luowenfeng
|
f122c0c509
|
feature(管理后台): 商品添加视频
|
4 years ago |
|
luowenfeng
|
e2cd336a22
|
feature(管理后台): 规格值添加
|
4 years ago |
|
luowenfeng
|
e1e55dc841
|
feature(商品添加): 规格调整连带商品调整
|
4 years ago |
|
YunaiV
|
9632c33d27
|
mall：优化商品的分类、品牌的代码
|
4 years ago |
|
YunaiV
|
1bd1c79ff3
|
mall：code review 商品模块的代码
|
4 years ago |
wuxiran
|
02aede0417
|
1、修改coupon的页面、以及增加coupon的enum
|
4 years ago |
|
luowenfeng
|
ab6fd30551
|
feature(uniapp商品): 商品功能完善
|
4 years ago |
|
luowenfeng
|
198b1189e8
|
feature(uniapp商品): 商品修改
|
4 years ago |
|
luowenfeng
|
4207b2b61d
|
feature(uniapp商品): 商品加载
|
4 years ago |
|
luowenfeng
|
edfe379848
|
feature(uniapp商品): 多规格新增
|
4 years ago |
|
luowenfeng
|
8ad1439fda
|
feature(uniapp商品): 新增商品
|
4 years ago |
|
luowenfeng
|
8de29d302c
|
feature(uniapp商品): 新增商品数据
|
4 years ago |
|
luowenfeng
|
617573a59b
|
feature(uniapp分类): 商品创建功能以及查询功能正常使用
|
4 years ago |
|
luowenfeng
|
de27f4c2db
|
Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
|
4 years ago |
|
luowenfeng
|
07e5e1b59f
|
feature(管理后台): 商品弹窗
|
4 years ago |
|
wuxiran
|
c8ec5c8952
|
mall:上传enum类，做后端模板添加判定、前端页面添加
|
4 years ago |
|
YunaiV
|
fa9823161e
|
mall：完善商品品牌的前后端实现
|
4 years ago |
|
YunaiV
|
efd4942129
|
mall：完善商品分类的 APP 后端接口
|
4 years ago |