278 Commits (hhk)

Author SHA1 Message Date
YunaiV 0e5e6c7ce0 mall + pay:
1. 增加微信退款的查询接口
3 years ago
YunaiV 5b066ea693 mall + pay:
1. 增加支付宝退款查询接口
3 years ago
YunaiV ac5646b84d mall + pay:
1. 支付订单的过期关闭 Job[单测]
3 years ago
YunaiV cc853a2b92 mall + pay:
1. 支付订单的状态同步 Job[单测]
3 years ago
YunaiV 15cca8f3de mall + pay:
1. 支付订单的状态同步 Job
2. 支付订单的过期关闭 Job
3 years ago
YunaiV 348d073718 mall + pay:
1. 发起支付时,增加实际已支付的二次校验,避免重复支付
3 years ago
zhijiantianya@gmail.com e27ec2fd50 by gateway:
1. 完善部分 refund 单元测试
3 years ago
YunaiV 654b70c514 mall + pay:
1. 增加通知管理
3 years ago
zhijiantianya@gmail.com b54f7e9256 by gateway:
1. 完善部分 order 单元测试
2. 增加支付订单的 no 生成逻辑
3 years ago
YunaiV 721adfbf60 mall + pay:
1. 优化退款管理的导出实现
3 years ago
YunaiV 3caa5f14bd mall + pay:
1. 优化退款管理的接口实现
3 years ago
YunaiV b84da30234 mall + pay:
1. 优化订单管理的接口实现
2. 支付状态增加 refund 类型,将 refund status 合并进去
3 years ago
YunaiV 5dcb3db5d7 mall + pay:
1. 优化订单管理的接口实现
3 years ago
YunaiV 888c488206 mall + pay:
1. 优化 PayClient 退款逻辑,返回业务失败 errorCode + errorMsg 错误码
3 years ago
zhijiantianya@gmail.com 3f410c2735 by gateway:
1. 补全 channel 单元测试
2. 完善部分 order 单元测试
3 years ago
YunaiV 6f475f8c85 mall + pay:
1. 优化 PayClient 支付逻辑,返回业务失败 errorCode + errorMsg 错误码
3 years ago
YunaiV 7cf4c5415e mall + pay:
1. 将 payNotifyUrl 统一改成 orderNotifyUrl
3 years ago
YunaiV 68a4ef98ca mall + pay:
1. 拆分支付回调、退款回调的 URL
2. 修复微信支付回调的时间解析错误
3 years ago
YunaiV 7caf8e900f mall + pay:
1. 增加微信 bar 和 native 的集成测试,方便调试配置
3 years ago
YunaiV c44ace6011 mall + pay:
1. 完成支付宝的退款重构
2. 完成 demo 模块的退款接入
3 years ago
YunaiV 518e89dc4b mall + pay:
1. 重构支付回调的逻辑,将回调解析改成 PayOrderRespDTO,为后续轮询做铺垫
2. 调整退款单的表结构
3. 调整退款调用的实现
3 years ago
YunaiV fbb63ee262 mall + pay:
1. 修复 PayNotifyTask 首次通知时,可能会失败的情况;原因:MySQL 时间的精度问题;
3 years ago
zhijiantianya@gmail.com 47ba5b7b44 by gateway: 支付渠道的代码优化 3 years ago
zhijiantianya@gmail.com 35ceef371c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 3 years ago
zhijiantianya@gmail.com 052e4689ee by gateway: 支付应用的代码优化 3 years ago
YunaiV 0ac599a3d9 mall + pay:
1. 修复支付宝沙箱地址的调整
2. 收银台的前端 URL 支付走整个网页跳转
3. 收银台的支付成功后,增加 returnUrl 回跳
4. 修复 PayNotifyTask 首次通知时,可能会失败的情况;原因:租户未传递;
3 years ago
zhijiantianya@gmail.com f1c4c7964a gateway commit test 3 years ago
YunaiV cad508def6 mall + pay:
1. bar 扫码支付成功后,额外返回 notify
2. notify 在支付回调时,增加幂等处理
3 years ago
YunaiV ca4afc2909 mall + pay:
1. 调整 cashier 的 channels 的读取实现方式
3 years ago
YunaiV 2485a5ebc9 mall + pay:
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
3 years ago
YunaiV 5d2d52020e mall + pay:简化 pay 的复杂度
1. 移除 merchant 表设计
2. 移除 app 和 channel 的导出
3 years ago
YunaiV b06a21f9af mall + pay:
1. 实现 WxNativePayClient 的支付功能
3 years ago
YunaiV e31b40eefa mall + pay:
1. 实现 WxBarPayClient 的支付功能
3 years ago
YunaiV 4014137a4c mall + pay:调整异常的处理
1. 在 PayOrderUnifiedRespDTO 增加 status 字段,用于后续微信付款码支付时,直接支付成功的场景。
3 years ago
YunaiV e615be971e mall + pay:
1、测试通过微信小程序支付
3 years ago
YunaiV d76bc7aa82 mall + pay:
1、初步完成微信扫码支付,暂时缺少状态的处理
3 years ago
YunaiV 3f33ca2d6b mall + pay:
1、增加获得支付渠道接口
3 years ago
YunaiV cbc61184bd mall + pay:
1、优化微信公众号 MP 支付的实现
3 years ago
YunaiV 67d60e32f8 mall + pay:
1、调整微信支付,修复 v2 传递的时间不正确
2、调整 mp js ticket 接口到 system 模块
3 years ago
YunaiV 20eb0a2a88 mall + pay:
1、调整 returnUrl 的实现
3 years ago
YunaiV 040a66965c mall + member:
1、review 积分
3 years ago
jason 3a1e5c1b5f pay : 会员电子钱包表结构 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
崔家辉 fbeaa06100 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误 3 years ago
YunaiV 7fef594390 订单接口的梳理 3 years ago
xingyu 0b3640a522 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 3 years ago
YunaiV 5656a0b0b7 修复支付通知的通知 Transaction 不生效的问题 3 years ago
yuzhengwei 70514a0ac2 fix:同一个类中:A方法(无事务)调B方法(有事务),事务不生效问题 3 years ago
YunaiV 102d56ff7d 修复单测报错的问题 3 years ago
YunaiV 14893c4cff pay: 优化回调的逻辑 3 years ago
YunaiV 4390e28eea pay: 新增支付宝 App 支付的接入 3 years ago
YunaiV 2093c3bdb5 pay: 重构支付客户端,移除 PayCommonResult 累 3 years ago
YunaiV b34801f303 pay: 接入支付宝 PC 支付的跳转模式 3 years ago
YunaiV df702e8d24 pay: 临时性的提交,准备 client 部分的重构 3 years ago
YunaiV 96ecd5028d 1. 优化支付订单回调任务,避免重复打 SQL 查询日志
2. 修复定时任务的回调,回调成功未更新状态的问题。
3 years ago
YunaiV 44b0346e5e pay:示例订单,接入退款回调逻辑 3 years ago
YunaiV eb660ca619 pay:示例订单,增加发起退款的操作 3 years ago
YunaiV 333adc989f pay:示例订单,接入支付回调逻辑 3 years ago
YunaiV 4d2ebcd898 pay:前端收银台接入支付宝扫码 3 years ago
YunaiV 84e9c0bba0 pay:前端收银台的信息接入 3 years ago
YunaiV 7fbdfec396 增加接入示例的查询 3 years ago
YunaiV 063d5e3a8a 增加支付接入的示例 10% 3 years ago
xingyu ffb0358ce2 Merge remote-tracking branch 'origin/master' into feature/springdoc 3 years ago
YunaiV c744e115e3 简化本地缓存的实现,萌新更容易看懂! 3 years ago
YunaiV 711a39b8e9 spring doc:增加模块分组 3 years ago
xingyu 854ba3315c marge master 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 a83b8e8fbc 修复报错的单元测试 3 years ago
YunaiV 3443aa6f5f 优化本地缓存的刷新实现,数据变更时,强制刷新 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
xingyu 4f2c08f8db Merge remote-tracking branch 'origin/dev' into feature/springdoc 3 years ago
qs c2f0f9edaa 修改`pay模块>提交退款申请>重复设置属性` 3 years ago
qs 86ef58d70b 修改`pay模块>创建支付单>存在时返回订单Id` 3 years ago
YunaiV fc48ab4928 trade:前端订单管理,联调接口 3 years ago
xingyu4j 9fc6e0f00b refactor: springdoc 替换 springfox 3 years ago
YunaiV 66abe4a84b trade:完成交易订单的发货逻辑 3 years ago
YunaiV e96422a47e trade:完成支付成功后的回调,更新订单为已支付 3 years ago
YunaiV 1cd9085c59 pay: PayNotifyJob 增加多租户的支持 3 years ago
xingyu 0d0f64e30a feat: 删除过期方法 3 years ago
YunaiV 8798944069 优化 pay 支付成功后的回调逻辑 3 years ago
YunaiV 73d847ae2e 调整支付模块的回调地址 3 years ago
YunaiV ee1d362a7c trade:【交易售后】回调退款 3 years ago
YunaiV 92dbf093ea trade:增加管理员审批 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 c5b547e0f3 优化,使用 @Configuration(proxyBeanMethods = false) 提升启动速度 3 years ago
芋道源码 ae0227c107
!276 阿里云OSS解析region时兼容带https的配置
Merge pull request !276 from huangyemin/master
3 years ago
YunaiV 5934d6b029 trade:完成下单时,创建支付单逻辑 3 years ago
xingyu4j cb006ddf2b DateUtils.buildLocalDateTime ==> LocalDateTime.of 3 years ago
xingyu4j 632a132a6a refactor: Date ==> LocalDateTime 3 years ago
huangyemin b982d87573 支付通知未添加@TenantJob注解,导致定时任务报错 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 3 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
3 years ago
ex_yang.li@ca-nio.com 5889093a64 创建交易订单-单元测试 3 years ago
YunaiV 67d365475c 🐛修复创建订单的流程,使用到 API Bean 未声明的报错 3 years ago
ex_yang.li@ca-nio.com 19a703b8c9 创建订单接口定义 3 years ago
YunaiV e52a966b81 完善积木报表的集成 4 years ago
YunaiV b2f5900abc Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/visual 4 years ago
xingyu f84f3a3631 refactor: 时间区间查询传入数组-测试模块 4 years ago
xingyu dad10d858a refactor: 时间区间查询传入数组 4 years ago
jiangqiang 666c38239a 修改报表依赖版本 4 years ago
YunaiV 7db1a58bfc 适配 Oracle 数据库
1. 去除关键字,避免数据库的查询冲突
4 years ago
YunaiV 30e886be6f 解决 PostgreSQL 集成 Quartz 时的报错 4 years ago
YunaiV e24c8c3425 修改实体和 Mapper,解决 PostgreSQL 查询报错的问题 4 years ago
YunaiV 09103f310b 1. 【修复】单元测试报错
2. 【优化】yudao-module-xx-impl 调整成 yudao-module-xx-biz,更加符合定位
4 years ago
YunaiV 2d5601be92 调整前端和环境的环境配置 4 years ago
YunaiV d60be0bb53 优化 test 组件的封装,内置 Redis、DB 等多种快速测试的基类 4 years ago
YunaiV 18a5c46284 完成 FileConfig 的后端模块 4 years ago
YunaiV 2505d61b08 Swagger 增加 tenant-id 头 4 years ago
YunaiV c58eb12896 修复所有单元测试 4 years ago
YunaiV 75928525ca 1. 增加【默认】的系统租户的概念,禁止修改与删除等操作
2. 修复定时任务在刷新本地缓存时,会过滤租户的问题
3. 调整短信的回调地址,并进行租户的白名单
4 years ago
YunaiV e4be51b14a 1. 新建租户、修改租户、修改租户套餐时,自动修改角色的权限
2. 租户的本地缓存,提升访问性能
3. 精简本地缓存的实现逻辑
4 years ago
YunaiV 4d53944771 【新增】新增 `@TenantIgnore` 注解,标记指定方法,忽略多租户的自动过滤,适合实现跨租户的逻辑 4 years ago
Jelly 5e43efc555 fix:修复 Maven 构建一些提示 4 years ago
zhuqi f0395c450f 校验Long类型NotEmpty改为NotNull 4 years ago
YunaiV d649b93017 1. 同步最新的 SQL
2. 修复多租户的定时 Task 无法获取租户编号的问题
4 years ago
YunaiV ae9186f4b4 多模块重构 14:MEMBER 用户,过滤掉操作日志的记录~ 4 years ago
YunaiV 6441883855 【升级】spring-boot from 2.4.12 to 2.5.9,最新的 Spring Boot 2.6.X 在等更流行一些,稳定第一 4 years ago
YunaiV 1e2bcf9aca 多模块重构 13:修复各种单元测试的报错 4 years ago
YunaiV eb2ab3cc4d 清理多余文件与配置 4 years ago
YunaiV 4890cf05de 修复 swagger 接口文档不展示的问题 4 years ago
YunaiV 24e083b3ae 多模块重构 11:新增 H2 SQL 脚本的生成 4 years ago
YunaiV 8d59384904 多模块重构 10:去除 Freemarker 依赖,修改字典的前缀,从 sys=》system、inf=》infra 见名知意 4 years ago
YunaiV d45213fe2a 多模块重构 7:pay 模块的重构完成 4 years ago
YunaiV b757e1fccb 多模块重构 7:pay 模块的初始化 4 years ago