mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mula:02f4c473838220c1cd36777719d9a5c454c39899
Branches Tags
mula:dev_1.0.2
mula:dev_1.0.1
mula:dev_1.0.0
mula:master
..
compare: mula:3584c72284eb1b9b9b9f31dc72a5b3f6538f3302
Branches Tags
mula:dev_1.0.2
mula:dev_1.0.1
mula:dev_1.0.0
mula:master

No commits in common. "02f4c473838220c1cd36777719d9a5c454c39899" and "3584c72284eb1b9b9b9f31dc72a5b3f6538f3302" have entirely different histories.
02f4c47383 ... 3584c72284

1 changed files with 1 additions and 2 deletions
Show Stats Expand all files Collapse all files

3
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java
View File

@ -642,7 +642,7 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
omsPurchaseOrder.setPayMethod(nexPayMethod);
omsPurchaseOrder.setOwnerId(nexOwnerId);
omsPurchaseOrder.setOwnerName(nexOwnerName);
// omsPurchaseOrder.setTotalAmount(new BigDecimal(nexTotalAmount));
omsPurchaseOrder.setTotalAmount(new BigDecimal(nexTotalAmount));
omsPurchaseOrder.setStatus(OmsPurchaseOrder.StatusEnum.WAIT_COMPLETED.getCode()); // 0
omsPurchaseOrder.setApproveStatus(ApproveStatusEnum.WAIT_COMMIT.getCode()); // 0
@ -665,7 +665,6 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
// 税额 = 单价 * 数量 - (单价 * 数量) / (1 + 税率)，结果取两位小数
BigDecimal quantity = orderItem.getQuantity();
BigDecimal totalAmount = price.multiply(quantity);
omsPurchaseOrder.setTotalAmount(totalAmount);
BigDecimal taxTotal = totalAmount.subtract(totalAmount.divide(BigDecimal.ONE.add(taxRate), 2, BigDecimal.ROUND_HALF_UP));
orderItem.setTaxTotal(taxTotal.setScale(2, BigDecimal.ROUND_HALF_UP));
// 根据传入的参数计算金额