151 Commits (6c80ef38f5a8d308458b3dbd61b811be81171394)

Author SHA1 Message Date
芋道源码 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