From 84a7a33c02e922211f7edd80f17c4c814e76c2f5 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 31 Dec 2023 21:35:07 +0800 Subject: [PATCH] fix --- .../controller/mem/WxCUserController.java | 81 ---------- .../com/iformall/service/WxCUserService.java | 139 ------------------ .../service/impl/WxScoreRulesServiceImpl.java | 3 - 3 files changed, 223 deletions(-) delete mode 100644 yqzjAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java delete mode 100644 yqzjService/src/main/java/com/iformall/service/WxCUserService.java diff --git a/yqzjAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java b/yqzjAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java deleted file mode 100644 index 92bb50b..0000000 --- a/yqzjAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.iformall.controller.mem; - -import com.iformall.annotation.SystemControllerLog; -import com.iformall.controller.base.BaseController; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import com.github.pagehelper.PageInfo; -import com.iformall.common.Result; -import com.iformall.common.ResultData; - -import com.iformall.domain.po.WxCUser; -import com.iformall.service.WxCUserService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxCUser") -public class WxCUserController extends BaseController { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private WxCUserService wxCUserService; - - @ApiOperation("分页列表接口") - @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "用户管理-列表") - public ResultData list(@ModelAttribute WxCUser wxCUser, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxCUserController::list"); - if (null == wxCUser) wxCUser = new WxCUser(); - final PageInfo page = wxCUserService.listAsPage(wxCUser, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - @SystemControllerLog(description = "用户管理-新增") - public ResultData add(@RequestBody WxCUser wxCUser) { - logger.debug("[" + getIpAddr() + "] WxCUserController::add"); - //Assert.notNull(wxCUser.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCUserService.saveOrUpdate(wxCUser); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - @SystemControllerLog(description = "用户管理-更新") - public ResultData update(@RequestBody WxCUser wxCUser) { - logger.debug("[" + getIpAddr() + "] WxCUserController::update"); - wxCUserService.saveOrUpdate(wxCUser); - return new ResultData(); - } - -// @ApiOperation("根据id删除接口") -// @GetMapping("/del") -// @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) -// @SystemControllerLog(description = "用户管理-删除") -// public ResultData delete(Long id) { -// logger.debug("[" + getIpAddr() + "] WxCUserController::delete"); -// wxCUserService.deleteById(id); -// return new ResultData(Result.SUCCESS, "删除成功", null); -// } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "用户管理-查询") - public ResultData findById(Long id) { - logger.debug("[" + getIpAddr() + "] WxCUserController::findById"); - return new ResultData(Result.SUCCESS, "查询成功", wxCUserService.getById(id,getTenantInfo().getTenantId())); - } - - -} diff --git a/yqzjService/src/main/java/com/iformall/service/WxCUserService.java b/yqzjService/src/main/java/com/iformall/service/WxCUserService.java deleted file mode 100644 index 94e22ba..0000000 --- a/yqzjService/src/main/java/com/iformall/service/WxCUserService.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.iformall.service; - -import com.github.pagehelper.PageInfo; -import com.iformall.domain.dto.WxCUserBasicInfoDto; -import com.iformall.domain.po.WxAuthorizerInfo; -import com.iformall.domain.po.WxCUser; -import com.iformall.domain.po.WxCUserFrom; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.vo.UserCountVo; -import com.iformall.enums.EnumScoreType; -import me.chanjar.weixin.mp.bean.result.WxMpUser; - -import java.util.List; - -public interface WxCUserService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param pageIndex - * @param pageSize - * @return - */ - PageInfo listAsPage(WxCUser record, Integer pageIndex, Integer pageSize); - - PageInfo listOpenIdAsPage(WxCUser record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxCUser getById(Long id,String tenantId); - - /** - * 根据openId获得实体 - * - * @param record - * @return - */ - WxCUser getByOpenId(WxCUser record); - - /** - * 根据object获得实体 - * - * @param record - * @return - */ - WxCUser getByObject(WxCUser record); - - /** - * 保存或更新实体 - * - * @param record - */ - int saveOrUpdate(WxCUser record); - - /** - * 保存或更新实体 - * - * @param mpUser - * @param authorizerInfo - */ - int saveOrUpdateMpUser(WxMpUser mpUser, WxAuthorizerInfo authorizerInfo); - - /** - * updateScene - * - * @param record - */ - int updateScene(WxCUser record); - - /** - * updateLBS - * - * @param record - */ - int updateLBS(WxCUser record); - - /** - * updateExtInfo - * - * @param record - */ - int updateExtInfo(WxCUser record); - - /** - * 根据Id删除实体 - * - * @param id - */ - //void deleteById(Long id,String tenantId); - - /** - * 统计数量 - * @param dto - * @return - */ - long findCount(WxCUserBasicInfoDto dto); - - /** - * 统计数量 - * @param dto - * @return - */ - List findCountHistory(WxCUserBasicInfoDto dto); - - - /** - * 通过渠道获取会员信息 - * @param user - * @param pageIndex - * @param pageSize - * @return - */ - PageInfo listByChannel(WxCUser user, Integer pageIndex, Integer pageSize); - - long countByChannel(WxCUser user); - - /** - * 登录后发消息 - */ - void actionMsgAfterLogin(WxCUserFrom wxCUserFrom); - - /** - * 登录后处理 - * @param user - * @return - */ - int actionAfterLogin(WxCUser user); - - void updateUserId(WxCUser user); - - void delForUserIdOnly(Long id, Long userId, String tenantId); - - void updateMsgCount(WxCUser user); -} diff --git a/yqzjService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/yqzjService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index 37e97fe..5c3d2e2 100644 --- a/yqzjService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/yqzjService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -9,7 +9,6 @@ import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; -import com.iformall.service.WxCUserService; import com.iformall.service.WxScoreRulesService; import com.iformall.utils.Constant; import org.apache.commons.lang3.StringUtils; @@ -35,8 +34,6 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { WxCUserBasicInfoMapper wxCUserBasicInfoMapper; @Autowired WxCUserMapper wxCUserMapper; - @Autowired - WxCUserService wxCUserService; @Autowired @Qualifier("scoreRuleRedisTemplate")