|
|
|
@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Objects; |
|
|
|
|
|
|
|
@RestController |
|
|
|
@@ -57,7 +58,15 @@ public class WxCreditHistoryController extends BaseController { |
|
|
|
if(Objects.isNull(merchantId)|| StringUtils.isEmpty(spendStr)||Objects.isNull(userId)) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL) ; |
|
|
|
} |
|
|
|
return new ResultData(wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId,getTenantId())); |
|
|
|
|
|
|
|
try { |
|
|
|
Map<String, Integer> result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId,getTenantId()) ; |
|
|
|
return new ResultData(result); |
|
|
|
} catch (MallinkException e) { |
|
|
|
return new ResultData(e.getErrorCode(),e.getMessage()); |
|
|
|
} catch (Exception e) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,e.getMessage()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("新增接口") |
|
|
|
|