From 3b0543282567d3880f2a67cac1012d028ec348ec Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 25 Sep 2019 09:43:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E7=A7=AF=E5=88=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=85=A8=E5=B1=80=E8=A7=84=E5=88=99?= =?UTF-8?q?=E4=B8=BA=E9=94=81=E5=AE=9A=E6=97=B6=E5=95=86=E6=88=B7=E9=83=BD?= =?UTF-8?q?=E4=B8=BA=E9=94=81=E5=AE=9A]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/WxMerchantController.java | 19 +++++++++++++++++-- .../market/WxFloatingLayerController.java | 6 +++--- .../mem/WxScoreRulesController.java | 4 ++++ 3 files changed, 24 insertions(+), 5 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 64c5f5443..6d6e54c1d 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,13 @@ 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; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -38,7 +41,8 @@ public class WxMerchantController extends BaseController { private WxMerchantService wxMerchantService; @Autowired private QrCodeService qrCodeService; - + @Autowired + private WxScoreRulesService wxScoreRulesService; @UserDataRuleAnnotation("merchant_list") @ApiOperation("分页列表接口") @@ -102,7 +106,12 @@ 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); } @@ -192,6 +201,12 @@ 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/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java index e790d00a2..a94f32e74 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java @@ -32,7 +32,7 @@ public class WxFloatingLayerController extends BaseController { private WxFloatingLayerService wxFloatingLayerService; @ApiOperation("分页列表接口") - @GetMapping("list") + @GetMapping("/list") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @@ -46,7 +46,7 @@ public class WxFloatingLayerController extends BaseController { } @ApiOperation("新增接口") - @PostMapping("add") + @PostMapping("/add") @SystemControllerLog(description = "新增") public ResultData add(@RequestBody WxFloatingLayer wxFloatingLayer) { logger.debug("[" + getIpAddr() + "] WxFloatingLayerController::add"); @@ -62,7 +62,7 @@ public class WxFloatingLayerController extends BaseController { } @ApiOperation("根据id更新接口") - @PostMapping("update") + @PostMapping("/update") @SystemControllerLog(description = "id更新") public ResultData update(@RequestBody WxFloatingLayer wxFloatingLayer) { logger.debug("[" + getIpAddr() + "] WxFloatingLayerController::update"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java index 583dd9513..36de57845 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java @@ -5,6 +5,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxScoreRules; +import com.iformall.enums.EnumCreditLockedStatus; import com.iformall.service.WxScoreRulesService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -28,6 +29,9 @@ public class WxScoreRulesController extends BaseController { public ResultData list() { logger.debug("[" + getIpAddr() + "] WxScoreRulesController::list"); WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(getTenantId()); + if (scoreRules.getCreditLocked() == null) { + scoreRules.setCreditLocked(EnumCreditLockedStatus.OPEN.getCode()); + } return new ResultData(scoreRules); }