Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-05 9adfc0c5aa084bc61807ce43badf8b9f48b588c3

Merge branch 'master' into master-v2

 src/main/java/com/mzl/flower/service/BaseService.java

@@ -235,7 +235,7 @@
                    break;
                }
            }
            fp = fp.add(b);
            fp = fp.add(getAmount(b));
            dto.setFirstFee(b);
        }

@@ -294,7 +294,7 @@
                        break;
                }
            }
            fp = fp.add(b);
            fp = fp.add(getAmount(b));
            dto.setSecondFee(b);

            FlowerMarkupSpCg fmpsc = null;
@@ -349,7 +349,7 @@
                        break;
                }
            }
            fp = fp.add(b);
            fp = fp.add(getAmount(b));
            dto.setPartnerFee(b);
        }

@@ -387,7 +387,7 @@
                    break;
                }
            }
            fp = fp.add(b);
            fp = fp.add(getAmount(b));
        }

        //二次加价
@@ -445,7 +445,7 @@
                    break;
            }
        }
        fp = fp.add(b);
        fp = fp.add(getAmount(b));

        return fp;
    }