提交代码

dev
胡锐 2 days ago
parent 6bed23ba57
commit 14fb9f8d58
  1. 26
      bweb/src/main/java/com/bweb/controller/BsUserSpreadController.java
  2. 16
      service/src/main/java/com/hfkj/dao/BsUserSpreadRelMapperExt.java
  3. 7
      service/src/main/java/com/hfkj/service/spread/BsUserSpreadRelService.java
  4. 5
      service/src/main/java/com/hfkj/service/spread/impl/BsUserSpreadRelServiceImpl.java

@ -10,10 +10,12 @@ import com.hfkj.common.security.UserCenter;
import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.BsUserSpreadOilChannel; import com.hfkj.entity.BsUserSpreadOilChannel;
import com.hfkj.entity.BsUserSpreadPower; import com.hfkj.entity.BsUserSpreadPower;
import com.hfkj.entity.BsUserSpreadRel;
import com.hfkj.model.ResponseData; import com.hfkj.model.ResponseData;
import com.hfkj.model.UserSessionObject; import com.hfkj.model.UserSessionObject;
import com.hfkj.service.spread.BsUserSpreadOilChannelService; import com.hfkj.service.spread.BsUserSpreadOilChannelService;
import com.hfkj.service.spread.BsUserSpreadPowerService; import com.hfkj.service.spread.BsUserSpreadPowerService;
import com.hfkj.service.spread.BsUserSpreadRelService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -22,6 +24,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -37,6 +40,8 @@ public class BsUserSpreadController {
private static Logger log = LoggerFactory.getLogger(BsUserSpreadController.class); private static Logger log = LoggerFactory.getLogger(BsUserSpreadController.class);
@Resource @Resource
private BsUserSpreadOilChannelService userSpreadOilChannelService; private BsUserSpreadOilChannelService userSpreadOilChannelService;
@Resource
private BsUserSpreadRelService userSpreadRelService;
@RequestMapping(value = "/editOilChannel", method = RequestMethod.POST) @RequestMapping(value = "/editOilChannel", method = RequestMethod.POST)
@ResponseBody @ResponseBody
@ -47,7 +52,6 @@ public class BsUserSpreadController {
|| body.getInteger("channel") == null || body.getInteger("channel") == null
|| body.getBigDecimal("rebate") == null || body.getBigDecimal("rebate") == null
|| body.getBigDecimal("rebateOne") == null || body.getBigDecimal("rebateOne") == null
|| body.getBigDecimal("rebateTwo") == null
) { ) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
} }
@ -59,7 +63,7 @@ public class BsUserSpreadController {
} }
channel.setRebate(body.getBigDecimal("rebate")); channel.setRebate(body.getBigDecimal("rebate"));
channel.setRebateOne(body.getBigDecimal("rebateOne")); 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); userSpreadOilChannelService.editData(channel);
return ResponseMsgUtil.success("操作成功"); 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<String,Object> 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) @RequestMapping(value = "/getOilChannelList", method = RequestMethod.GET)
@ResponseBody @ResponseBody
@ApiOperation(value = "查询油站渠道列表") @ApiOperation(value = "查询油站渠道列表")

@ -26,4 +26,20 @@ public interface BsUserSpreadRelMapperExt {
" ORDER BY a.create_time desc" + " ORDER BY a.create_time desc" +
"</script>") "</script>")
List<HashMap<String,Object>> getTeamList(@Param("param") Map<String,Object> param); List<HashMap<String,Object>> getTeamList(@Param("param") Map<String,Object> param);
@Select("<script>" +
" select " +
" b.id userId," +
" b.user_name userName," +
" b.phone," +
" b.create_time createTime," +
" count(c.id) spreadCount" +
" from bs_user_spread_power a" +
" LEFT JOIN bs_user b on b.id = a.user_id" +
" LEFT JOIN bs_user_spread_rel c on c.parent_user_id = b.id" +
" where 1 = 1" +
" <if test='param.phone != null'> and b.phone like concat('%',#{param.phone},'%') </if>" +
" GROUP BY b.id" +
" ORDER BY b.create_time desc" +
"</script>")
List<HashMap<String,Object>> getUserSpreadList(@Param("param") Map<String,Object> param);
} }

@ -32,4 +32,11 @@ public interface BsUserSpreadRelService {
* @return * @return
*/ */
List<HashMap<String,Object>> getTeamList(Map<String,Object> param); List<HashMap<String,Object>> getTeamList(Map<String,Object> param);
/**
* 查询推广用户列表
* @param param
* @return
*/
List<HashMap<String,Object>> getUserSpreadList(Map<String,Object> param);
} }

@ -49,4 +49,9 @@ public class BsUserSpreadRelServiceImpl implements BsUserSpreadRelService {
public List<HashMap<String,Object>> getTeamList(Map<String, Object> param) { public List<HashMap<String,Object>> getTeamList(Map<String, Object> param) {
return userSpreadRelMapper.getTeamList(param); return userSpreadRelMapper.getTeamList(param);
} }
@Override
public List<HashMap<String, Object>> getUserSpreadList(Map<String, Object> param) {
return userSpreadRelMapper.getUserSpreadList(param);
}
} }

Loading…
Cancel
Save