|
|
|
@@ -44,8 +44,9 @@ public class WxCreditHistoryController extends BaseController { |
|
|
|
@GetMapping("/findByMerchantIdAndSpend") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name="merchantId",value="商户ID",dataType="long", paramType = "query",required=true), |
|
|
|
@ApiImplicitParam(name="spend",value="消费金额",dataType="int", paramType = "query",required=true)}) |
|
|
|
public ResultData findByMerchantIdAndSpend(@RequestParam Long merchantId, @RequestParam String spendStr) { |
|
|
|
@ApiImplicitParam(name="spend",value="消费金额",dataType="int", paramType = "query",required=true), |
|
|
|
@ApiImplicitParam(name = "userId", value = "会员Id", dataType = "long", paramType = "query", required = true)}) |
|
|
|
public ResultData findByMerchantIdAndSpend(@RequestParam Long merchantId, @RequestParam String spendStr,@RequestParam Long userId) { |
|
|
|
log.debug("[" + getIpAddr() + "] WxCreditHistoryController::findByMerchantIdAndSpend"); |
|
|
|
WxMerchant wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.setStatus(EnumYesOrNo.YES.getCode()); |
|
|
|
@@ -55,7 +56,7 @@ public class WxCreditHistoryController extends BaseController { |
|
|
|
if (wxMerchant.getIsAdmin() != EnumYesOrNo.YES.getCode() && merchantId.longValue() != getUser().getMerchantId().longValue()) { |
|
|
|
return new ResultData(ErrorCode.USER_NO_PERMISSION); |
|
|
|
} |
|
|
|
return new ResultData(wxCreditHistoryService.findByMerchantIdAndSpend(merchantId,spendStr,getTenantId())); |
|
|
|
return new ResultData(wxCreditHistoryService.findByMerchantIdAndSpend(merchantId,spendStr,userId,getTenantId())); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("根据手机号查询接口") |
|
|
|
|