diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java index e2b38ee4c..5e5b1f85e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java @@ -81,7 +81,7 @@ public class WxCUserBasicInfoController extends BaseController { if (info.getTagId() != null) { WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId()); - if (StringUtils.isNotBlank(uTag.getTags())) { + if (uTag != null && StringUtils.isNotBlank(uTag.getTags())) { List ids = JSONObject.parseArray(uTag.getTags(), Long.class); info.setTagsList(wxCUserTagsService.findTagList(getTenantId(), ids)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java index 6b043e982..5f4a90463 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java @@ -59,7 +59,12 @@ public class WxCardPayController extends BaseController { public ResultData cardOrderList(@ModelAttribute WxCardVo wxCardVo, Integer pageNum, Integer pageSize) { String ipStr = getIpAddr(); logger.info("cardPay/cardOrderList: " + ipStr); - if (wxCardVo == null) wxCardVo = new WxCardVo(); + if (wxCardVo == null) {wxCardVo = new WxCardVo();} + else { + if(StringUtils.isBlank(wxCardVo.getOuPhone())) { + wxCardVo.setOuPhone(null); + } + } MallUserInfo user = getUser(); wxCardVo.setTenantId(user.getTenantId()); if(StringUtils.isNotBlank(wxCardVo.getStatusStr())) { diff --git a/mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java b/mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java index 4df979d09..644546097 100644 --- a/mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java +++ b/mallinkAdmin/src/main/java/com/iformall/interceptor/HttpServletRequestWrapperFilter.java @@ -1,5 +1,7 @@ package com.iformall.interceptor; +import com.iformall.utils.UrlCheck; + import javax.servlet.*; import javax.servlet.http.HttpServletRequest; import java.io.IOException; @@ -17,13 +19,8 @@ public class HttpServletRequestWrapperFilter implements Filter { ServletRequest requestWrapper = null; if (request instanceof HttpServletRequest) { String url = ((HttpServletRequest) request).getRequestURI(); - if (!url.contains("awsFileUpload") - && !url.contains("cimgUpload") - && !url.contains("ueditor/exec") - && !url.contains("/wxCUserBasicInfo/importTemplate")) { + if (!UrlCheck.checkUrl(url)) { requestWrapper = new BodyReaderHttpServletRequestWrapper((HttpServletRequest) request); - } else { - requestWrapper = null; } } if (null == requestWrapper) { @@ -34,6 +31,7 @@ public class HttpServletRequestWrapperFilter implements Filter { } + @Override public void destroy() { diff --git a/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java b/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java index 3adf70465..fd3d41f9f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java +++ b/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java @@ -4,6 +4,7 @@ import com.iformall.common.ErrorCode; import com.iformall.exception.MallinkException; import com.iformall.utils.HashUtil; import com.iformall.utils.IPUtil; +import com.iformall.utils.UrlCheck; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.redis.core.RedisTemplate; @@ -43,11 +44,7 @@ public class RequestInterceptor extends HandlerInterceptorAdapter { String ipaddress = IPUtil.getIpAddr(request); String url = request.getRequestURL().toString(); - if(url.contains("pvlog") - || url.contains("awsFileUpload") - || url.contains("cimgUpload") - || url.contains("ueditor/exec") - || url.contains("/wxCUserBasicInfo/importTemplate")) { + if (UrlCheck.checkUrl(url)) { // pvlog不检查幂等 // awsFileUpload不检查幂等 // ueditor 不检查幂等 diff --git a/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java b/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java new file mode 100644 index 000000000..b19e6ef37 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java @@ -0,0 +1,18 @@ +package com.iformall.utils; + +/** + * @author gongbiao + */ +public class UrlCheck { + + public static boolean checkUrl(String url) { + return url.contains("awsFileUpload") + || url.contains("cimgUpload") + || url.contains("ueditor/exec") + || url.contains("/wxCUserBasicInfo/importTemplate") + || url.contains("wxMsgCallback") + || url.contains("notify") + || url.contains("pvlog"); + } + +} diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgSendStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgSendStatus.java index 5008a1c88..4bec81de7 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgSendStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgSendStatus.java @@ -4,6 +4,7 @@ package com.iformall.enums; * Created by Stormeye on 2018/08/09. */ public enum EnumMsgSendStatus { + MSG_SENDING(2, "发送中"), MSG_SEND_SUCCESS(1,"发送成功"), MSG_SEND_FAIL(0,"发送失败") ; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java index 2608a5298..fa73fa083 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java @@ -83,7 +83,11 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { if(callback!=null){//有更新,无插入 callback.setSign(param.get("sign")); callback.setTenantId(tenantId); - callback.setStatus(wxMsgCallback.getStatus()); + if (!wxMsgCallback.getStatus().equals(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode())) { + callback.setStatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode()); + } else { + callback.setStatus(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode()); + } callback.setStatusMsg(wxMsgCallback.getStatusMsg()); callback.setBegintime(wxMsgCallback.getBegintime()); callback.setEndtime(wxMsgCallback.getEndtime()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index e361bd042..352e4b308 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -262,7 +262,8 @@ public class WxMsgServiceImpl implements WxMsgService { wxMsgCallback.setTenantId(wxmsg.getTenantId()); wxMsgCallback.setBatchNo(batchNo); wxMsgCallback.setMsgId(wxmsg.getId()); - wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode()); + wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SENDING.getCode()); + wxMsgCallback.setStatusMsg(EnumMsgSendStatus.MSG_SENDING.getMessage()); wxMsgCallback.setCreatetime(new Date()); wxMsgCallbackMapper.insertSelective(wxMsgCallback); } diff --git a/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml index 2b0a7b372..c817cccea 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml @@ -38,9 +38,9 @@ and `batch_no` like concat('%', #{batchNo},'%') - - - + + + and `phone` like concat('%', #{phone},'%')