From eed7a51f3a77d3daa2e6237369845eb5404bffc9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 26 Sep 2019 15:39:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86=E5=BC=80=E5=85=B3][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][B=E7=AB=AF=E8=AE=BF=E9=97=AE=E6=97=B6?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=A7=AF=E5=88=86=E5=BC=80=E5=85=B3=E7=8A=B6?= =?UTF-8?q?=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/WxMerchantController.java | 14 -------------- .../controller/WxMerchantBUserController.java | 10 +++++++++- .../service/impl/WxScoreRulesServiceImpl.java | 2 +- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 6d6e54c1d..9e0442cf7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -9,10 +9,8 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiver; -import com.iformall.domain.po.WxScoreRules; import com.iformall.domain.vo.WxMerchantTradeVo; import com.iformall.domain.vo.WxMerchantVo; -import com.iformall.enums.EnumCreditLockedStatus; import com.iformall.service.QrCodeService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxScoreRulesService; @@ -106,12 +104,6 @@ public class WxMerchantController extends BaseController { public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] WxMerchantController::findById"); WxMerchant wxMerchant = wxMerchantService.getById(id); - if (wxMerchant.getCreditLocked() != null) { - WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(getTenantId()); - if (scoreRules != null && scoreRules.getCreditLocked().equals(EnumCreditLockedStatus.CLOSE.getCode())) { - wxMerchant.setCreditLocked(EnumCreditLockedStatus.CLOSE.getCode()); - } - } return new ResultData(wxMerchant); } @@ -201,12 +193,6 @@ public class WxMerchantController extends BaseController { public ResultData updateMerchantLevel(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantLevel"); wxMerchant.setTenantId(getTenantId()); - if (wxMerchant.getCreditLocked() != null) { - WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(getTenantId()); - if (scoreRules != null && scoreRules.getCreditLocked().equals(EnumCreditLockedStatus.CLOSE.getCode())) { - wxMerchant.setCreditLocked(EnumCreditLockedStatus.CLOSE.getCode()); - } - } return wxMerchantService.updateMerchantLevel(wxMerchant); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index b2d97c443..20daa1fde 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -7,6 +7,8 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantBUser; +import com.iformall.domain.po.WxScoreRules; +import com.iformall.enums.EnumCreditLockedStatus; import com.iformall.enums.EnumMerchantBUserStatus; import com.iformall.enums.EnumMerchantStatus; import com.iformall.service.*; @@ -50,6 +52,8 @@ public class WxMerchantBUserController extends BaseController { @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Autowired + private WxScoreRulesService wxScoreRulesService; @ApiOperation("查寻当bUser详情接口") @GetMapping("/detail") @@ -72,6 +76,11 @@ public class WxMerchantBUserController extends BaseController { return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); } + resultMap.put("creditLocked", merchant.getCreditLocked()); + WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(user.getTenantId()); + if (scoreRules.getCreditLocked().equals(EnumCreditLockedStatus.CLOSE.getCode())) { + resultMap.put("creditLocked", EnumCreditLockedStatus.CLOSE.getCode()); + } resultMap.put("phone", user.getPhone()); resultMap.put("name", user.getName()); resultMap.put("merchant_name", merchant.getName()); @@ -81,7 +90,6 @@ public class WxMerchantBUserController extends BaseController { resultMap.put("tenant_id",merchant.getTenantId()); resultMap.put("merchant_id",merchant.getId()); resultMap.put("is_admin",merchant.getIsAdmin()); - resultMap.put("creditLocked", merchant.getCreditLocked()); resultMap.put("businessId", merchant.getBusinessId()); String mid = null; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index 5055d003d..b04daf8fe 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -190,7 +190,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { } //更新商户数据 - updateMerchantCreditLocked(record); + //updateMerchantCreditLocked(record); } @Override