yudao

feng/yudao

History

owen f7296d18b9 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate

# Conflicts:
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.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/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java

2023-09-24 10:10:53 +08:00

yudao-module-product-api

积分：完善积分获得、退还、使用相关逻辑

2023-09-23 14:11:16 +08:00

yudao-module-product-biz

product：订单表，增加 vip 优惠字段

2023-09-24 00:45:32 +08:00

yudao-module-promotion-api

Merge remote-tracking branch 'origin/feature/mall_product' into brokerate

2023-09-24 10:10:53 +08:00

yudao-module-promotion-biz

code review：营销活动 & 交易订单的对接