修改bug

20240115-ljl-multiPay
ljl 1 year ago
parent c956f16252
commit f51e8a5553

@ -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;

@ -389,11 +389,11 @@ public class DsMessageServiceImpl implements DsMessageService {
Map<String, String> skuIdAndPurSkuOrderIdMap = new HashMap<>();
List<PlatformPurchaseOrderSku> 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<SkuRefundInfosItem> skuRefundInfosItems = new ArrayList<>();
for (Map.Entry<String, RefundInfoDTO> entry: purchaseOrderDTO.getRefundInfo().entrySet()) {
Set<String> 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;

Loading…
Cancel
Save