|
|
@ -7,6 +7,7 @@ import com.ynxbd.common.result.ResultEnum; |
|
|
|
import com.ynxbd.wx.config.WeChatConfig; |
|
|
|
import com.ynxbd.wx.config.WeChatConfig; |
|
|
|
import com.ynxbd.wx.wxfactory.ReqParamHelper; |
|
|
|
import com.ynxbd.wx.wxfactory.ReqParamHelper; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
|
|
|
import org.apache.commons.lang3.ObjectUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.MDC; |
|
|
|
import org.slf4j.MDC; |
|
|
|
|
|
|
|
|
|
|
@ -33,19 +34,28 @@ public class QServlet extends HttpServlet { |
|
|
|
MDC.remove("ip"); |
|
|
|
MDC.remove("ip"); |
|
|
|
MDC.put("ip", HttpHelper.getIpAddress(request)); |
|
|
|
MDC.put("ip", HttpHelper.getIpAddress(request)); |
|
|
|
|
|
|
|
|
|
|
|
String userAgent = request.getHeader("user-agent"); |
|
|
|
// if (StringUtils.isEmpty(userAgent)) {
|
|
|
|
if (StringUtils.isEmpty(userAgent)) { |
|
|
|
// log.info(ResultEnum.PAY_TYPE_NOT_SUPPORT.message);
|
|
|
|
log.info(ResultEnum.PAY_TYPE_NOT_SUPPORT.message); |
|
|
|
// HttpHelper.outRespAlert(response, ResultEnum.PAY_TYPE_NOT_SUPPORT.message);
|
|
|
|
HttpHelper.outRespAlert(response, ResultEnum.PAY_TYPE_NOT_SUPPORT.message); |
|
|
|
// return;
|
|
|
|
return; |
|
|
|
// }
|
|
|
|
} |
|
|
|
MerchantEnum merchantEnum = MerchantEnum.WX; |
|
|
|
|
|
|
|
|
|
|
|
MerchantEnum merchantEnum = MerchantEnum.getMerchantEnumByQr(userAgent); |
|
|
|
String userAgent = request.getHeader("user-agent"); |
|
|
|
if (merchantEnum == null) { |
|
|
|
if (!ObjectUtils.isEmpty(userAgent)) { |
|
|
|
log.info(ResultEnum.PAY_TYPE_NOT_SUPPORT.message); |
|
|
|
merchantEnum = MerchantEnum.getMerchantEnumByQr(userAgent); |
|
|
|
HttpHelper.outRespAlert(response, ResultEnum.PAY_TYPE_NOT_SUPPORT.message); |
|
|
|
if (merchantEnum == null) { |
|
|
|
return; |
|
|
|
log.info(ResultEnum.PAY_TYPE_NOT_SUPPORT.message); |
|
|
|
|
|
|
|
HttpHelper.outRespAlert(response, ResultEnum.PAY_TYPE_NOT_SUPPORT.message); |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// MerchantEnum merchantEnum = MerchantEnum.getMerchantEnumByQr(userAgent);
|
|
|
|
|
|
|
|
// if (merchantEnum == null) {
|
|
|
|
|
|
|
|
// log.info(ResultEnum.PAY_TYPE_NOT_SUPPORT.message);
|
|
|
|
|
|
|
|
// HttpHelper.outRespAlert(response, ResultEnum.PAY_TYPE_NOT_SUPPORT.message);
|
|
|
|
|
|
|
|
// return;
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
String patientId = request.getParameter("p"); |
|
|
|
String patientId = request.getParameter("p"); |
|
|
|
log.info("{} [patientId={}]多张处方扫码请求,开始解析...", merchantEnum.NAME, patientId); |
|
|
|
log.info("{} [patientId={}]多张处方扫码请求,开始解析...", merchantEnum.NAME, patientId); |
|
|
|