From 7c15680fbc5330157c37d24527457a45ab6c1b75 Mon Sep 17 00:00:00 2001 From: hanxueda Date: Mon, 8 Apr 2019 16:17:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E5=95=86?= =?UTF-8?q?=E6=88=B7ID=E5=92=8C=E6=B6=88=E8=B4=B9=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=80=E5=A2=9E=E5=8A=A0=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCreditHistoryController.java | 20 +++++++++++++++-- .../service/WxCreditHistoryService.java | 9 +++----- .../impl/WxCreditHistoryServiceImpl.java | 22 ++++++++++++++++++- 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCreditHistoryController.java index fbab0538e..07dd7f9d1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -1,5 +1,6 @@ package com.iformall.controller; +import com.iformall.common.ErrorCode; import com.iformall.domain.dto.WxCreditHistoryDto; import com.iformall.domain.vo.WxCreditHistoryVo; import org.slf4j.LoggerFactory; @@ -37,14 +38,26 @@ public class WxCreditHistoryController extends BaseController @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { - if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); + logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); + if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); final PageInfo page = wxCreditHistoryService.listAsPageMore(wxCreditHistory, pageNum, pageSize); return new ResultData(page); } + @ApiOperation("根据商户ID和消费金额获取所增加积分 取data里credit的值") + @GetMapping("findByMerchantIdAndSpend") + @ApiImplicitParams({ + @ApiImplicitParam(name="merchantId",value="商户ID",dataType="long", paramType = "query",required=true), + @ApiImplicitParam(name="spend",value="消费金额",dataType="int", paramType = "query",required=true)}) + public ResultData findByMerchantIdAndSpend(@RequestParam Long merchantId, @RequestParam Integer spend) { + logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::findByMerchantIdAndSpend"); + return new ResultData(wxCreditHistoryService.findByMerchantIdAndSpend(merchantId,spend,getTenantId())); + } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) { + logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); wxCreditHistory.setTenantId(getTenantId()); wxCreditHistoryService.saveOrUpdate(wxCreditHistory); return new ResultData(); @@ -53,6 +66,7 @@ public class WxCreditHistoryController extends BaseController @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCreditHistory wxCreditHistory) { + logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::update"); wxCreditHistoryService.saveOrUpdate(wxCreditHistory); return new ResultData(); } @@ -61,6 +75,7 @@ public class WxCreditHistoryController extends BaseController @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::delete"); wxCreditHistoryService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -69,7 +84,8 @@ public class WxCreditHistoryController extends BaseController @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCreditHistoryService.getById(id)); + logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::findById"); + return new ResultData(Result.SUCCESS,"查询成功",wxCreditHistoryService.getById(id)); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java b/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java index 7816fdf3c..5e082e374 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java @@ -6,6 +6,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.dto.WxCreditHistoryDto; import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.vo.WxCreditHistoryVo; +import org.springframework.web.bind.annotation.RequestParam; public interface WxCreditHistoryService { @@ -50,12 +51,8 @@ public interface WxCreditHistoryService { * @param id */ void deleteById(Long id); + + Map findByMerchantIdAndSpend(Long merchantId, Integer spend, String tenantId); - - - - - - } 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 60397caea..3146d7211 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; @@ -46,6 +47,9 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { @Autowired WxScoreRulesService wxScoreRulesService; + @Autowired + WxMerchantMapper wxMerchantMapper; + @Override public PageInfo listAsPage(WxCreditHistory record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCreditHistoryMapper.findList(record)); @@ -164,6 +168,22 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { wxCreditHistoryMapper.deleteByPrimaryKey(id); } + @Override + public Map findByMerchantIdAndSpend(Long merchantId, Integer spend ,String tenantId) { + WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(merchantId); + Map creditMap = Maps.newHashMap(); + if (wxMerchant != null && wxMerchant.getBusinessId() != null) { + WxCreditHistory wxCreditHistory = new WxCreditHistory(); + wxCreditHistory.setBusinessId(Long.valueOf(wxMerchant.getBusinessId())); + wxCreditHistory.setTenantId(tenantId); + wxCreditHistory.setSpend(spend); + int credit = payAddCredit(wxCreditHistory); + creditMap.put("credit",credit); + } + return creditMap; + } + + //根据积分类型计算"增加积分" private int creditIncrement(WxCreditHistory record) { if (record.getCreditType() == EnumScoreType.LOGIN.getCode()) { @@ -267,7 +287,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { private int payAddCredit(WxCreditHistory record) { int addCreditNumber = 0; // 订单金额为0时不计入 - if (record.getCreditNum() == 0) + if (record.getCreditNum() != null && record.getCreditNum() == 0) return 0; // 1. 获取score rules WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(record.getTenantId());