| @@ -9,10 +9,8 @@ import com.iformall.controller.base.BaseController; | |||||
| import com.iformall.domain.po.BaseEntity; | import com.iformall.domain.po.BaseEntity; | ||||
| import com.iformall.domain.po.WxMerchant; | import com.iformall.domain.po.WxMerchant; | ||||
| import com.iformall.domain.po.WxProfitSharingReceiver; | import com.iformall.domain.po.WxProfitSharingReceiver; | ||||
| import com.iformall.domain.po.WxScoreRules; | |||||
| import com.iformall.domain.vo.WxMerchantTradeVo; | import com.iformall.domain.vo.WxMerchantTradeVo; | ||||
| import com.iformall.domain.vo.WxMerchantVo; | import com.iformall.domain.vo.WxMerchantVo; | ||||
| import com.iformall.enums.EnumCreditLockedStatus; | |||||
| import com.iformall.service.QrCodeService; | import com.iformall.service.QrCodeService; | ||||
| import com.iformall.service.WxMerchantService; | import com.iformall.service.WxMerchantService; | ||||
| import com.iformall.service.WxScoreRulesService; | import com.iformall.service.WxScoreRulesService; | ||||
| @@ -106,12 +104,6 @@ public class WxMerchantController extends BaseController { | |||||
| public ResultData findById(Long id) { | public ResultData findById(Long id) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantController::findById"); | logger.debug("[" + getIpAddr() + "] WxMerchantController::findById"); | ||||
| WxMerchant wxMerchant = wxMerchantService.getById(id); | 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); | return new ResultData(wxMerchant); | ||||
| } | } | ||||
| @@ -201,12 +193,6 @@ public class WxMerchantController extends BaseController { | |||||
| public ResultData updateMerchantLevel(@RequestBody WxMerchant wxMerchant) { | public ResultData updateMerchantLevel(@RequestBody WxMerchant wxMerchant) { | ||||
| logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantLevel"); | logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantLevel"); | ||||
| wxMerchant.setTenantId(getTenantId()); | 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); | return wxMerchantService.updateMerchantLevel(wxMerchant); | ||||
| } | } | ||||
| @@ -7,6 +7,8 @@ import com.iformall.common.ResultData; | |||||
| import com.iformall.domain.po.WxMall; | import com.iformall.domain.po.WxMall; | ||||
| import com.iformall.domain.po.WxMerchant; | import com.iformall.domain.po.WxMerchant; | ||||
| import com.iformall.domain.po.WxMerchantBUser; | 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.EnumMerchantBUserStatus; | ||||
| import com.iformall.enums.EnumMerchantStatus; | import com.iformall.enums.EnumMerchantStatus; | ||||
| import com.iformall.service.*; | import com.iformall.service.*; | ||||
| @@ -50,6 +52,8 @@ public class WxMerchantBUserController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| private WxCUserBasicInfoService wxCUserBasicInfoService; | private WxCUserBasicInfoService wxCUserBasicInfoService; | ||||
| @Autowired | |||||
| private WxScoreRulesService wxScoreRulesService; | |||||
| @ApiOperation("查寻当bUser详情接口") | @ApiOperation("查寻当bUser详情接口") | ||||
| @GetMapping("/detail") | @GetMapping("/detail") | ||||
| @@ -72,6 +76,11 @@ public class WxMerchantBUserController extends BaseController { | |||||
| return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); | 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("phone", user.getPhone()); | ||||
| resultMap.put("name", user.getName()); | resultMap.put("name", user.getName()); | ||||
| resultMap.put("merchant_name", merchant.getName()); | resultMap.put("merchant_name", merchant.getName()); | ||||
| @@ -81,7 +90,6 @@ public class WxMerchantBUserController extends BaseController { | |||||
| resultMap.put("tenant_id",merchant.getTenantId()); | resultMap.put("tenant_id",merchant.getTenantId()); | ||||
| resultMap.put("merchant_id",merchant.getId()); | resultMap.put("merchant_id",merchant.getId()); | ||||
| resultMap.put("is_admin",merchant.getIsAdmin()); | resultMap.put("is_admin",merchant.getIsAdmin()); | ||||
| resultMap.put("creditLocked", merchant.getCreditLocked()); | |||||
| resultMap.put("businessId", merchant.getBusinessId()); | resultMap.put("businessId", merchant.getBusinessId()); | ||||
| String mid = null; | String mid = null; | ||||
| @@ -190,7 +190,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { | |||||
| } | } | ||||
| //更新商户数据 | //更新商户数据 | ||||
| updateMerchantCreditLocked(record); | |||||
| //updateMerchantCreditLocked(record); | |||||
| } | } | ||||
| @Override | @Override | ||||