Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/controller/SysPartnerController.java

@@ -26,6 +26,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -197,11 +198,19 @@ public class SysPartnerController extends BaseController {
     @ApiOperation(value = "比例配置")
     public HttpResult add(@RequestBody SysProportionConfig sysProportionConfig) {
         String proportion = sysProportionConfig.getProportion();
-        String proportionNum = sysProportionConfig.getOneProportion()+sysProportionConfig.getTwoProportion()
-                +sysProportionConfig.getThreeProportion()+sysProportionConfig.getFourProportion()
-                +sysProportionConfig.getFiveProportion();
-
-        if (proportion.equals(proportionNum)) {
+        double v = Double.parseDouble(sysProportionConfig.getOneProportion())
+                + Double.parseDouble(sysProportionConfig.getTwoProportion())
+                + Double.parseDouble(sysProportionConfig.getThreeProportion())
+                + Double.parseDouble(sysProportionConfig.getFourProportion())
+                + Double.parseDouble(sysProportionConfig.getFiveProportion());
+
+//        String proportionNum = sysProportionConfig.getOneProportion()+sysProportionConfig.getTwoProportion()
+//                +sysProportionConfig.getThreeProportion()+sysProportionConfig.getFourProportion()
+//                +sysProportionConfig.getFiveProportion();
+
+        BigDecimal bigDecimal = new BigDecimal(proportion);
+        BigDecimal bigDecimal1 = new BigDecimal(v);
+        if (bigDecimal.compareTo(bigDecimal1) != 0 ) {
             throw new SystemException("总比例必须等于每级合伙人比例和");
         }
         Long id = sysProportionConfig.getId();