From c96b2b55023a1457e037cc3e43cb3a71ee53bb99 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sat, 25 Aug 2018 12:36:11 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E7=A7=AF=E5=88=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E6=B7=BB=E5=8A=A0=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=88=96=E8=80=85=E6=B6=88=E8=B4=B9=E5=A2=9E=E9=95=BF=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=BF=94=E5=9B=9E=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E7=AD=89=E7=BA=A7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCampaignController.java | 1 + .../simple/mapper/WxCUserBasicInfoMapper.java | 2 + .../simple/mapper/WxLevelConfigMapper.java | 2 + .../service/WxCUserBasicInfoService.java | 10 ++++ .../simple/service/WxLevelConfigService.java | 7 +++ .../simple/service/WxScoreRulesService.java | 9 +++ .../impl/WxCUserBasicInfoServiceImpl.java | 7 ++- .../impl/WxLevelConfigServiceImpl.java | 15 +++-- .../service/impl/WxScoreRulesServiceImpl.java | 55 ++++++++++++++++--- .../mapper/WxCUserBasicInfoMapper.xml | 6 ++ .../resources/mapper/WxLevelConfigMapper.xml | 5 +- 11 files changed, 101 insertions(+), 18 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java index 20352f96b..e3430b4bb 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java @@ -60,6 +60,7 @@ public class WxCampaignController extends BaseController String[] arys = wxCampaign.getCouponIds().split(","); wxCampaign.setCouponIds(JSON.toJSONString(arys)); } + wxCampaign.setStatus(0); wxCampaign.setTenantId(getTenantId()); // wxCampaign.setSortNum(sortNum+1); wxCampaignService.saveOrUpdate(wxCampaign); diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java index 58022d24d..93a40272a 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java @@ -14,6 +14,8 @@ public interface WxCUserBasicInfoMapper extends CommonMapper list(WxCuerBasicInfoDto record); + + void updateScore(WxCUserBasicInfo record); } diff --git a/mallinkService/src/main/java/com/simple/mapper/WxLevelConfigMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxLevelConfigMapper.java index 2d8516cf3..90a6f0acb 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxLevelConfigMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxLevelConfigMapper.java @@ -11,6 +11,8 @@ public interface WxLevelConfigMapper extends CommonMapper { void deleteAll(); + + String getLevel(@Param("tenantId")String tenantId,@Param("poins")Integer poins); diff --git a/mallinkService/src/main/java/com/simple/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/simple/service/WxCUserBasicInfoService.java index 3470f8799..cb46a7144 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCUserBasicInfoService.java @@ -41,6 +41,16 @@ public interface WxCUserBasicInfoService { PageInfo list(WxCuerBasicInfoDto record, Integer pageIndex, Integer pageSize); + + /** + * 修改会员积分 + * @param record + */ + void updateScore(WxCUserBasicInfo record); + + + + diff --git a/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java b/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java index 0bf3b162e..5cee0ba5c 100644 --- a/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java +++ b/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java @@ -39,6 +39,13 @@ public interface WxLevelConfigService { void deleteAll(); + /** + * 根据积分获取会员等级 + * @param tenantId + * @param score + * @return + */ + String getLevel(String tenantId,int score); diff --git a/mallinkService/src/main/java/com/simple/service/WxScoreRulesService.java b/mallinkService/src/main/java/com/simple/service/WxScoreRulesService.java index 38338cb6b..66251b8b2 100644 --- a/mallinkService/src/main/java/com/simple/service/WxScoreRulesService.java +++ b/mallinkService/src/main/java/com/simple/service/WxScoreRulesService.java @@ -37,6 +37,15 @@ public interface WxScoreRulesService { * @param id */ void deleteById(Long id); + /** + * 登录或消费 调用增长积分 + * @param tenantId + * @param type 1:登录 2:消费 + * @param cUserId + * @return 新增的积分值 + */ + int addScoreByType(String tenantId,int type,Long cUserId); + diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java index de5fe9a9d..37e221b2c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java @@ -30,9 +30,14 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserBasicInfoMapper.list(record)); } + @Override + public void updateScore(WxCUserBasicInfo record) { + wxCUserBasicInfoMapper.updateScore(record); + + } - @Override + @Override public WxCUserBasicInfo getById(Long id) { return wxCUserBasicInfoMapper.selectByPrimaryKey(id); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java index eadcc89e5..52524ddbe 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java @@ -49,12 +49,11 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { wxLevelConfigMapper.deleteAll(); } - - - - - - - - + + @Override + public String getLevel(String tenantId, int score) { + return wxLevelConfigMapper.getLevel(tenantId,score); + } + + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java index e7f57d766..c5e12301c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java @@ -3,8 +3,12 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxCUser; +import com.simple.domain.po.WxCUserBasicInfo; import com.simple.domain.po.WxScoreRules; import com.simple.mapper.WxScoreRulesMapper; +import com.simple.service.WxCUserBasicInfoService; +import com.simple.service.WxCUserService; import com.simple.service.WxScoreRulesService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,6 +19,10 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { @Autowired WxScoreRulesMapper wxScoreRulesMapper; + @Autowired + WxCUserService wxCUserService; + @Autowired + WxCUserBasicInfoService wxCUserBasicInfoService; @Override @@ -43,12 +51,43 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { public void deleteById(Long id) { wxScoreRulesMapper.deleteByPrimaryKey(id); } - - - - - - - - + + @Override + public int addScoreByType(String tenantId, int type, Long cUserId) { + int addScoreNumber=0; + WxScoreRules scoreRules = new WxScoreRules(); + scoreRules.setTenantId(tenantId); + List list = wxScoreRulesMapper.findList(scoreRules); + if(list.isEmpty()){ + return addScoreNumber; + } + scoreRules = list.get(0); + + if(type==1){ + //login处理 + addScoreNumber = scoreRules.getLoginScoreNumber(); + } + if(type==2){ + //消费 + addScoreNumber = scoreRules.getConsumptionScoreNumber(); + } + WxCUser wxCUser = wxCUserService.getById(cUserId); + wxCUser.setScore(wxCUser.getScore()+addScoreNumber); + wxCUserService.saveOrUpdate(wxCUser); + + + //修改basic表积分 + if(wxCUser.getPhone()!=null){ + //修改basic表积分 + WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); + wxCUserBasicInfo.setTenantId(tenantId); + wxCUserBasicInfo.setPhone(wxCUser.getPhone()); + wxCUserBasicInfo.setPoins(wxCUser.getScore()); + wxCUserBasicInfo.setCUserId(wxCUser.getId()); + wxCUserBasicInfoService.updateScore(wxCUserBasicInfo); + } + return addScoreNumber; + } + + } diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 850d3fb0b..d26af8a36 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -132,6 +132,12 @@ + + update wx_c_user_basic_info set poins=#{poins} where phone=#{phone} and tenant_id=#{tenantId} + and c_user_id=#{cUserId} + + + diff --git a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml index e7fdb3570..c27ff7326 100644 --- a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml @@ -63,7 +63,10 @@ delete from wx_level_config; - + +