From 8f86884580c4fe766f1162bffe58d9c545a81499 Mon Sep 17 00:00:00 2001 From: Burce Date: Tue, 17 Sep 2019 14:18:26 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=E7=A7=AF=E5=88=86=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mem/WxCreditHistoryController.java | 1 + .../iformall/controller/WxCUserController.java | 1 + .../controller/WxCreditHistoryController.java | 13 +++++++++++-- .../controller/WxCreditHistoryController.java | 15 --------------- .../iformall/service/WxCreditHistoryService.java | 7 ++++--- .../service/impl/WxCreditHistoryServiceImpl.java | 10 +++++----- 6 files changed, 22 insertions(+), 25 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index 2dd8d0bea..102c8cf90 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -78,6 +78,7 @@ public class WxCreditHistoryController extends BaseController { wxCreditHistory.setTenantId(user.getTenantId()); wxCreditHistory.setOperatorId(user.getId()); try { + wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId()) ; WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); return new ResultData(Result.SUCCESS, "操作成功", credit); } catch (MallinkException e) { diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index 4453fdd5c..28d2415da 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -92,6 +92,7 @@ public class WxCUserController extends BaseController { wxCUser.setOpenId(wxCUserFromBDto.getOpenid()); wxCUser = wxCUserService.getByOpenId(wxCUser); if (wxCUserFromB == null) { + //TODO phone可能为空 String phone = wxCUser.getPhone(); String tenantId = wxCUser.getTenantId(); //查询会员信息 diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 65a31ed19..d8bebe92d 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -15,6 +15,7 @@ import com.iformall.exception.MallinkException; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCreditHistoryService; import com.iformall.service.WxMerchantService; +import com.iformall.utils.UserUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -25,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; import java.util.Objects; @RestController @@ -61,7 +63,14 @@ public class WxCreditHistoryController extends BaseController { if(Objects.isNull(merchantId)|| StringUtils.isEmpty(spendStr)||Objects.isNull(userId)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL) ; } - return new ResultData(wxCreditHistoryService.findByMerchantIdAndSpend(merchantId,spendStr,userId,getTenantId())); + try { + Map result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId, getTenantId()); + return new ResultData(result); + } catch (MallinkException e) { + return new ResultData(e.getErrorCode(), e.getMessage()); + } catch (Exception e) { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR, e.getMessage()); + } } @ApiOperation("根据手机号查询接口") @@ -104,7 +113,7 @@ public class WxCreditHistoryController extends BaseController { //B端操作用户 wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); try { - wxCreditHistoryService.check(wxCreditHistory.getCUserId()); + wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId()); WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); return new ResultData(Result.SUCCESS, "操作成功", credit); } catch (MallinkException e) { diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 2a2b2fdb4..89f3a1db6 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -25,21 +25,6 @@ public class WxCreditHistoryController extends BaseController{ @Autowired private WxCreditHistoryService wxCreditHistoryService; - @ApiOperation("新增接口") - @PostMapping("/add") - public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) { - log.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); - wxCreditHistory.setTenantId(getTenantId()); - wxCreditHistory.setOperatorId(getUser().getId()); - try { - WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); - return new ResultData(Result.SUCCESS, "操作成功", credit); - } catch (MallinkException e) { - log.error(e.getMessage()); - return new ResultData(e.getErrorCode(), e.getMessage()); - } - } - @ApiOperation("用户积分列表") @GetMapping("list") @ApiImplicitParams({ diff --git a/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java b/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java index f44542b87..7b4a32093 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java @@ -40,11 +40,12 @@ public interface WxCreditHistoryService { WxCreditHistory getById(Long id); /** - * 校验用户是否存在 + * 添加积分时,需要校验用户以及手机号是否存在 + * 规则:有手机号增加积分,无手机号提示授权手机号 * @param cUserId */ - void check(Long cUserId) ; - + void creditUsercheck(Long cUserId); + /** * 保存或更新实体 * 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 5c3ead4fd..78873ac5a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -19,6 +19,7 @@ import com.iformall.service.WxCreditHistoryService; import com.iformall.service.WxScoreRulesService; import com.iformall.utils.CreditUtil; import com.iformall.utils.RedisLock; +import com.iformall.utils.UserUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -195,11 +196,10 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { } @Override - public void check(Long cUserId) { + public void creditUsercheck(Long cUserId) { + WxCUser wxCUser = wxCUserMapper.selectByPrimaryKey(cUserId); WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(cUserId); - if (wxCUserBasicInfo == null) { - throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE); - } + UserUtil.creditUsercheck(wxCUser, wxCUserBasicInfo); } @Override @@ -352,7 +352,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { if (Objects.nonNull(userId)) { WxCUser wxCUser = wxCUserMapper.selectByPrimaryKey(userId); WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(userId); - Integer birthdayScale = wxLevelConfigMapper.getScale(wxCUser.getTenantId(), wxCUser.getScore()); + Integer birthdayScale = (wxCUser == null ? null : wxLevelConfigMapper.getScale(tenantId, wxCUser.getScore())); creditNew = CreditUtil.calUserCredit(credit, wxCUser, birthdayScale, wxCUserBasicInfo, wxScoreRulesService); } else { creditNew = credit;