Merge remote-tracking branch 'origin/dev-chw' into dev-chw

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseOrderAcceptDetailedBiz.java

@@ -168,7 +168,7 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
                 if (num.equals(baseCommissionRatios.size())){
                     divisionAmount=otherDivisionAmount.subtract(amount);
                 }else {
-                    divisionAmount=otherDivisionAmount.multiply(commissionRatio.getExtract()).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
+                    divisionAmount=orderAmount.multiply(commissionRatio.getExtract()).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
                 }
                 BaseOrderAcceptDetailed acceptDetailed=new BaseOrderAcceptDetailed();
                 BeanUtils.copyProperties(orderWaterDTO,acceptDetailed);