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

Compare commits

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

2 Commits
3584c72284 ... 02f4c47383

Author SHA1 Message Date
wangy 02f4c47383 Merge remote-tracking branch 'origin/dev_1.0.2' into dev_1.0.2 2026-05-22 15:33:08 +08:00
wangy ea52bec18d feat(sip):bug修改 2026-05-22 15:28:17 +08:00
1 changed files with 2 additions and 1 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.setPayMethod(nexPayMethod);
omsPurchaseOrder.setOwnerId(nexOwnerId); omsPurchaseOrder.setOwnerId(nexOwnerId);
omsPurchaseOrder.setOwnerName(nexOwnerName); omsPurchaseOrder.setOwnerName(nexOwnerName);
omsPurchaseOrder.setTotalAmount(new BigDecimal(nexTotalAmount)); // omsPurchaseOrder.setTotalAmount(new BigDecimal(nexTotalAmount));
omsPurchaseOrder.setStatus(OmsPurchaseOrder.StatusEnum.WAIT_COMPLETED.getCode()); // 0 omsPurchaseOrder.setStatus(OmsPurchaseOrder.StatusEnum.WAIT_COMPLETED.getCode()); // 0
omsPurchaseOrder.setApproveStatus(ApproveStatusEnum.WAIT_COMMIT.getCode()); // 0 omsPurchaseOrder.setApproveStatus(ApproveStatusEnum.WAIT_COMMIT.getCode()); // 0
@ -665,6 +665,7 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
// 税额 = 单价 * 数量 - (单价 * 数量) / (1 + 税率)，结果取两位小数 // 税额 = 单价 * 数量 - (单价 * 数量) / (1 + 税率)，结果取两位小数
BigDecimal quantity = orderItem.getQuantity(); BigDecimal quantity = orderItem.getQuantity();
BigDecimal totalAmount = price.multiply(quantity); BigDecimal totalAmount = price.multiply(quantity);
omsPurchaseOrder.setTotalAmount(totalAmount);
BigDecimal taxTotal = totalAmount.subtract(totalAmount.divide(BigDecimal.ONE.add(taxRate), 2, BigDecimal.ROUND_HALF_UP)); BigDecimal taxTotal = totalAmount.subtract(totalAmount.divide(BigDecimal.ONE.add(taxRate), 2, BigDecimal.ROUND_HALF_UP));
orderItem.setTaxTotal(taxTotal.setScale(2, BigDecimal.ROUND_HALF_UP)); orderItem.setTaxTotal(taxTotal.setScale(2, BigDecimal.ROUND_HALF_UP));
// 根据传入的参数计算金额 // 根据传入的参数计算金额