diff --git a/bweb/src/main/java/com/bweb/controller/BsUserSpreadController.java b/bweb/src/main/java/com/bweb/controller/BsUserSpreadController.java index 115b10b..32a1ed1 100644 --- a/bweb/src/main/java/com/bweb/controller/BsUserSpreadController.java +++ b/bweb/src/main/java/com/bweb/controller/BsUserSpreadController.java @@ -10,10 +10,12 @@ import com.hfkj.common.security.UserCenter; import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.entity.BsUserSpreadOilChannel; import com.hfkj.entity.BsUserSpreadPower; +import com.hfkj.entity.BsUserSpreadRel; import com.hfkj.model.ResponseData; import com.hfkj.model.UserSessionObject; import com.hfkj.service.spread.BsUserSpreadOilChannelService; import com.hfkj.service.spread.BsUserSpreadPowerService; +import com.hfkj.service.spread.BsUserSpreadRelService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -22,6 +24,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; @@ -37,6 +40,8 @@ public class BsUserSpreadController { private static Logger log = LoggerFactory.getLogger(BsUserSpreadController.class); @Resource private BsUserSpreadOilChannelService userSpreadOilChannelService; + @Resource + private BsUserSpreadRelService userSpreadRelService; @RequestMapping(value = "/editOilChannel", method = RequestMethod.POST) @ResponseBody @@ -47,7 +52,6 @@ public class BsUserSpreadController { || body.getInteger("channel") == null || body.getBigDecimal("rebate") == null || body.getBigDecimal("rebateOne") == null - || body.getBigDecimal("rebateTwo") == null ) { throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); } @@ -59,7 +63,7 @@ public class BsUserSpreadController { } channel.setRebate(body.getBigDecimal("rebate")); channel.setRebateOne(body.getBigDecimal("rebateOne")); - channel.setRebateTwo(body.getBigDecimal("rebateTwo")); + channel.setRebateTwo(body.getBigDecimal("rebateTwo")!=null?body.getBigDecimal("rebateTwo"):new BigDecimal("0")); userSpreadOilChannelService.editData(channel); return ResponseMsgUtil.success("操作成功"); @@ -82,6 +86,24 @@ public class BsUserSpreadController { } } + @RequestMapping(value = "/getUserSpreadList", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询推广用户列表") + public ResponseData getUserSpreadList(@RequestParam(value = "phone", required = false) String phone, + @RequestParam(value = "pageNum", required = true) Integer pageNum, + @RequestParam(value = "pageSize", required = true) Integer pageSize) { + try { + Map param = new HashMap<>(); + param.put("phone", phone); + + PageHelper.startPage(pageNum,pageSize); + return ResponseMsgUtil.success(new PageInfo<>(userSpreadRelService.getUserSpreadList(param))); + + } catch (Exception e) { + return ResponseMsgUtil.exception(e); + } + } + @RequestMapping(value = "/getOilChannelList", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询油站渠道列表") diff --git a/service/src/main/java/com/hfkj/dao/BsUserSpreadRelMapperExt.java b/service/src/main/java/com/hfkj/dao/BsUserSpreadRelMapperExt.java index acf0e09..2e80efc 100644 --- a/service/src/main/java/com/hfkj/dao/BsUserSpreadRelMapperExt.java +++ b/service/src/main/java/com/hfkj/dao/BsUserSpreadRelMapperExt.java @@ -26,4 +26,20 @@ public interface BsUserSpreadRelMapperExt { " ORDER BY a.create_time desc" + "") List> getTeamList(@Param("param") Map param); + @Select("") + List> getUserSpreadList(@Param("param") Map param); } diff --git a/service/src/main/java/com/hfkj/service/spread/BsUserSpreadRelService.java b/service/src/main/java/com/hfkj/service/spread/BsUserSpreadRelService.java index dd1832d..c598ae6 100644 --- a/service/src/main/java/com/hfkj/service/spread/BsUserSpreadRelService.java +++ b/service/src/main/java/com/hfkj/service/spread/BsUserSpreadRelService.java @@ -32,4 +32,11 @@ public interface BsUserSpreadRelService { * @return */ List> getTeamList(Map param); + + /** + * 查询推广用户列表 + * @param param + * @return + */ + List> getUserSpreadList(Map param); } diff --git a/service/src/main/java/com/hfkj/service/spread/impl/BsUserSpreadRelServiceImpl.java b/service/src/main/java/com/hfkj/service/spread/impl/BsUserSpreadRelServiceImpl.java index 90e69b9..e3fa05f 100644 --- a/service/src/main/java/com/hfkj/service/spread/impl/BsUserSpreadRelServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/spread/impl/BsUserSpreadRelServiceImpl.java @@ -49,4 +49,9 @@ public class BsUserSpreadRelServiceImpl implements BsUserSpreadRelService { public List> getTeamList(Map param) { return userSpreadRelMapper.getTeamList(param); } + + @Override + public List> getUserSpreadList(Map param) { + return userSpreadRelMapper.getUserSpreadList(param); + } }