13

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserSellingWater.java

@@ -129,7 +129,7 @@ public class AppUserSellingWater implements Serializable {
      */
     @Column(name = "extract")
 	@ApiModelProperty(value = "提成百分比")
-    private Integer extract;
+    private BigDecimal extract;
 	
 	    /**
      *  是否入账：0-未入账；1-已入账

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseOrderAcceptDetailed.java

@@ -82,7 +82,7 @@ public class BaseOrderAcceptDetailed implements Serializable {
 
 	@Column(name = "extract")
 	@ApiModelProperty(value = "抽成比例")
-	private Integer extract;
+	private BigDecimal extract;
 
 
 

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

@@ -168,7 +168,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
         sellingWater.setAcceptId(zAcceptId);
         sellingWater=selectOne(sellingWater);
         if (sellingWater != null ){
-            BigDecimal commission=orderAmount.multiply(new BigDecimal(sellingWater.getExtract())).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
+            BigDecimal commission=orderAmount.multiply(sellingWater.getExtract()).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
             sellingWater.setAcceptId(acceptId);
             sellingWater.setWaiting(1);
             sellingWater.setStatus(1);

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

@@ -131,7 +131,7 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
                 if (type != 3 && mchId  == 0){
                     continue;
                 }
-                BigDecimal divisionAmount=orderAmount.multiply(new BigDecimal(commissionRatio.getExtract())).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
+                BigDecimal divisionAmount=orderAmount.multiply(commissionRatio.getExtract()).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
                 BaseOrderAcceptDetailed acceptDetailed=new BaseOrderAcceptDetailed();
                 BeanUtils.copyProperties(orderWaterDTO,acceptDetailed);
                 acceptDetailed.setMchId(mchId);
@@ -188,7 +188,7 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
                                 insertSelective(acceptDetailed1);
                             }
                         }else {
-                            BigDecimal divisionAmount=orderAmount.multiply(new BigDecimal(acceptDetailed1.getExtract())).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
+                            BigDecimal divisionAmount=orderAmount.multiply(acceptDetailed1.getExtract()).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
                             acceptDetailed1.setDivisionAmount(divisionAmount);
                             insertSelective(acceptDetailed1);
                             amount=amount.add(divisionAmount);