Commit cb04d3aa by tang

添加什么图片上传之类

parent c4119e12
package com.thinkgem.jeesite.modules.homepage.service; package com.thinkgem.jeesite.modules.homepage.service;
import com.thinkgem.jeesite.common.utils.StringUtils;
import com.thinkgem.jeesite.modules.homepage.bean.NoticeRequest; import com.thinkgem.jeesite.modules.homepage.bean.NoticeRequest;
import com.thinkgem.jeesite.modules.homepage.dao.NoticeDao; import com.thinkgem.jeesite.modules.homepage.dao.NoticeDao;
import com.thinkgem.jeesite.modules.homepage.entity.NoticeEntity; import com.thinkgem.jeesite.modules.homepage.entity.NoticeEntity;
...@@ -20,6 +21,15 @@ public class NoticeService { ...@@ -20,6 +21,15 @@ public class NoticeService {
private NoticeDao noticeDao; private NoticeDao noticeDao;
public List<NoticeEntity> getNotice(NoticeRequest request) throws Exception { public List<NoticeEntity> getNotice(NoticeRequest request) throws Exception {
return noticeDao.getNotice(request); List<NoticeEntity> notice = noticeDao.getNotice(request);
if(notice.size()>0){
for (NoticeEntity entity: notice) {
if(!StringUtils.isBlank(entity.getContent()) && entity.getContent().contains("/youka-manage/")){
String replace = entity.getContent().replace("/youka-manage/", "http://youkapay.com/youka-manage/");
entity.setContent(replace);
}
}
}
return notice;
} }
} }
...@@ -342,7 +342,10 @@ public class UserApiController { ...@@ -342,7 +342,10 @@ public class UserApiController {
// 判断业务入参是否为空 // 判断业务入参是否为空
if (StringUtils.isBlank(request.getSubMerchantCode()) || if (StringUtils.isBlank(request.getSubMerchantCode()) ||
// StringUtils.isBlank(request.getIdentityCode()) || // StringUtils.isBlank(request.getIdentityCode()) ||
StringUtils.isBlank(request.getFunction()) || StringUtils.isBlank(request.getCardType()) || StringUtils.isBlank(request.getCardNo()) || StringUtils.isBlank(request.getCardMobile()) || StringUtils.isBlank(request.getBelongBank()) || StringUtils.isBlank(request.getCardBank())) { StringUtils.isBlank(request.getFunction()) ||
StringUtils.isBlank(request.getCardType()) || StringUtils.isBlank(request.getCardNo()) || StringUtils.isBlank(request.getCardMobile()) || StringUtils.isBlank(request.getBelongBank())
|| StringUtils.isBlank(request.getCardSrc())
) {
resp.setStatus(ComCode.STATUS_CODE_4001); resp.setStatus(ComCode.STATUS_CODE_4001);
resp.setMessage(ComCode.STATUS_CODE_4001_DESC); resp.setMessage(ComCode.STATUS_CODE_4001_DESC);
return resp; return resp;
...@@ -459,12 +462,15 @@ public class UserApiController { ...@@ -459,12 +462,15 @@ public class UserApiController {
try { try {
// 判断业务入参是否为空 // 判断业务入参是否为空
if (StringUtils.isBlank(request.getSubMerchantCode()) if (StringUtils.isBlank(request.getSubMerchantCode())
|| StringUtils.isBlank(request.getFunction()) || StringUtils.isBlank(request.getIdentityCode()) // || StringUtils.isBlank(request.getFunction()) || StringUtils.isBlank(request.getIdentityCode())
|| StringUtils.isBlank(request.getRealName()) || StringUtils.isBlank(request.getIdCard()) || StringUtils.isBlank(request.getRealName()) || StringUtils.isBlank(request.getIdCard())
|| StringUtils.isBlank(request.getCardNo()) || StringUtils.isBlank(request.getCardMobile()) || StringUtils.isBlank(request.getCardNo()) || StringUtils.isBlank(request.getCardMobile())
|| StringUtils.isBlank(request.getBelongBank()) || StringUtils.isBlank(request.getBelongBank())
|| StringUtils.isBlank(request.getCardBank()) || StringUtils.isBlank(request.getCardBank())
) { || StringUtils.isBlank(request.getIdCardFront())|| StringUtils.isBlank(request.getIdCardBack())
|| StringUtils.isBlank(request.getIdCardBack())) {
logger.debug("业务参数就异常了"); logger.debug("业务参数就异常了");
// || StringUtils.isBlank(request.getIdCardPlace())|| StringUtils.isBlank(request.getIdCardFront())|| StringUtils.isBlank(request.getIdCardBack())|| StringUtils.isBlank(request.getIdCardBack()) // || StringUtils.isBlank(request.getIdCardPlace())|| StringUtils.isBlank(request.getIdCardFront())|| StringUtils.isBlank(request.getIdCardBack())|| StringUtils.isBlank(request.getIdCardBack())
// || StringUtils.isBlank(request.getIdCardHold())|| StringUtils.isBlank(request.getDebitCard())|| StringUtils.isBlank(request.getCardSrc())|| StringUtils.isBlank(request.getCardPlace()) // || StringUtils.isBlank(request.getIdCardHold())|| StringUtils.isBlank(request.getDebitCard())|| StringUtils.isBlank(request.getCardSrc())|| StringUtils.isBlank(request.getCardPlace())
...@@ -488,19 +494,19 @@ public class UserApiController { ...@@ -488,19 +494,19 @@ public class UserApiController {
// 根据手机号 + 使用场景 + 验证码查询 // 根据手机号 + 使用场景 + 验证码查询
request.setMobile(request.getCardMobile()); request.setMobile(request.getCardMobile());
IdentityCodeEntity identityCodeEntity = userService.getIdentifyCode(request); // IdentityCodeEntity identityCodeEntity = userService.getIdentifyCode(request);
// 验证码使用场景 // 验证码使用场景
if (identityCodeEntity == null) { // if (identityCodeEntity == null) {
resp.setStatus(ComCode.STATUS_CODE_4010); // resp.setStatus(ComCode.STATUS_CODE_4010);
resp.setMessage(ComCode.STATUS_CODE_4010_DESC); // resp.setMessage(ComCode.STATUS_CODE_4010_DESC);
return resp; // return resp;
} // }
// 验证码是否过期 // 验证码是否过期
if (!userService.checkIdentifyCodeExpired(identityCodeEntity)) { // if (!userService.checkIdentifyCodeExpired(identityCodeEntity)) {
resp.setStatus(ComCode.STATUS_CODE_4009); // resp.setStatus(ComCode.STATUS_CODE_4009);
resp.setMessage(ComCode.STATUS_CODE_4009_DESC); // resp.setMessage(ComCode.STATUS_CODE_4009_DESC);
return resp; // return resp;
} // }
userService.certification(request); userService.certification(request);
resp.setStatus(ComCode.STATUS_CODE_2000); resp.setStatus(ComCode.STATUS_CODE_2000);
resp.setMessage(ComCode.STATUS_CODE_2000_DESC); resp.setMessage(ComCode.STATUS_CODE_2000_DESC);
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
cms_article a cms_article a
LEFT JOIN cms_article_data b ON a.id = b.id LEFT JOIN cms_article_data b ON a.id = b.id
WHERE WHERE
a.del_flag = 0
AND
<if test='noticeType=="F"'> <if test='noticeType=="F"'>
a.is_flow = 'Y' a.is_flow = 'Y'
</if> </if>
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
cms_article a cms_article a
WHERE WHERE
a.is_flow = 'N' a.is_flow = 'N'
AND a.del_flag = 0
AND a.is_tip = 'N' AND a.is_tip = 'N'
AND a.category_id = 28 AND a.category_id = 28
AND a.scope LIKE CONCAT('%',( AND a.scope LIKE CONCAT('%',(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment