售后订单同步部分

20230922-ljl-fixBug
daixiaogang 1 year ago
parent f94b9b2d91
commit 26f5d47f31

@ -17,6 +17,7 @@ import com.doudian.open.api.afterSale_Detail.data.AfterSaleInfo;
import com.doudian.open.api.afterSale_Detail.data.AfterSaleShopRemarksItem;
import com.doudian.open.api.afterSale_Detail.data.ArbitrateInfo;
import com.doudian.open.api.afterSale_Detail.data.Exchange;
import com.doudian.open.api.afterSale_Detail.data.ExchangeSkuInfo;
import com.doudian.open.api.afterSale_Detail.data.LogisticsInfo;
import com.doudian.open.api.afterSale_Detail.data.OrderInfo;
import com.doudian.open.api.afterSale_Detail.data.PriceProtectionDetail;
@ -257,7 +258,7 @@ public class AfterSaleServiceImpl implements AfterSaleService {
exchangeSkuInfo.setSpecDesc(apiAfterSaleInfo.getExchangeSkuInfo().getSpecDesc());
exchangeSkuInfo.setAfterSaleId(apiAfterSaleInfo.getAfterSaleId());
exchangeSkuInfo.setPrice(exchangeSkuInfo.getPrice());
exchangeSkuInfo.setPrice(BigDecimal.valueOf(CommonTool.correctCentToYuan(exchangeSkuInfo.getPrice().doubleValue())));
return exchangeSkuInfo;
}

@ -1483,14 +1483,14 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
double phasePromotionAmount = (double) orderPhase.getPhasePromotionAmount();
if (paySuccess && currentPhase == 1) {
depositAmount += correctCentToYuan(phasePayablePrice);
depositAmount += CommonTool.correctCentToYuan(phasePayablePrice);
}
postAmount += correctCentToYuan(phasePostAmount);
promotionAmount += correctCentToYuan(phasePromotionAmount);
postAmount += CommonTool.correctCentToYuan(phasePostAmount);
promotionAmount += CommonTool.correctCentToYuan(phasePromotionAmount);
if (!paySuccess) {
balancePayment += correctCentToYuan(phasePayablePrice);
balancePayment += CommonTool.correctCentToYuan(phasePayablePrice);
}
}
double totalAmount = depositAmount + balancePayment + postAmount + promotionAmount;
@ -1503,10 +1503,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
return orderPhaseInfo;
}
private static double correctCentToYuan(double amount) {
return amount / 100;
}
private List<JSONObject> appendItemsIsUseManualConsignee(List<JSONObject> returnOrderItems, Map<String, JSONObject> returnPurchaseOrders, Map<Long, Long> skuIdAndPurchaseOrderIdMap) {
for (JSONObject item : returnOrderItems) {

@ -28,7 +28,7 @@ public class ManualRsyncDdOrdersService extends SPIBaseService implements Extens
ManualRsyncDdOrdersDTO requestDTO = req.getData();
ApiResult apiResult = orderUtil.rsyncOrder(shopId.toString(), requestDTO.getOrderIds(), requestDTO.getParamsRoute());
if (!apiResult.isSuccess()) {
return R.fail(apiResult.getMsg());
return R.ok(Ret.fail(apiResult.getMsg()));
}
return R.ok(Ret.success());
}

Loading…
Cancel
Save