Merge remote-tracking branch 'origin/master-v2' into master-v2

gongzuming

2024-09-12 55255f6b9f81b8a3fdd576b27cda5c34fbb7ba0a

 src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java

@@ -756,7 +756,7 @@

                detail.setOrderId(oi.getOrderId());
                detail.setOrderItemId(itemId);
                detail.setPrice(oi.getMarkupPartner());
                detail.setPrice(getAmount(oi.getMarkupPartner()));
                detail.setNum(oi.getNum());
                detail.setTotalAmount(detail.getPrice().multiply(new BigDecimal(detail.getNum())));
                detail.setCheckFee(new BigDecimal(0));