|
|
|
@ -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) {
|
|
|
|
|