Przeglądaj źródła

[商户积分][修改][全局规则为锁定时商户都为锁定]

release_toaliyun_real
gongbiao 6 lat temu
rodzic
commit
3b05432825
3 zmienionych plików z 24 dodań i 5 usunięć
  1. +17
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  2. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java
  3. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java

+ 17
- 2
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Wyświetl plik

@@ -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);
}



+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java Wyświetl plik

@@ -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");


+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java Wyświetl plik

@@ -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);
}



Ładowanie…
Anuluj
Zapisz