zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,885 Commits
3 Branches
0 Tags
162 MiB
Commit Graph

489 Commits (master)

Author SHA1 Message Date
xingyu 0d0f64e30a feat: 删除过期方法 2022-11-23 22:54:44 +08:00
YunaiV 8798944069 优化 pay 支付成功后的回调逻辑 2022-11-23 21:09:16 +08:00
芋道源码 1465d064dd
!307 调用获取地址参数顺序错误 
Merge pull request !307 from plimlips/N/A
 2022-11-23 11:28:26 +00:00
YunaiV 73d847ae2e 调整支付模块的回调地址 2022-11-22 19:54:52 +08:00
YunaiV 64df5ce5f4 trade：【交易售后】增加会员取消售后 2022-11-20 23:07:14 +08:00
YunaiV ed9c8d4a78 trade：【交易售后】增加售后日志 2022-11-20 22:54:30 +08:00
plimlips 453669c7d9
解决新建订单时,订单Id使用使用了address Id的问题 
Signed-off-by: plimlips <156839224@qq.com>
 2022-11-20 14:18:13 +00:00
plimlips 19a6fc79a2
调用获取地址参数顺序错误 
Signed-off-by: plimlips <156839224@qq.com>
 2022-11-20 12:05:18 +00:00
芋道源码 dbf237a1f3
修复 Swagger 注解错误，导致文档 404 问题 
Signed-off-by: 芋道源码 <zhijiantianya@gmail.com>
 2022-11-20 09:28:30 +00:00
YunaiV d884303df6 trade：【交易售后】查询分页列表 2022-11-20 09:35:06 +08:00
YunaiV 00e66216c5 trade：【交易售后】查询分页列表的前端 2022-11-20 01:05:03 +08:00
YunaiV 35528e8267 trade：【交易售后】查询分页列表 2022-11-19 20:43:59 +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 cd2bc112cc trade：【交易售后】完善发起、同意、不同意、收货、拒绝收货、退款的逻辑 2022-11-18 00:28:41 +08:00
YunaiV ee1d362a7c trade：【交易售后】回调退款 2022-11-17 01:05:12 +08:00
YunaiV 67050eeaa8 trade：【交易售后】确认收货 2022-11-17 00:10:59 +08:00
YunaiV 40f0117130 trade：售后增加发货 2022-11-16 23:02:10 +08:00
YunaiV 92dbf093ea trade：增加管理员审批 2022-11-16 22:17:07 +08:00
YunaiV 10f2dbc8cd trade: 增加创建售后订单的接口 2022-11-16 00:51:29 +08:00
YunaiV b8d1d31df0 trade: 调整退款单 2022-11-15 19:46:30 +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 12d045ea58 修复部分单元测试报错的问题 2022-11-13 21:08:15 +08:00
YunaiV 89580e7903 合并 master 代码 2022-11-13 12:21:17 +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 f5ef87094d 优化，使用 @Configuration(proxyBeanMethods = false) 提升启动速度 2022-11-12 20:17:58 +08:00
YunaiV c51ab6ad73 优化 Vue3 SQL 导入脚本，避免误解 2022-11-11 09:09:25 +08:00
YunaiV 5934d6b029 trade：完成下单时，创建支付单逻辑 2022-11-10 09:27:20 +08:00
YunaiV 84f6ec10bc trade：增加优惠劵使用、商品库存的扣减 2022-11-10 00:32:35 +08:00
YunaiV 16f5d0f5a4 trade：增加优惠劵使用、商品库存的扣减 2022-11-09 23:56:00 +08:00
YunaiV 734236df97 trade：创建订单接口的后端实现的单元测试 100% 2022-11-09 13:03:57 +08:00
xingyu4j 632a132a6a refactor: Date ==> LocalDateTime 2022-11-09 11:14:46 +08:00
YunaiV bc2aa78f70 trade：创建订单接口的后端实现的单元测试 50% 2022-11-09 01:03:26 +08:00
YunaiV 01d10b518c trade：优化创建订单接口的后端实现 2022-11-08 22:50:03 +08:00
YunaiV d7a1c8f7ca promotion：增加获得优惠劵匹配结果的列表的单元测试 2022-11-08 19:32:49 +08:00
YunaiV edc5d0f1d0 promotion：增加获得优惠劵匹配结果的列表 2022-11-08 00:40:53 +08:00
YunaiV 05614cc0b8 trade：完善 TradeOrderItemDO 字段 2022-11-06 23:55:59 +08:00
YunaiV d10f49b6a7 promotion：优化价格计算的接口，增加 orderPrice 字段 2022-11-06 22:25:02 +08:00
YunaiV 636cc794dd promotion：完善价格计算，重新接入限时折扣的多种优惠方式 2022-11-06 18:41:27 +08:00
YunaiV c87bc084e6 promotion：RewardActivityServiceImpl 的 getMatchRewardActivities 逻辑 2022-11-06 16:36:14 +08:00
YunaiV 941782fb10 promotion：完善限时折扣的修改逻辑 2022-11-06 12:38:13 +08:00
YunaiV 6d48bd1ed8 promotion：完善限时折扣的添加逻辑 2022-11-06 00:48:07 +08:00
YunaiV 544597d6e2 promotion：完善限时折扣，补充相关的单元测试 2022-11-05 19:57:50 +08:00
YunaiV d4b7f4aaa0 promotion：增加限时折扣的基础代码 2022-11-05 19:13:43 +08:00
YunaiV 00f90e75d9 promotion：增加满减送活动的关闭功能 2022-11-05 10:52:09 +08:00
YunaiV 79304b3a73 promotion：增加满减送活动的排重校验、单元测试 2022-11-05 09:57:45 +08:00
YunaiV 0e5b7734ac promotion：增加满减送活动的后端 20% 2022-11-04 23:19:28 +08:00
YunaiV 873b530652 promotion：增加优惠劵的回收操作 2022-11-04 21:17:37 +08:00
YunaiV 47c2dfa623 promotion：增加优惠劵的前端分页界面 100% 2022-11-04 19:17:17 +08:00
YunaiV a89d5a83db promotion：增加优惠劵的后端分页接口 2022-11-03 22:40:19 +08:00
YunaiV 2c39405bce promotion：完善的优惠卷的实体 2022-11-03 00:05:13 +08:00
YunaiV 8ae8a4a652 promotion：完善优惠劵模板的单元测试、禁用功能 2022-11-02 22:44:37 +08:00
YunaiV bd661296c0 promotion：完善优惠劵模板的功能 2022-11-02 22:19:33 +08:00
YunaiV 2aaeb7af88 promotion：实现部分优惠劵模板的前端表单 80% 2022-11-02 00:35:53 +08:00
YunaiV dc51a93533 promotion：实现部分优惠劵模板的前端列表 2022-11-01 22:31:07 +08:00
YunaiV 3c10058dbd promotion：实现部分优惠劵模板的前端逻辑 2022-11-01 00:37:07 +08:00
YunaiV 979ba0f916 promotion：实现优惠劵模板的逻辑 2022-10-31 23:47:06 +08:00
YunaiV 035c2cf28c promotion：完善 优惠劵模板 表~ 2022-10-31 21:19:18 +08:00
YunaiV e6acdf7098 将 market 模块，调整成 promotion 模块 2022-10-30 17:37:07 +08:00
YunaiV 829bbf58b5 price：完成优惠劵的价格计算~ 2022-10-30 17:32:59 +08:00
YunaiV 160d619d59 price：完成满减送的价格计算~ 2022-10-30 13:20:07 +08:00
YunaiV 4e9fe4bc54 price：完成限时折扣的价格计算~ 2022-10-29 22:23:48 +08:00
YunaiV 084d4baba2 price：完成会员价格的计算~ 2022-10-29 21:46:19 +08:00
YunaiV a88eda340b 调整 price 接口，参考 taobao 的技术文档 2022-10-28 23:49:15 +08:00
YunaiV 3b506006dd Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-10-28 22:44:18 +08:00
YunaiV 5c4b61f5ff 暂存调整 Price 接口 2022-10-28 22:44:12 +08:00
luowenfeng d91655f3c4 feature(商城): 修改单元测试 2022-10-27 11:00:14 +08:00
luowenfeng 7dd12a3e81 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-10-27 10:30:27 +08:00
YunaiV e1d5cfe8fe 微调 trade 交易表的设计 2022-10-26 21:25:29 +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
xingyu 9054a772b0 feat: 升级依赖 2022-09-20 18:00:43 +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
芋道源码 61b0624a59
!262 接口实现-交易订单创建(未完全实现) 
Merge pull request !262 from LeeYan9/ly_uniapp
 2022-09-05 13:16:11 +00: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 37e948cc1b Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-09-04 23:15:36 +08:00
YunaiV f4324a22f2 mall： code review 商品模块的代码 2022-09-04 23:15:29 +08:00
wuxiran 02aede0417 1、修改coupon的页面、以及增加coupon的enum 2022-09-04 22:52:28 +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
luowenfeng 4207b2b61d feature(uniapp商品): 商品加载 2022-08-31 18:52:26 +08:00
ex_yang.li@ca-nio.com 19a703b8c9 创建订单接口定义 2022-08-26 17:47:43 +08:00
luowenfeng 4a39f2d9f8 feature(uniapp商品): 代码调整 2022-08-25 17:10:26 +08:00
luowenfeng 0bc2ef1d39 feature(uniapp商品): 商品业务代码调整 2022-08-24 14:08:32 +08:00
YunaiV c2fd24f597 mall：code review 商品 spu 的后端代码 2022-08-23 23:58:22 +08:00
luowenfeng 8ad1439fda feature(uniapp商品): 新增商品 2022-08-23 20:27:39 +08:00
YunaiV 81666e3b62 mall：code review 商品的添加和修改 VO；微调商品的 SPU/SKU 表 2022-08-23 00:38:49 +08:00
YunaiV a11dd1be28 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 
# Conflicts:
#	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/service/sku/ProductSkuServiceImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
 2022-08-23 00:37:24 +08:00
YunaiV f03d679f2c mall：code review 商品的添加和修改 VO；微调商品的 SPU/SKU 表 2022-08-23 00:33:28 +08:00
luowenfeng 8de29d302c feature(uniapp商品): 新增商品数据 2022-08-22 21:20:49 +08:00
luowenfeng 617573a59b feature(uniapp分类): 商品创建功能以及查询功能正常使用 2022-08-22 20:43:12 +08:00
YunaiV 405bf497ef mall：新增 discount 限时折扣、reward 满减送 2022-08-17 01:10:13 +08:00
YunaiV 96fc252348 mall：新增价格计算的接口 2022-08-16 09:17:46 +08:00
YunaiV cfd0f3679f Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-08-16 08:57:25 +08:00
YunaiV 5948be86a8 mall：新增价格计算的接口 2022-08-16 08:57:18 +08:00
wuxiran c8ec5c8952 mall:上传enum类，做后端模板添加判定、前端页面添加 2022-08-16 00:26:44 +08:00
YunaiV 515c0de78d Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-08-12 00:04:11 +08:00
YunaiV 00863fdbac mall：调整 trade 订单的设计 2022-08-12 00:04:05 +08:00
wuxiran ac8f62a2be mall:上传自动化生成的模板文件 2022-08-09 22:10:48 +08:00
YunaiV face9cae76 mall：调整 trade 的接口 2022-08-06 19:10:28 +08:00
YunaiV cfde3dcacb mall：优化订单表的设计 2022-08-05 00:28:40 +08:00
YunaiV 33a01e78bf mall：优化商品表的设计 2022-08-04 23:25:44 +08:00
YunaiV c612487198 mall：优化订单表的设计 2022-08-04 20:39:10 +08:00
YunaiV fd4cf0c7f7 mall：优化订单表的设计 2022-08-03 23:48:56 +08:00
YunaiV f5037015da mall：优化 spu、sku 的表结构 2022-08-03 22:30:18 +08:00
YunaiV 4ce76e82fc mall：完善收件地址 2022-08-01 22:49:51 +08:00
zy 7a164ecdff fix：打开系统接口，控制台报错 2022-08-01 14:54:21 +08:00
YunaiV 96e2a27d07 mall：初始化 trade 表结构 2022-08-01 00:53:16 +08:00
YunaiV 2b71a1588c mall：初始化 trade 交易模块 2022-07-31 22:36:06 +08:00
YunaiV 022e5b8519 mall：完善商品模块的表设计 2022-07-31 22:26:26 +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 efd4942129 mall：完善商品分类的 APP 后端接口 2022-07-30 21:24:05 +08:00
YunaiV 969c387764 mall：完善商品分类的管理后台界面 2022-07-30 20:28:01 +08:00
YunaiV 6a0f713452 mall：完善商品分类的后端接口 2022-07-30 19:37:31 +08:00
YunaiV 1976571ae8 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 
# Conflicts:
#	yudao-ui-admin/src/views/mall/product/spu/index.vue
 2022-07-29 23:44:54 +08:00
luowenfeng af6a022450 feature(uniapp商品): 商品详情 2022-07-27 16:04:53 +08:00
xingyu f84f3a3631 refactor: 时间区间查询传入数组-测试模块 2022-07-22 10:24:59 +08:00
xingyu dad10d858a refactor: 时间区间查询传入数组 2022-07-21 23:22:51 +08:00
luowenfeng e2a6530acb feature(uniapp分类): 分类列表以及商品加载 2022-07-11 12:05:48 +08:00
franky be370ba2cf spu 修改调整，组合分类和规格属性，方便前端修改的回显展示 2022-07-05 22:33:11 +08:00
franky 613eef3758 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-07-05 17:30:49 +08:00
franky 1bc812fd05 spu 查询分类展示 2022-07-05 17:30:30 +08:00
YunaiV 2b9b302368 同步最新的 master 代码 2022-07-04 20:01:04 +08:00
YunaiV abbfbd5f25 code review：商品 spu、sku 的逻辑 2022-06-11 11:36:19 +08:00
franky 407cbb109f spu 调整一波 2022-06-08 18:38:14 +08:00
franky-mgmg-pc 2382ddfb37 spu sku review调整一波 2022-06-07 18:04:21 +08:00
franky-mgmg-pc c118d8198b Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
 2022-06-07 17:18:32 +08:00
franky-mgmg-pc 4bcc6c374e spu 保存，propertyValue合并到productProperty中 2022-06-07 17:16:58 +08:00
YunaiV 766afbacbf code review：商品 spu、sku 的逻辑 2022-06-07 00:32:05 +08:00
franky f07bf8b0fd spu保存校验添加 2022-06-05 22:43:20 +08:00
franky 6dca8e082b 商品调整 2022-06-05 15:45:36 +08:00
YunaiV 7c3015a67a code review banner 模块的代码 2022-05-31 19:25:24 +08:00
franky b368a54b36 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-05-31 18:39:57 +08:00
franky eb5bdda344 SPU名字重构 2022-05-31 18:39:44 +08:00
xiaxiaoYY bb0edc2a65 Banner app api for reveiew 2022-05-31 18:30:24 +08:00
xiaxiaoYY 247d299cca Banner模块 for review 2022-05-31 16:08:10 +08:00
xiaxiaoYY e31091c0df Banner管理-for review 2022-05-31 15:57:30 +08:00
shuaidawang 493b139590 重命名增加Product前缀 2022-05-19 18:07:29 +08:00
shuaidawang 204a5ba284 规格增删改查接口及页面提交 2022-05-19 17:25:28 +08:00
shuaidawang a270db821d 规格加个枚举，去掉TODO 2022-05-19 14:43:11 +08:00
shuaidawang 733a3c4615 商品规格实体类增加Product前缀 2022-05-19 14:39:23 +08:00
YunaiV 9dad9e555f code review 商品模块的表结构与模块划分 2022-05-18 19:35:25 +08:00
franky a86cbde090 商品spu和sku测试类调整 2022-05-18 14:47:58 +08:00
franky e314f4aaeb 商品规格属性代码生成 2022-05-18 14:42: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 0d017e4b1c fix: 删除品牌和分类的无用接口 2022-05-12 17:21:26 +08:00
jeromesoar d9d473dcf0 fix: TODO 分类合理性 2022-05-12 17:09:18 +08:00
jeromesoar ff307a4c86 fix: TODO pid 改成 parentId 字段 2022-05-12 16:57:33 +08:00
YunaiV e6893db1c3 uniapp：code review 商品分类、商品品牌 2022-05-05 00:52:25 +08:00
shuaidawang 14a1d70cbb 【促销活动】-代码生成 2022-04-28 16:18:57 +08:00
JeromeSoar cc6c3d2759 品牌代码生成 2022-04-25 16:11:30 +08:00
jeromesoar 760344727d 【修复】包异常 2022-04-24 20:29:18 +08:00
JeromeSoar e4ca2e25f9 树化 2022-04-24 17:37:52 +08:00
JeromeSoar d3edaec2b1 商品分类维护 2022-04-24 17:01:10 +08:00
JeromeSoar 4e67b6bbcf 商品分类代码生成 2022-04-24 14:42:51 +08:00
JeromeSoar 09722c0cd6 【修复】mall 父模块 artifactId 2022-04-24 10:12:31 +08:00
shuaidawang c4f9f489fa 【营销模块】新建模块重命名 2022-04-23 23:32:24 +08:00