linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,487 Commits
4 Branches
0 Tags
169 MiB
main
liutao_branch
hhk
plp
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '7ba6a2e385'
${ noResults }
Commit Graph

224 Commits (7ba6a2e385538eb4008dcdf2df40da0a06a6ef92)

Author SHA1 Message Date
YunaiV cd2bc112cc trade：【交易售后】完善发起、同意、不同意、收货、拒绝收货、退款的逻辑 3 years ago
YunaiV ee1d362a7c trade：【交易售后】回调退款 3 years ago
YunaiV 67050eeaa8 trade：【交易售后】确认收货 3 years ago
YunaiV 40f0117130 trade：售后增加发货 3 years ago
YunaiV 92dbf093ea trade：增加管理员审批 3 years ago
YunaiV 10f2dbc8cd trade: 增加创建售后订单的接口 3 years ago
YunaiV b8d1d31df0 trade: 调整退款单 3 years ago
YunaiV f6420e301e 修复部分单元测试报错的问题 3 years ago
YunaiV 38f67d4130 将 mall 使用到 Date 的部分，迁移到 LocalDateTime 中 3 years ago
YunaiV 12d045ea58 修复部分单元测试报错的问题 3 years ago
YunaiV 89580e7903 合并 master 代码 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 f5ef87094d 优化，使用 @Configuration(proxyBeanMethods = false) 提升启动速度 3 years ago
YunaiV c51ab6ad73 优化 Vue3 SQL 导入脚本，避免误解 3 years ago
YunaiV 5934d6b029 trade：完成下单时，创建支付单逻辑 3 years ago
YunaiV 84f6ec10bc trade：增加优惠劵使用、商品库存的扣减 3 years ago
YunaiV 16f5d0f5a4 trade：增加优惠劵使用、商品库存的扣减 3 years ago
YunaiV 734236df97 trade：创建订单接口的后端实现的单元测试 100% 3 years ago
xingyu4j 632a132a6a refactor: Date ==> LocalDateTime 3 years ago
YunaiV bc2aa78f70 trade：创建订单接口的后端实现的单元测试 50% 3 years ago
YunaiV 01d10b518c trade：优化创建订单接口的后端实现 3 years ago
YunaiV d7a1c8f7ca promotion：增加获得优惠劵匹配结果的列表的单元测试 3 years ago
YunaiV edc5d0f1d0 promotion：增加获得优惠劵匹配结果的列表 3 years ago
YunaiV 05614cc0b8 trade：完善 TradeOrderItemDO 字段 3 years ago
YunaiV d10f49b6a7 promotion：优化价格计算的接口，增加 orderPrice 字段 3 years ago
YunaiV 636cc794dd promotion：完善价格计算，重新接入限时折扣的多种优惠方式 3 years ago
YunaiV c87bc084e6 promotion：RewardActivityServiceImpl 的 getMatchRewardActivities 逻辑 3 years ago
YunaiV 941782fb10 promotion：完善限时折扣的修改逻辑 3 years ago
YunaiV 6d48bd1ed8 promotion：完善限时折扣的添加逻辑 3 years ago
YunaiV 544597d6e2 promotion：完善限时折扣，补充相关的单元测试 3 years ago
YunaiV d4b7f4aaa0 promotion：增加限时折扣的基础代码 3 years ago
YunaiV 00f90e75d9 promotion：增加满减送活动的关闭功能 3 years ago
YunaiV 79304b3a73 promotion：增加满减送活动的排重校验、单元测试 3 years ago
YunaiV 0e5b7734ac promotion：增加满减送活动的后端 20% 3 years ago
YunaiV 873b530652 promotion：增加优惠劵的回收操作 3 years ago
YunaiV 47c2dfa623 promotion：增加优惠劵的前端分页界面 100% 3 years ago
YunaiV a89d5a83db promotion：增加优惠劵的后端分页接口 3 years ago
YunaiV 2c39405bce promotion：完善的优惠卷的实体 3 years ago
YunaiV 8ae8a4a652 promotion：完善优惠劵模板的单元测试、禁用功能 3 years ago
YunaiV bd661296c0 promotion：完善优惠劵模板的功能 3 years ago
YunaiV 2aaeb7af88 promotion：实现部分优惠劵模板的前端表单 80% 3 years ago
YunaiV dc51a93533 promotion：实现部分优惠劵模板的前端列表 3 years ago
YunaiV 3c10058dbd promotion：实现部分优惠劵模板的前端逻辑 3 years ago
YunaiV 979ba0f916 promotion：实现优惠劵模板的逻辑 3 years ago
YunaiV 035c2cf28c promotion：完善 优惠劵模板 表~ 3 years ago
YunaiV e6acdf7098 将 market 模块，调整成 promotion 模块 3 years ago
YunaiV 829bbf58b5 price：完成优惠劵的价格计算~ 3 years ago
YunaiV 160d619d59 price：完成满减送的价格计算~ 3 years ago
YunaiV 4e9fe4bc54 price：完成限时折扣的价格计算~ 3 years ago
YunaiV 084d4baba2 price：完成会员价格的计算~ 3 years ago
YunaiV a88eda340b 调整 price 接口，参考 taobao 的技术文档 3 years ago
YunaiV 3b506006dd Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 3 years ago
YunaiV 5c4b61f5ff 暂存调整 Price 接口 3 years ago
luowenfeng d91655f3c4 feature(商城): 修改单元测试 3 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 3 years ago
YunaiV e1d5cfe8fe 微调 trade 交易表的设计 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
xingyu 9054a772b0 feat: 升级依赖 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
芋道源码 61b0624a59
!262 接口实现-交易订单创建(未完全实现) 
Merge pull request !262 from LeeYan9/ly_uniapp
 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 37e948cc1b Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 4 years ago
YunaiV f4324a22f2 mall： code review 商品模块的代码 4 years ago
wuxiran 02aede0417 1、修改coupon的页面、以及增加coupon的enum 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
ex_yang.li@ca-nio.com 19a703b8c9 创建订单接口定义 4 years ago
luowenfeng 4a39f2d9f8 feature(uniapp商品): 代码调整 4 years ago
luowenfeng 0bc2ef1d39 feature(uniapp商品): 商品业务代码调整 4 years ago
YunaiV c2fd24f597 mall：code review 商品 spu 的后端代码 4 years ago
luowenfeng 8ad1439fda feature(uniapp商品): 新增商品 4 years ago
YunaiV 81666e3b62 mall：code review 商品的添加和修改 VO；微调商品的 SPU/SKU 表 4 years ago