|
|
|
@@ -3,16 +3,11 @@ package com.iformall.controller; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.dto.WxCUserBasicInfoDto; |
|
|
|
import com.iformall.domain.po.WxCUser; |
|
|
|
import com.iformall.domain.po.WxLevelConfig; |
|
|
|
import com.iformall.domain.po.WxUserChannel; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.domain.vo.UserStructureVo; |
|
|
|
import com.iformall.enums.EnumAgeInfo; |
|
|
|
import com.iformall.enums.EnumCUserBaseInfoSex; |
|
|
|
import com.iformall.service.WxCUserBasicInfoService; |
|
|
|
import com.iformall.service.WxCUserService; |
|
|
|
import com.iformall.service.WxLevelConfigService; |
|
|
|
import com.iformall.service.WxUserChannelService; |
|
|
|
import com.iformall.service.*; |
|
|
|
import io.swagger.annotations.Api; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
@@ -45,6 +40,9 @@ public class WxUserStructureController extends BaseController { |
|
|
|
@Autowired |
|
|
|
private WxLevelConfigService wxLevelConfigService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WxCUserCarService wxCUserCarService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WxUserChannelService wxUserChannelService; |
|
|
|
|
|
|
|
@@ -132,6 +130,48 @@ public class WxUserStructureController extends BaseController { |
|
|
|
return new ResultData(levelList); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("查询会员绑车牌结构") |
|
|
|
@GetMapping("/findUserCarStructure") |
|
|
|
public ResultData findCarLevelStructure(Date startTime, Date endTime) { |
|
|
|
|
|
|
|
WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); |
|
|
|
dto.setTenantId(getTenantId()); |
|
|
|
dto.setStartTime(startTime); |
|
|
|
dto.setEndTime(endTime); |
|
|
|
List<Long> idList = wxCUserBasicInfoService.findIdList(dto); |
|
|
|
|
|
|
|
WxCUserCar wxCUserCar = new WxCUserCar(); |
|
|
|
|
|
|
|
wxCUserCar.setTenantId(getTenantId()); |
|
|
|
wxCUserCar.setIds(idList); //注:countUser接口通过ids传递user_id list. |
|
|
|
long userCountWithCar = wxCUserCarService.countUser(wxCUserCar); |
|
|
|
Map userWithCar = new HashMap(); |
|
|
|
userWithCar.put("title","已绑定车牌"); |
|
|
|
userWithCar.put("count",userCountWithCar); |
|
|
|
|
|
|
|
|
|
|
|
long userCountWithoutCar = idList.size()-userCountWithCar; |
|
|
|
|
|
|
|
Map userWithoutCar = new HashMap(); |
|
|
|
userWithoutCar.put("title","未绑定车牌"); |
|
|
|
userWithoutCar.put("count",userCountWithoutCar); |
|
|
|
|
|
|
|
NumberFormat nf = NumberFormat.getPercentInstance(); |
|
|
|
nf.setMinimumFractionDigits(2); |
|
|
|
|
|
|
|
if(userCountWithoutCar + userCountWithCar>0) { |
|
|
|
userWithCar.put("percentage",nf.format(userCountWithCar/new Double(userCountWithoutCar + userCountWithCar).doubleValue())); |
|
|
|
userWithoutCar.put("percentage",nf.format(userCountWithoutCar/new Double(userCountWithoutCar + userCountWithCar).doubleValue())); |
|
|
|
} else { |
|
|
|
userWithCar.put("percentage","--"); |
|
|
|
userWithoutCar.put("percentage","--"); |
|
|
|
} |
|
|
|
|
|
|
|
List<Map> list = new ArrayList<>(); |
|
|
|
list.add(userWithCar); |
|
|
|
list.add(userWithoutCar); |
|
|
|
return new ResultData(list); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/********************************会员数据**************************************/ |
|
|
|
|