From d86cd5e16b00f47ad54de1c2f80e93398987d5a1 Mon Sep 17 00:00:00 2001 From: hanxueda Date: Wed, 17 Apr 2019 17:47:20 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxUserGrantController.java | 12 ++++++++---- .../com/iformall/service/WxCreditHistoryService.java | 3 +-- .../service/impl/WxCreditHistoryServiceImpl.java | 6 ++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 8861a3ee0..c664e6373 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -240,7 +240,9 @@ public class WxUserGrantController extends BaseController { } // 积分 try { - credit = addCredit(user1,EnumScoreType.LOGIN).getCreditNum(); + WxCreditHistory wxCreditHistory = addCredit(user1,EnumScoreType.LOGIN); + credit = wxCreditHistory.getCreditNum(); + logger.info("user_id:" + user1.getId() + " 登录新增积分:" + credit); } catch (MallinkException e) { logger.error("c_user 积分 " + e.getMessage()); } catch (Exception e) { @@ -283,7 +285,9 @@ public class WxUserGrantController extends BaseController { // 积分 try { - credit = addCredit(user,EnumScoreType.LOGIN).getCreditNum(); + WxCreditHistory wxCreditHistory = addCredit(user,EnumScoreType.LOGIN); + credit = wxCreditHistory.getCreditNum(); + logger.info("user_id:" + user.getId() + " 登录新增积分:" + credit); } catch (MallinkException e) { logger.error("c_user 积分 " + e.getMessage()); } catch (Exception e) { @@ -697,8 +701,8 @@ public class WxUserGrantController extends BaseController { wxCreditHistory.setCreditType(enumScoreType.getCode()); wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); wxCreditHistory.setOperatorId(wxCUser.getId()); - ResultData resultData = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); - return (WxCreditHistory) resultData.data; + WxCreditHistory record = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); + return record; } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java b/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java index 2416e2a93..70d897dc7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java @@ -1,7 +1,6 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; -import com.iformall.common.ResultData; import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.vo.WxCreditHistoryVo; @@ -42,7 +41,7 @@ public interface WxCreditHistoryService { * * @param record */ - ResultData saveOrUpdate(WxCreditHistory record); + WxCreditHistory saveOrUpdate(WxCreditHistory record); /** * 根据Id删除实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 0b649cdca..5c46efa5c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -8,8 +8,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; -import com.iformall.common.Result; -import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCreditHistoryVo; import com.iformall.enums.EnumBusiness; @@ -142,7 +140,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) - public ResultData saveOrUpdate(WxCreditHistory record) { + public WxCreditHistory saveOrUpdate(WxCreditHistory record) { WxCUser wxCUser = wxCUserMapper.selectByPrimaryKey(record.getCUserId()); WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(record.getCUserId()); if (wxCUser == null && wxCUserBasicInfo == null) { @@ -190,7 +188,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { //wxCreditHistoryMapper.updateByPrimaryKeySelective(record); } } - return new ResultData(Result.SUCCESS,"积分操作成功",record); + return record; } @Override