296 Commits (631211af89d2f9962a3f7bfb2ead4ad6463cabc4)

Author SHA1 Message Date
YunaiV 0657c357bf Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2 years ago
YunaiV 52e735f360 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java
2 years ago
puhui999 6723cae781 营销活动:完善 review 提到的问题 2 years ago
YunaiV d0caa77f80 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV 3bb3e4caf6 code review:工作流的加减签 2 years ago
kehaiyou aca65a66b5 feat: 【工作流】--加减签review修改 2 years ago
913752709@qq.com e4eeaa1d69 feat: crm 线索表完善 review 提到的问题 2 years ago
zhijiantianya@gmail.com 4b0333f3e9 code review:订单统计 2 years ago
zhijiantianya@gmail.com 0af205ede1 Merge remote-tracking branch 'origin/master' 2 years ago
owen 6fbb7d6d6d 终端类型参数改为从Controller传入 2 years ago
owen 76f512fc7a 1. APP增加终端Header[terminal]
2. 订单、会员注册记录来源终端
2 years ago
YunaiV 7e312aae02 初始化 crm 模块 2 years ago
YunaiV 1ac2f2b5c2 code review:会员统计 2 years ago
YunaiV 7a9dbfe41d Merge remote-tracking branch 'origin/master' 2 years ago
YunaiV 704087ce86 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
2 years ago
puhui999 bccd270fc7 营销活动:完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理 2 years ago
youkehai bc781d9473 fix: 【工作流】按 review 修改代码 2 years ago
owen 74a5e40d8d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
2 years ago
owen df16278a03 统计:会员统计 2 years ago
zhijiantianya@gmail.com 6388950ab2 code review:【工作流】—— 加签的实现 2 years ago
puhui999 2e559ebe06 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
2 years ago
puhui999 c8a9d68933 拼团活动:完善 review 提到的问题 2 years ago
YunaiV 01e6140d67 code review:拼团记录流程 2 years ago
YunaiV 99649bfdb8 code review:拼团记录流程 2 years ago
puhui999 6636ee7420 拼团记录(APP):新增一个取消拼团的接口 2 years ago
YunaiV a1e9bedf34 promotion:完善秒杀的 uniapp 接口 3 years ago
owen b7359706db Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 3 years ago
owen d0f0bc5888 分销:调整推广人列表查询方式 3 years ago
YunaiV 1f910992d6 trade:新增是否自提的配置项 3 years ago
YunaiV 6f4c04d944 trade:完善退款详情 3 years ago
YunaiV d4417d2474 code review:积分、优惠劵、佣金等逻辑 3 years ago
YunaiV 057952bdeb Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
3 years ago
owen cafa938ff4 common:LocalDateTimeUtils 增加方法:月份开始时间、月份结束时间 3 years ago
puhui999 597eacaaeb Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
3 years ago
puhui999 0b35d4a7e3 订单:完善拼团活动部分 TODO 3 years ago
kehaiyou 7d497ce09b feat: 【工作流】--加签 3 years ago
YunaiV 5913ee0706 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
#	yudao-server/src/main/resources/application-local.yaml
3 years ago
YunaiV 53bd1b9ec1 trade:订单评论超时时,自动评论 3 years ago
YunaiV e384b810bf code review:分销逻辑 3 years ago
owen e9fd377772 分销:Review代码修改 3 years ago
puhui999 6ef94ade6a 完善订单和活动 review 提到的问题 3 years ago
YunaiV c766f7daa5 code review:砍价、秒杀的逻辑 3 years ago
puhui999 408df683d8 秒杀活动: 完善 app 端获取活动分页、列表、详情接口 3 years ago
YunaiV b81ebe6f19 修复 common 下的 test 引入不正确的问题,减少包依赖大小 3 years ago
YunaiV ab800aa891 1. 简化 JsonUtils 初始化方式,去掉 BeanPostProcessor
2. 减少日志打印

目的:优化启动速度
3 years ago
芋道源码 3b5215db21
!611 分销用户管理、Review代码修改
Merge pull request !611 from 疯狂的世界/brokerate
3 years ago
YunaiV 87c55784c4 code review:营销活动+订单 3 years ago
owen ddcebb1986 common: MoneyUtils 移到 common 模块 3 years ago
puhui999 5d6bb84d25 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 3 years ago
puhui999 2591ab5d36 订单中心+营销活动:完善部分 TODO 提到的问题 3 years ago
YunaiV e4b153a866 分佣:增加获得分销排行分页 API mock 3 years ago
YunaiV b69d4e0852 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 3 years ago
owen 6a7be19d3a common: 增加InEnumCollectionValidator,用于校验枚举值列表参数的取值范围是否有䇅 3 years ago
shizhong eb4434ecbc 解决MapStruct的时区问题 3 years ago
YunaiV e8c1bdde3d 会员中心:会员管理 50% 3 years ago
zhijiantianya@gmail.com ba59ec85e0 code review 各种活动 3 years ago
puhui999 384359c9d4 fix: 完善拼团、秒杀、砍价活动管理 3 years ago
puhui999 5f9184904a fix: 完善拼团、秒杀、砍价活动管理 3 years ago
YunaiV 222d1cf69b 增加对比新老数组的 C/U/D 对象 3 years ago
YunaiV 5e2fa48f20 code review:拼团、秒杀活动的代码 3 years ago
puhui999 92b10e2ecf Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 3 years ago
puhui999 d156d43d63 fix:完善 review 拼团、秒杀活动的实现提到的问题 3 years ago
puhui999 446951bd11 fix:封装函数 convertCDUMap 作用:数据划分为需要新增的、还是删除的、还是更新的。 3 years ago
YunaiV c33186569d 优化 mp 账号的刷新机制,使用 Job 轮询,替换 MQ 广播 3 years ago
YunaiV 114f1e4833 对齐 boot 与 cloud 的代码 3 years ago
YunaiV b84f7825c5 review 拼团、秒杀活动的实现 3 years ago
puhui999 d80bf5a368 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 3 years ago
YunaiV 518e89dc4b mall + pay:
1. 重构支付回调的逻辑,将回调解析改成 PayOrderRespDTO,为后续轮询做铺垫
2. 调整退款单的表结构
3. 调整退款调用的实现
3 years ago
puhui999 e7d8643665 fix:修复 mall review @puhui999 3 years ago
YunaiV efb221b1fe mall + pay:调整异常的处理
1. 如果是业务异常,则统一转换成 ServiceException
2. 如果是系统异常,则使用 PayException 包装成无需 check 的异常
3 years ago
YunaiV 1dfbe45913 mall + order:review 售后日志 3 years ago
YunaiV 07884ef423 Merge branch 'mall_trade_aftersalelog' of https://gitee.com/chen934298133/ruoyi-vue-pro into feature/mall_product
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/vo/AppTradeAfterSaleCreateReqVO.java
3 years ago
jason 6b1d996b66 页面装修数据结构定义 3 years ago
chenchen 2f0aaee823 售后日志优化 3 years ago
chenchen a93b9a616f 售后日志优化 3 years ago
YunaiV 60b24e36d5 code review:售后日志逻辑 3 years ago
陈賝 59e16795be !514 mall交易日志封装
* 交易日志封装
* 交易日志封装
* 交易日志模块
3 years ago
YunaiV 8ec3733882 mall + trade:mock 拼团记录列表的接口 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
jason 644d976a78 快递100 快递查询实现 3 years ago
YunaiV 0631c51d93 mall + trade:review 配置管理列表 3 years ago
jason 55dbff7570 运费模板 review 修改. 运费模块可以选择多个区域 3 years ago
崔家辉 fbeaa06100 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误 3 years ago
芋道源码 12d6c14b1c
!469 修复 vue3 代码生成 api 模版错误 && 修复过期属性
Merge pull request !469 from xingyu/fix/vue3_codegen
3 years ago
jian.li e4a5a5672f StrUtils.maxLength会强制给后面加三个点,哪怕长度没有超过,优化长度不超过不加... 3 years ago
xingyu 0b3640a522 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 3 years ago
YunaiV e5fcc7a387 boot3:适合 ServletUtils 3 years ago
冰是睡着的水 fbbd3bc66c
优化大陆手机号验证。以19013896321为例,原来的正则匹配结果为false。
Signed-off-by: 冰是睡着的水 <850083043@qq.com>
3 years ago
YunaiV 1b6124a0db 集成 Go-View 大屏设计器 3 years ago
xingyu ffb0358ce2 Merge remote-tracking branch 'origin/master' into feature/springdoc 3 years ago
YunaiV c0b029b244 邮箱模块:完善 template 的单元测试 3 years ago
xingyu 13afc3d57a feat: springdoc 3 years ago
xingyu 3d390d0d8f feat: knife4j 3 years ago
xingyu 4d35bcef65 feat: springdoc success 3 years ago
xingyu 1c0d8fc1eb Merge remote-tracking branch 'origin/dev' into feature/springdoc
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
3 years ago
xingyu fffe3008b5 refactor: captcha-plus 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
YunaiV 5a4cc55917 【修复】字典类型逻辑删除时,唯一索引冲突的问题 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
xingyu cacefb4eea feat: knife4j springdoc 3 years ago
YunaiV fc49f000ce trade:前端订单管理,联调接口 3 years ago
xingyu4j 88ce5e540e refactor: springdoc 替换 springfox 3 years ago
xingyu4j 9fc6e0f00b refactor: springdoc 替换 springfox 3 years ago
YunaiV 7fc9689f07 trade:定义管理后台的订单分页接口 3 years ago
xingyu4j 9d3bbdd8c4 v 1.6.5 3 years ago
xingyu4j 2c8e2209e8 feat: 增加全局超长number序列化 3 years ago
halfninety cd62c4d220 秒杀时段相关 3 years ago
xingyu 0d0f64e30a feat: 删除过期方法 3 years ago
YunaiV 35528e8267 trade:【交易售后】查询分页列表 3 years ago
YunaiV 38f67d4130 将 mall 使用到 Date 的部分,迁移到 LocalDateTime 中 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 ff1379d454 优化 README 说明~ 3 years ago
YunaiV 40ba456fde 1. 修复 MenuServiceTest 单元测试 3 years ago
YunaiV d3b6a0ca69 1. 修复 refund/index.vue 的报错
2. 优化 DateUtils 的工具类的方法命名
3 years ago
xingyu4j 9c033d0104 DateUtils ==> LocalDateTime 3 years ago
xingyu4j cb006ddf2b DateUtils.buildLocalDateTime ==> LocalDateTime.of 3 years ago
xingyu4j 632a132a6a refactor: Date ==> LocalDateTime 3 years ago
YunaiV edc5d0f1d0 promotion:增加获得优惠劵匹配结果的列表 3 years ago
YunaiV 3c10058dbd promotion:实现部分优惠劵模板的前端逻辑 3 years ago
YunaiV 034de50999 完善多租户的注释与代码 4 years ago
芋道源码 61b0624a59
!262 接口实现-交易订单创建(未完全实现)
Merge pull request !262 from LeeYan9/ly_uniapp
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
ex_yang.li@ca-nio.com 19a703b8c9 创建订单接口定义 4 years ago
luowenfeng 0bc2ef1d39 feature(uniapp商品): 商品业务代码调整 4 years ago
xingyu e1b8ae09c9 增加手机号正则验证 4 years ago
YunaiV cfde3dcacb mall:优化订单表的设计 4 years ago
xingyu a8ea50a059 update hutool 5.8.5 4 years ago
YunaiV e5a7b8474f fix:短信验证码的每日发送条数不正确 4 years ago
YunaiV 26a094a710 refactor:优化时间范围查询 4 years ago
xingyu 9bdae339cc update: hutool 5.6.1 ==> 5.7.22 4 years ago
YunaiV 33a31cfb0f 优化文件的 type 识别与存储 4 years ago
jiangqiang 2621f2195d 优化代码 4 years ago
YunaiV ed097e5ead 基于 tika 识别文件类型 4 years ago
YunaiV b69b74b770 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
4 years ago
YunaiV f0095a2c31 完善 YudaoSwaggerAutoConfiguration 注释 4 years ago
芋道源码 569242d834
!198 修正文字说明
Merge pull request !198 from 枫叶/master
4 years ago
YunaiV e5f343a3e9 【重构】新增 `yudao-spring-boot-starter-biz-error-code` 错误码组件 4 years ago
YunaiV d3200910db 基于 Guava 实现 dict 字典数据的本地缓存 4 years ago
leoxxx 6652883aee doc修改 4 years ago
leoxxx 0913b82a4c 修正说明文字 4 years ago
xiaxiaoYY 247d299cca Banner模块 for review 4 years ago
YunaiV c7a2916748 完成 system_oauth2_approve 相关的批准逻辑 4 years ago
YunaiV 99ba7ccee8 完成 oauth2 code 授权码模式的实现 4 years ago
YunaiV 6ca88277d8 完成 oauth2 implicit 简化模式的实现 4 years ago
YunaiV aa8fb4acf0 搭建 oauth/authorize 的初步逻辑 4 years ago
YunaiV 97db4586a8 完成 OAuth2 的客户端模块 4 years ago
YunaiV 8737674d74 去除 LoginUser 的 roleIds、deptId 字段,简化 4 years ago
YunaiV 65a86e8d75 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-qcloud
 Conflicts:
	yudao-ui-admin/yarn.lock
4 years ago
FinallySays 91f758c295 根据 code review 对腾讯云短信实现优化 4 years ago