From 31a8093d47df37b8c17cc1aac4a945207a9b26a5 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 17 Mar 2021 19:53:56 +0800
Subject: [PATCH] 修改bug3
---
zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java | 10 +--
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java | 2
zq-erp/src/main/java/com/matrix/biz/service/impl/BizUserServiceImpl.java | 11 +--
zq-erp/src/main/java/com/matrix/biz/dao/BizUserDao.java | 16 +---
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopBizUserScoreAction.java | 64 ---------------------
zq-erp/src/main/java/com/matrix/biz/service/BizUserService.java | 20 ++----
6 files changed, 22 insertions(+), 101 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java b/zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java
index 8c94ca2..0fa5868 100644
--- a/zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java
+++ b/zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java
@@ -27,7 +27,7 @@
/**
* 主键
*/
- private String userId;
+ private Long userId;
/**
@@ -236,15 +236,13 @@
this.companyId = companyId;
}
- public void setToken(String token) {
- this.token=userId;
- }
- public String getUserId() {
+
+ public Long getUserId() {
return userId;
}
- public void setUserId(String userId) {
+ public void setUserId(Long userId) {
this.userId=userId;
}
diff --git a/zq-erp/src/main/java/com/matrix/biz/dao/BizUserDao.java b/zq-erp/src/main/java/com/matrix/biz/dao/BizUserDao.java
index b87fbc8..40eeda0 100644
--- a/zq-erp/src/main/java/com/matrix/biz/dao/BizUserDao.java
+++ b/zq-erp/src/main/java/com/matrix/biz/dao/BizUserDao.java
@@ -22,9 +22,9 @@
public int updateByModel(@Param("record") BizUser bizUser);
- public int deleteByIds(@Param("list") List<String> list);
+ public int deleteByIds(@Param("list") List<Long> list);
- public int deleteById(String userId);
+ public int deleteById(Long userId);
public int deleteByModel(@Param("record") BizUser bizUser);
@@ -34,18 +34,12 @@
public int selectTotalRecord(@Param("record") BizUser bizUser);
- public BizUser selectById(String userId);
+ public BizUser selectById(Long userId);
- public BizUser selectForUpdate(String userId);
+ public BizUser selectForUpdate(Long userId);
public BizUser findByOpenId(@Param("openId") String openId);
- /**
- * 批量设置销售员
- * @param list
- * @param status
- * @return
- */
- int updateSalesByIds(@Param("list") List<String> list, @Param("status") Integer status);
+
}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/biz/service/BizUserService.java b/zq-erp/src/main/java/com/matrix/biz/service/BizUserService.java
index 5f10819..7aa2b0f 100644
--- a/zq-erp/src/main/java/com/matrix/biz/service/BizUserService.java
+++ b/zq-erp/src/main/java/com/matrix/biz/service/BizUserService.java
@@ -2,7 +2,6 @@
import com.matrix.biz.bean.BizUser;
import com.matrix.core.pojo.PaginationVO;
-import com.matrix.core.web.BaseServices;
import java.util.List;
@@ -11,7 +10,7 @@
* @author jyy
* @date 2019-05-31 10:03
*/
-public interface BizUserService extends BaseServices<BizUser> {
+public interface BizUserService {
/**
* 新增
@@ -33,15 +32,12 @@
*/
public int modifyByModel(BizUser bizUser);
- /**
- * 批量删除
- */
- public int remove(List<String> list);
+
/**
* 根据id删除
*/
- public int removeById(String userId);
+ public int removeById(Long userId);
/**
* 根据对象删除
@@ -62,11 +58,8 @@
* 统计记录数
*/
public int findTotal(BizUser bizUser);
-
- /**
- * 根据id查询
- */
- public BizUser findById(String userId);
+
+ public int remove(List<Long> list);
/**
@@ -74,7 +67,8 @@
*/
public BizUser findByOpenId(String openId);
-
+
+ public BizUser findById(Long userId);
/**
* 保存用户信息
*/
diff --git a/zq-erp/src/main/java/com/matrix/biz/service/impl/BizUserServiceImpl.java b/zq-erp/src/main/java/com/matrix/biz/service/impl/BizUserServiceImpl.java
index b9333da..f2d62d6 100644
--- a/zq-erp/src/main/java/com/matrix/biz/service/impl/BizUserServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/biz/service/impl/BizUserServiceImpl.java
@@ -36,7 +36,6 @@
bizUser.setUserIsAuthorize(AppConstance.IS_NOT_AUTHORIZE);
bizUser.setCreateBy(AppConstance.USER_TYPE_ADMIN);
bizUser.setUpdateBy(AppConstance.USER_TYPE_ADMIN);
- bizUser.setUserId(UUIDUtil.getRandomID());
return bizUserDao.insert(bizUser);
}
@@ -90,14 +89,14 @@
@Override
- public int remove(List<String> list){
-
+ public int remove(List<Long> list){
+
return bizUserDao.deleteByIds(list);
-
+
}
@Override
- public int removeById(String userId){
+ public int removeById(Long userId){
return bizUserDao.deleteById(userId);
@@ -133,7 +132,7 @@
}
@Override
- public BizUser findById(String userId){
+ public BizUser findById(Long userId){
return bizUserDao.selectById(userId);
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopBizUserScoreAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopBizUserScoreAction.java
index 186022e..0c49bd4 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopBizUserScoreAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopBizUserScoreAction.java
@@ -42,73 +42,9 @@
public static final String BEV = "ShopBizUserScore_BEV";
- /**
- * 进入积分兑换界面
- */
- @SaveRequestToken
- @RequestMapping(value = "/intoExchangePage")
- public ModelAndView exchangeScore(String userId) {
- BizUser bizUser = new BizUser();
- ModelAndView modelAndView = new ModelAndView("admin/shop/user-score-exchange");
- if (StringUtils.isNotBlank(userId)) {
- bizUser = bizUserService.findById(userId);
- if (bizUser.getCurrentScore() == null) {
- bizUser.setCurrentScore(0);
- }
- }
- modelAndView.addObject("obj", bizUser);
- return modelAndView;
- }
- /**
- * 兑换积分
- */
- @Transactional(rollbackFor = Exception.class)
- @RemoveRequestToken
- @RequestMapping(value = "/exchangeScore")
- public @ResponseBody
- AjaxResult exchangeScore(ExchangeScorePOJO pojo) {
- //校验参数中用户ID和用户兑换积分是否有效
- if (pojo == null || StringUtils.isBlank(pojo.getUserId())
- || pojo.getScore() == null || pojo.getScore() == 0) {
- return new AjaxResult(AjaxResult.STATUS_FAIL, "提交参数有误！");
- }
- //兑换积分用户信息
- BizUser bizUser = bizUserService.findById(pojo.getUserId());
- if (bizUser == null) {
- return new AjaxResult(AjaxResult.STATUS_FAIL, "没有查询到相应用户！");
- }
- if (bizUser.getCurrentScore() == null) {
- bizUser.setCurrentScore(0);
- }
- //如果兑换积分大于用户当前积分
- if (pojo.getScore() > bizUser.getCurrentScore()) {
- return new AjaxResult(AjaxResult.STATUS_FAIL, "兑换积分大于用户当前积分！");
- }
- //剩余积分 = 当前积分 - 兑换积分
- Integer remainScore = bizUser.getCurrentScore() - pojo.getScore();
- //当前操作用户信息
- SysUsers loginUser = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- //修改用户剩余积分
- BizUser updateModel = new BizUser();
- updateModel.setUserId(bizUser.getUserId());
- updateModel.setCurrentScore(remainScore);
- updateModel.setUpdateBy(loginUser.getSuName());
- updateModel.setUpdateTime(new Date());
- bizUserService.modifyByModel(updateModel);
- //添加积分兑换记录
- ShopScoreExchange insertExchange = new ShopScoreExchange();
- insertExchange.setCreateBy(loginUser.getSuName());
- insertExchange.setUpdateBy(loginUser.getSuName());
- insertExchange.setUserId(bizUser.getOpenId());
- insertExchange.setExchangeScore(pojo.getScore());
- insertExchange.setOperateId(loginUser.getSuId());
- insertExchange.setRemark(pojo.getRemarks());
- shopScoreExchangeDao.insert(insertExchange);
- return new AjaxResult(AjaxResult.STATUS_SUCCESS, "兑换成功！");
- }
}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
index e2b5a92..7c17cf6 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
@@ -153,7 +153,7 @@
if (StringUtils.isBlank(invitationId)) {
return AjaxResult.buildFailInstance("请求参数错误");
}
- BizUser invitationUser = bizUserDao.selectById(invitationId);
+ BizUser invitationUser = bizUserDao.selectById(Long.parseLong(invitationId));
if (invitationUser==null) {
return AjaxResult.buildFailInstance("请求参数错误");
}
--
Gitblit v1.9.1