Merge remote-tracking branch 'origin/master' into feature/vue3

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 {
     TradeOrderConvert INSTANCE = Mappers.getMapper(TradeOrderConvert.class);
 
     @Mappings({
+            @Mapping(target = "id", ignore = true),
             @Mapping(source = "createReqVO.couponId", target = "couponId"),
             @Mapping(target = "remark", ignore = true),
             @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 {
      * @return 收件地址
      */
     private AddressRespDTO validateAddress(Long userId, Long addressId) {
-        AddressRespDTO address = addressApi.getAddress(userId, addressId);
+        AddressRespDTO address = addressApi.getAddress(addressId, userId);
         if (Objects.isNull(address)) {
             throw exception(ErrorCodeConstants.ORDER_CREATE_ADDRESS_NOT_FOUND);
         }