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

gongzuming

2024-09-26 e468d0b56e1c33f047bee84ca8c9a142c769fe16

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

@@ -642,7 +642,7 @@
            return new BigDecimal(0);
        }

        if(couponAmount.doubleValue() >= totalAmount.doubleValue()){
        if(couponAmount.compareTo(totalAmount) >= 0){
            return price;
        }
        if(isLastOne){//最后的商品使用优惠券剩下的面值