diff --git a/ms-api/src/main/java/com/ms/api/dto/dsorder/RefundInfoDTO.java b/ms-api/src/main/java/com/ms/api/dto/dsorder/RefundInfoDTO.java index 67777cd..a3e77a2 100644 --- a/ms-api/src/main/java/com/ms/api/dto/dsorder/RefundInfoDTO.java +++ b/ms-api/src/main/java/com/ms/api/dto/dsorder/RefundInfoDTO.java @@ -13,7 +13,7 @@ public class RefundInfoDTO { private Date gmtTimeOut; private Integer goodsStatus; private Integer refundPayment; - private Integer goodsReceived; + private Boolean goodsReceived; private String rejectReason; private Integer onlyRefund; private Integer refundGoods; diff --git a/ms-biz/src/main/java/com/ms/biz/service/impl/DsMessageServiceImpl.java b/ms-biz/src/main/java/com/ms/biz/service/impl/DsMessageServiceImpl.java index 3c49b33..2cf801f 100644 --- a/ms-biz/src/main/java/com/ms/biz/service/impl/DsMessageServiceImpl.java +++ b/ms-biz/src/main/java/com/ms/biz/service/impl/DsMessageServiceImpl.java @@ -389,11 +389,11 @@ public class DsMessageServiceImpl implements DsMessageService { Map skuIdAndPurSkuOrderIdMap = new HashMap<>(); List skus = platformPurchaseOrderSkuMapper.getListByPurOrderIds(Collections.singletonList(purchaseOrder.getPurOrderId())); for (PlatformPurchaseOrderSku sku: skus) { - skuIdAndPurSkuOrderIdMap.put(sku.getOuterSkuId(), sku.getPurSkuOrderId()); + skuIdAndPurSkuOrderIdMap.put(String.valueOf(sku.getSkuId()), sku.getPurSkuOrderId()); } SupplyCenterRefundOperateParam param = new SupplyCenterRefundOperateParam(); - param.setPurOrderId(purchaseOrderDTO.getPlatformOrderId()); + param.setPurOrderId(purchaseOrder.getPurOrderId()); List skuRefundInfosItems = new ArrayList<>(); for (Map.Entry entry: purchaseOrderDTO.getRefundInfo().entrySet()) { Set subItemIds = entry.getValue().getOrderEntryCountMap().keySet(); @@ -454,9 +454,9 @@ public class DsMessageServiceImpl implements DsMessageService { } private int getAftersaleType(RefundInfoDTO refundInfo) { - if (refundInfo.getOnlyRefund() == 1 && refundInfo.getGoodsReceived() == 1) { + if (refundInfo.getOnlyRefund() == 1 && refundInfo.getGoodsReceived()) { return 1; - } else if (refundInfo.getOnlyRefund() == 1 && refundInfo.getGoodsReceived() == 0) { + } else if (refundInfo.getOnlyRefund() == 1) { return 2; } return 3;