'1'

twzd-admin/src/main/java/com/miaxis/pc/controller/extension/PcWxExtensionIncomeController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.SysDictData;
 import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.enums.BusinessTypeEnum;
 import com.miaxis.common.utils.poi.ExcelUtil;
@@ -11,6 +12,7 @@ import com.miaxis.extension.dto.ExtensionIncomeListDTO;
 import com.miaxis.extension.service.IWxExtensionIncomeService;
 import com.miaxis.extension.vo.ExtensionIncomeVo;
 import com.miaxis.spread.service.IWxSpreadRelationService;
+import com.miaxis.system.service.ISysDictTypeService;
 import com.miaxis.user.service.IUserInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author wwl
@@ -43,6 +46,8 @@ public class PcWxExtensionIncomeController extends BaseController {
 
     private final IWxSpreadRelationService wxSpreadRelationService;
 
+    private final ISysDictTypeService dictTypeService;
+
 
 
 
@@ -77,7 +82,15 @@ public class PcWxExtensionIncomeController extends BaseController {
     @ApiOperation("导出积分列表")
     public Response<String> export(ExtensionIncomeListDTO dto){
         List<ExtensionIncomeVo> list = userInfoService.getPcDownLevelPoints(dto);
-        list.stream().forEach(o-> o.setSettleMoney(o.getAchievement()/100.0));
+        //根据字典获取分成百分比
+        List<SysDictData> dictDatas = dictTypeService.selectDictDataByType("sys_divide_percent");
+        Optional<SysDictData> saleOption = dictDatas.stream().filter(o -> o.getDictLabel().equals("销售")).findFirst();
+        String value = saleOption.get().getDictValue();
+        Double divide = Double.valueOf(value)/100.0;
+        list.stream().forEach(o->{
+            o.setSettleMoney(o.getAchievement()*divide/100.0);
+            o.setDivide(divide+"%");
+        } );
         ExcelUtil<ExtensionIncomeVo> util = new ExcelUtil<ExtensionIncomeVo>(ExtensionIncomeVo.class);
         return util.exportExcel(list, "code");
     }
@@ -88,7 +101,10 @@ public class PcWxExtensionIncomeController extends BaseController {
     public Response extensionIncomePrice( @ApiParam(name = "ids", value = "collectionids参数", required = true)
                                               @PathVariable Long[] ids) {
 
+
+
         List<UserInfo> list = userInfoService.list(new QueryWrapper<UserInfo>().in("id", Arrays.asList(ids)));
+
         list.stream().forEach(userInfo->{
             userInfo.setAchievementSettled(userInfo.getAchievementSettled()+userInfo.getAchievement());
             userInfo.setAchievement(0);

twzd-service/src/main/java/com/miaxis/extension/vo/ExtensionIncomeVo.java

@@ -57,6 +57,9 @@ public class ExtensionIncomeVo {
     @ApiModelProperty(value = "消费金额(分)")
     private Integer costCount;
 
+    @Excel(name = "抽成比例")
+    private String divide;
+
     @Excel(name = "需付佣金(单位:元)")
     private Double settleMoney;