|
@@ -221,12 +221,11 @@ public class WxApiService {
|
|
|
mzyReqrec.setPsordnum(order.getTradeNo());
|
|
|
mzyReqrec.setAgtordnum(order.getSerialNo());
|
|
|
param.setMzyReqrec(mzyReqrec);
|
|
|
- log.info("保存挂号信息: {}", param);
|
|
|
RestTemplate template = new RestTemplate();
|
|
|
HrgResponse data = template.postForObject(ThmzUrls.PAY_REGISTRATION_FORM_HAI_CI, param, HrgResponse.class);
|
|
|
- log.info("保存挂号信息结果: {}", data);
|
|
|
- tradeNosBetweenQuery.remove(order.getTradeNo());
|
|
|
- if (null != data && data.getResultCode() == 0) {
|
|
|
+ assert data != null;
|
|
|
+ log.info("保存挂号信息: 参数:{},结果:{}", param, data.getResultMessage());
|
|
|
+ if (data.getResultCode() == 0) {
|
|
|
return ResultVoUtil.success("保存挂号信息成功。");
|
|
|
}
|
|
|
log.info("保存挂号信息失败,将自动退款。");
|
|
@@ -254,12 +253,12 @@ public class WxApiService {
|
|
|
hrgParam.put("payAmt", DecimalTool.moneyYuanToFen(order.getTotalFee()));
|
|
|
hrgParam.put("agtOrdNum", order.getSerialNo());
|
|
|
hrgParam.put("payTime", payTime);
|
|
|
- log.info("保存门诊缴费信息:{}", hrgParam);
|
|
|
RestTemplate template = new RestTemplate();
|
|
|
HrgResponse response = template.postForObject(ThmzUrls.PAY_CHARGE_DETAIL_FORM_HAI_CI,
|
|
|
hrgParam, HrgResponse.class);
|
|
|
- log.info("保存门诊缴费信息结果:{}", response);
|
|
|
- if (null != response && response.getResultCode() == 0) {
|
|
|
+ assert response != null;
|
|
|
+ log.info("保存门诊缴费信息:参数:{},结果:{}", hrgParam, response.getResultMessage());
|
|
|
+ if (response.getResultCode() == 0) {
|
|
|
return ResultVoUtil.success("保存门诊缴费信息成功。");
|
|
|
}
|
|
|
log.info("保存门诊缴费信息失败,将自动退款。");
|
|
@@ -321,7 +320,6 @@ public class WxApiService {
|
|
|
}
|
|
|
|
|
|
private Integer queryMzPayStatus(WxPayOrderPojo order) {
|
|
|
- tradeNosBetweenQuery.add(order.getTradeNo());
|
|
|
RestTemplate template = new RestTemplate();
|
|
|
JSONObject obj = new JSONObject();
|
|
|
obj.put("hisOrdNum", order.getHisOrdNum());
|
|
@@ -438,31 +436,21 @@ public class WxApiService {
|
|
|
}
|
|
|
|
|
|
@Async("asyncTask")
|
|
|
- public CompletableFuture<ResultVo<List<Map<String, Object>>>> pushMessage(PushMessageParam param) {
|
|
|
+ public void pushMessage(PushMessageParam param) {
|
|
|
JSONObject content = param.getMsgContext();
|
|
|
String wxUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" +
|
|
|
PropertiesUtil.getProperty("access_token");
|
|
|
List<String> openIds = dao.selectOpenIdByIcCardNo(param.getCardNo());
|
|
|
if (null == openIds || openIds.isEmpty()) {
|
|
|
- return CompletableFuture.completedFuture(ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "未找到卡号【" +
|
|
|
- param.getCardNo() + "】的openId。"));
|
|
|
+ log.info("未找到卡号【{}】的openId。", param.getCardNo());
|
|
|
+ return;
|
|
|
}
|
|
|
- List<Map<String, Object>> resMapArr = new ArrayList<>();
|
|
|
RestTemplate template = new RestTemplate();
|
|
|
for (String openId : openIds) {
|
|
|
content.replace("touser", openId);
|
|
|
- log.info("推送消息:{}", content);
|
|
|
String res = template.postForObject(wxUrl, content, String.class);
|
|
|
- log.info("推送消息结果:{}", res);
|
|
|
- JSONObject resObj = JSONObject.parseObject(res);
|
|
|
- Map<String, Object> map = new HashMap<>();
|
|
|
- map.put("wxReturnCode", resObj.getIntValue("errcode"));
|
|
|
- map.put("wxReturnMessage", resObj.getString("errmsg"));
|
|
|
- map.put("openId", openId);
|
|
|
- map.put("cardNo", param.getCardNo());
|
|
|
- resMapArr.add(map);
|
|
|
+ log.info("推送消息:内容:{},结果:{}", content, res);
|
|
|
}
|
|
|
- return CompletableFuture.completedFuture(ResultVoUtil.success(resMapArr));
|
|
|
}
|
|
|
|
|
|
private RestTemplate getRestTemplate() {
|