BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 61a6039fce5d5c6db613a35e98d43895eba12f73

Authored by xingyu
2 parents 0d0f64e3 1465d064

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

Inline Side-by-side
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
  View file @61a6039
... ... @@ -30,6 +30,7 @@ public interface TradeOrderConvert {
30 30 TradeOrderConvert INSTANCE = Mappers.getMapper(TradeOrderConvert.class);
31 31  
32 32 @Mappings({
  33 + @Mapping(target = "id", ignore = true),
33 34 @Mapping(source = "createReqVO.couponId", target = "couponId"),
34 35 @Mapping(target = "remark", ignore = true),
35 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
  View file @61a6039
... ... @@ -156,7 +156,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
156 156 * @return 收件地址
157 157 */
158 158 private AddressRespDTO validateAddress(Long userId, Long addressId) {
159   - AddressRespDTO address = addressApi.getAddress(userId, addressId);
  159 + AddressRespDTO address = addressApi.getAddress(addressId, userId);
160 160 if (Objects.isNull(address)) {
161 161 throw exception(ErrorCodeConstants.ORDER_CREATE_ADDRESS_NOT_FOUND);
162 162 }
... ...