lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
4,275 Commits 2 Branches 0 Tags 165 MiB
59d5fef592
Commit Graph

4275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV
59d5fef592 mall + trade：优化运费模版的代码 2023-06-17 11:35:31 +08:00
YunaiV
07fe52939d mall + promotion：mock banner mock 接口 2023-06-17 00:47:47 +08:00
YunaiV
5b324f90a4 mall + promotion：mock 拼团活动列表 2023-06-16 23:27:27 +08:00
YunaiV
8ec3733882 mall + trade：mock 拼团记录列表的接口 2023-06-16 20:32:03 +08:00
YunaiV
af9334c9b2 mall + trade：mock 拼团记录详情的接口 2023-06-16 00:12:49 +08:00
jason
1662d17fc9 快递客户端 review 修改 2023-06-15 14:59:31 +08:00
jason
e69e6d880b 快递价格计算 review 修改 2023-06-15 10:49:24 +08:00
YunaiV
af0eeb6e3b Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-14 23:08:28 +08:00
YunaiV
b74991e242 mall + trade：mock 拼团活动详情的接口 2023-06-14 23:08:22 +08:00
xingyu
e23fb5024a fix: required = true 已过期 2023-06-14 15:21:41 +08:00
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
 2023-06-14 15:18:12 +08:00
YunaiV
dcb1660880 mall + trade：code review 快递计算逻辑 2023-06-12 00:20:20 +08:00
YunaiV
e1a8e45ac7 mall + trade：快递价格计算 2023-06-11 23:40:38 +08:00
YunaiV
0c283ded5d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-11 23:19:09 +08:00
YunaiV
b6c7a940be mall + promotion：增加秒杀活动的 mock 接口 2023-06-11 23:19:04 +08:00
jason
644d976a78 快递100 快递查询实现 2023-06-11 18:15:33 +08:00
jason
45e5578cb4 快递查询、 通过快递鸟查询实现 2023-06-11 10:22:33 +08:00
YunaiV
5ffc1ac9f3 mall + promotion：增加秒杀活动的 mock 接口 2023-06-11 00:22:45 +08:00
YunaiV
4f5ac0edbb mall + promotion：增加营销活动的 mock 接口 2023-06-10 17:51:15 +08:00
YunaiV
9e894e0430 mall + promotion：增加优惠劵的 mock 接口 2023-06-10 09:57:37 +08:00
YunaiV
66210e5ee2 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-10 00:19:08 +08:00
YunaiV
bb8e44a268 mall + product：增加评论 mock 逻辑 2023-06-10 00:17:22 +08:00
jason
dde89d51d5 物流运费计算 review 修改 + 单元测试 2023-06-10 00:15:57 +08:00
YunaiV
1e1a22c256 mall + product：评论的 review 2023-06-09 22:41:16 +08:00
YunaiV
84b365a707 mall + product：简化收藏逻辑，去掉 type 字段 2023-06-09 20:44:00 +08:00
YunaiV
25bea4920c mall + trade：review 物流计算 2023-06-09 19:17:25 +08:00
YunaiV
f2d803c111 mall + product：review 评论接口 2023-06-09 13:59:04 +08:00
YunaiV
4126e37d91 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/pom.xml
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
 2023-06-09 08:55:45 +08:00
YunaiV
f75f4e8846 mall + product：完善商品详情接口 2023-06-09 08:54:33 +08:00
芋道源码
0e817b190f
!499 完善商品管理 review 提到的问题 
Merge pull request !499 from puhui999/feature/mall_product
 2023-06-09 00:53:44 +00:00
puhui999
91e357e59d fix：移动 app 商品评论分页相关常量到 AppCommentPageReqVO 中 2023-06-08 17:15:37 +08:00
puhui999
8f7efbe4e2 fix：测试 app 商品评论页获取评论分页接口和相关评论分类数量接口，修复测试时发现的问题 2023-06-08 16:14:23 +08:00
puhui999
151e58daa1 fix：完善 app 商品评论页获取评论分页接口和相关评论分类数量接口 2023-06-08 11:37:49 +08:00
puhui999
5bfca56efa fix：完善 TODO 提到的问题 2023-06-07 18:08:49 +08:00
puhui999
db7e47faa2 fix：完善 TODO 提到的问题 2023-06-07 14:15:25 +08:00
jason
36c45bd44e review 价格运算修改. 2023-06-04 17:45:40 +08:00
YunaiV
dd93215139 mall + trade：review 商品管理 2023-06-03 22:59:34 +08:00
芋道源码
e72f741d02
!493 完善善品管理 
Merge pull request !493 from puhui999/feature/mall_product
 2023-06-03 14:35:23 +00:00
puhui999
f3a982da31 fix：修复合并差异 2023-06-03 21:12:12 +08:00
芋道源码
f59119bf6e
!492 富文本编辑器自动聚焦问题 update yudao-ui-admin/src/components/Editor/index.vue. 
Merge pull request !492 from zbk/N/A
 2023-06-03 12:56:05 +00:00
puhui999
ba380ea615 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/price/PriceServiceTest.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
#	yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceTest.java
 2023-06-03 20:55:45 +08:00
YunaiV
910d374cee mall + trade：review 运费价格计算 2023-06-03 19:56:23 +08:00
YunaiV
36ce968893 mall + trade：review 运费价格计算 2023-06-03 18:08:59 +08:00
jason
f1fa8eadd2 mall - trade - 新增 TradeDeliveryPriceCalculator 2023-06-03 17:16:18 +08:00
YunaiV
73a781cbbe mall + trade：增加 TradeRewardActivityPriceCalculatorTest 的单元测试 2023-06-03 13:36:07 +08:00
YunaiV
0d08c814ec mall + trade：增加 TradeDiscountActivityPriceCalculator 的单元测试 2023-06-03 13:14:47 +08:00
YunaiV
1452f6b231 mall + trade：增肌爱 TradeCouponPriceCalculator 的单元测试 2023-06-03 11:53:40 +08:00
YunaiV
636b14ccce mall + trade：创建订单逻辑，接入新的价格接口 2023-06-03 09:14:51 +08:00
YunaiV
2a9a869e01 mall + trade：获得订单结算信息，接入支付接口 2023-06-03 00:46:56 +08:00
zbk
51cf5b7c67
富文本编辑器自动聚焦问题 update yudao-ui-admin/src/components/Editor/index.vue. 
修复富文本编辑器自动聚焦问题；
思路：初始化时初始化只读模式的编辑器，因为只读模式的编辑器不会因为聚焦问题带跑滚动条，然后根据传递的是否只读参数设置编辑器是否启用。

Signed-off-by: zbk <540064991@qq.com>
 2023-06-01 03:57:13 +00:00