Commit 61a6039fce5d5c6db613a35e98d43895eba12f73
Merge remote-tracking branch 'origin/master' into feature/vue3
Showing
2 changed files
with
2 additions
and
1 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
| @@ -30,6 +30,7 @@ public interface TradeOrderConvert { | @@ -30,6 +30,7 @@ public interface TradeOrderConvert { | ||
| 30 | TradeOrderConvert INSTANCE = Mappers.getMapper(TradeOrderConvert.class); | 30 | TradeOrderConvert INSTANCE = Mappers.getMapper(TradeOrderConvert.class); |
| 31 | 31 | ||
| 32 | @Mappings({ | 32 | @Mappings({ |
| 33 | + @Mapping(target = "id", ignore = true), | ||
| 33 | @Mapping(source = "createReqVO.couponId", target = "couponId"), | 34 | @Mapping(source = "createReqVO.couponId", target = "couponId"), |
| 34 | @Mapping(target = "remark", ignore = true), | 35 | @Mapping(target = "remark", ignore = true), |
| 35 | @Mapping(source = "createReqVO.remark", target = "userRemark"), | 36 | @Mapping(source = "createReqVO.remark", target = "userRemark"), |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
| @@ -156,7 +156,7 @@ public class TradeOrderServiceImpl implements TradeOrderService { | @@ -156,7 +156,7 @@ public class TradeOrderServiceImpl implements TradeOrderService { | ||
| 156 | * @return 收件地址 | 156 | * @return 收件地址 |
| 157 | */ | 157 | */ |
| 158 | private AddressRespDTO validateAddress(Long userId, Long addressId) { | 158 | private AddressRespDTO validateAddress(Long userId, Long addressId) { |
| 159 | - AddressRespDTO address = addressApi.getAddress(userId, addressId); | 159 | + AddressRespDTO address = addressApi.getAddress(addressId, userId); |
| 160 | if (Objects.isNull(address)) { | 160 | if (Objects.isNull(address)) { |
| 161 | throw exception(ErrorCodeConstants.ORDER_CREATE_ADDRESS_NOT_FOUND); | 161 | throw exception(ErrorCodeConstants.ORDER_CREATE_ADDRESS_NOT_FOUND); |
| 162 | } | 162 | } |