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

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/BaseOrderRevenueFindDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import com.github.wxiaoqi.security.common.vo.DataInter;
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/23 16:27
+ */
+@Data
+public class BaseOrderRevenueFindDTO extends PageParam implements DataInter {
+
+    private Integer  status;
+
+    private String  month;
+
+    Integer companyId;
+
+    List<Integer> dataCorporationIds;
+
+    List<Integer> dataCompanyIds;
+
+    Integer bizType;
+
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/BaseOrderRevenueVo.java

+package com.github.wxiaoqi.security.admin.vo;
+
+import com.github.wxiaoqi.security.admin.entity.BaseOrderRevenue;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/12 9:20
+ */
+@Data
+public class BaseOrderRevenueVo extends BaseOrderRevenue {
+
+
+
+}

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

@@ -23,6 +23,7 @@ public class BaseCommissionRatioBiz extends BaseBiz<BaseCommissionRatioMapper, B
     public List<BaseCommissionRatio> getList(){
         Example example=new Example(BaseCommissionRatio.class);
         example.createCriteria().andEqualTo("status",1);
+        example.setOrderByClause("type desc");
         return  mapper.selectByExample(example);
     }
 

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

@@ -135,10 +135,11 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
         BigDecimal amount=BigDecimal.ZERO;
         BigDecimal companyDivisionAmount=orderAmount;
         BigDecimal extrac = new BigDecimal(100);
+        BigDecimal  companyExtrac=new BigDecimal(100);
         if (baseCommissionRatios.size() > 0){
             //先计算分给店铺
-            BigDecimal  companyExtrac = baseCommissionRatios.stream().map(BaseCommissionRatio::getExtract).reduce(BigDecimal.ZERO,BigDecimal::add);
-            companyExtrac = new BigDecimal(100).subtract(companyExtrac);
+            extrac = baseCommissionRatios.stream().map(BaseCommissionRatio::getExtract).reduce(BigDecimal.ZERO,BigDecimal::add);
+            companyExtrac = new BigDecimal(100).subtract(extrac);
             //店铺金额
             companyDivisionAmount=orderAmount.multiply(companyExtrac).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
             //其他金额
@@ -173,23 +174,25 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
                     continue;
                 }
                 BigDecimal divisionAmount ;
+                BigDecimal extract1=commissionRatio.getExtract();
                 if (num.equals(baseCommissionRatios.size())){
                     divisionAmount=otherDivisionAmount.subtract(amount);
+                    extract1=extrac;
                 }else {
-                    divisionAmount=orderAmount.multiply(commissionRatio.getExtract()).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
+                    divisionAmount=orderAmount.multiply(extract1).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
                 }
                 BaseOrderAcceptDetailed acceptDetailed=new BaseOrderAcceptDetailed();
                 BeanUtils.copyProperties(orderWaterDTO,acceptDetailed);
                 acceptDetailed.setMchId(mchId);
                 acceptDetailed.setOrderAmount(orderAmount);
                 acceptDetailed.setDivisionAmount(divisionAmount);
-                acceptDetailed.setExtract(commissionRatio.getExtract());
+                acceptDetailed.setExtract(extract1);
                 acceptDetailed.setDivisionType(divisionType);
                 acceptDetailed.setAddTime(System.currentTimeMillis());
                 acceptDetailed.setStatus(0);
                 insertSelective(acceptDetailed);
                 amount=amount.add(divisionAmount);
-                extrac=extrac.subtract(commissionRatio.getExtract());
+                extrac=extrac.subtract(extract1);
                 orderWaterDTO.setAcceptId(acceptDetailed.getId());
                 sellingWaterBiz.payOrderWater(orderWaterDTO);
             }
@@ -199,7 +202,7 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
         BaseOrderAcceptDetailed acceptDetailed=new BaseOrderAcceptDetailed();
         BeanUtils.copyProperties(orderWaterDTO,acceptDetailed);
         acceptDetailed.setMchId(companyId);
-        acceptDetailed.setExtract(extrac);
+        acceptDetailed.setExtract(companyExtrac);
         acceptDetailed.setOrderAmount(orderAmount);
         acceptDetailed.setDivisionAmount(companyDivisionAmount);
         acceptDetailed.setDivisionType(5);