huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-29 18:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xingyu 2022-11-23 22:55:15 +08:00
commit 61a6039fce
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
View File

@ -30,6 +30,7 @@ public interface TradeOrderConvert {
TradeOrderConvert INSTANCE = Mappers.getMapper(TradeOrderConvert.class); TradeOrderConvert INSTANCE = Mappers.getMapper(TradeOrderConvert.class);
@Mappings({ @Mappings({
@Mapping(target = "id", ignore = true),
@Mapping(source = "createReqVO.couponId", target = "couponId"), @Mapping(source = "createReqVO.couponId", target = "couponId"),
@Mapping(target = "remark", ignore = true), @Mapping(target = "remark", ignore = true),
@Mapping(source = "createReqVO.remark", target = "userRemark"), @Mapping(source = "createReqVO.remark", target = "userRemark"),

2
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
View File

@ -156,7 +156,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
* @return 收件地址 * @return 收件地址
*/ */
private AddressRespDTO validateAddress(Long userId, Long addressId) { private AddressRespDTO validateAddress(Long userId, Long addressId) {
AddressRespDTO address = addressApi.getAddress(userId, addressId); AddressRespDTO address = addressApi.getAddress(addressId, userId);
if (Objects.isNull(address)) { if (Objects.isNull(address)) {
throw exception(ErrorCodeConstants.ORDER_CREATE_ADDRESS_NOT_FOUND); throw exception(ErrorCodeConstants.ORDER_CREATE_ADDRESS_NOT_FOUND);
} }