diff --git a/xinelu-framework/src/main/java/com/xinelu/framework/config/SecurityConfig.java b/xinelu-framework/src/main/java/com/xinelu/framework/config/SecurityConfig.java index 01ccde4..ff1a907 100644 --- a/xinelu-framework/src/main/java/com/xinelu/framework/config/SecurityConfig.java +++ b/xinelu-framework/src/main/java/com/xinelu/framework/config/SecurityConfig.java @@ -115,7 +115,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/login", "/register", "/captchaImage").anonymous() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() - .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**", "/nurseApplet/**", "/nurseApp/**", "/specialDisease/getUserInfo", "/monitor/payTask/handCloseOrder", "/newApp/login/**", "/system/hospitalPerson/**").permitAll() + .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**", "/nurseApplet/**", "/nurseApp/**", "/specialDisease/getUserInfo", "/monitor/payTask/handCloseOrder", "/newApp/login/**", "/system/hospitalPerson/**", "/evaluate/**", "/webSocket/**").permitAll() .antMatchers(antMatchers.split(",")).permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated() diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/patientcenter/PatientCenterController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/patientcenter/PatientCenterController.java index 556f272..8877a52 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/patientcenter/PatientCenterController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/patientcenter/PatientCenterController.java @@ -172,7 +172,7 @@ public class PatientCenterController extends BaseController { throw new ServiceException(bindingResult.getAllErrors().get(0).getDefaultMessage()); } if (Objects.isNull(goodsOrder.getIntegralExchangeSill()) || goodsOrder.getIntegralExchangeSill() <= 0) { - return AjaxResult.error("当前积分数值不足，无法兑换！"); + return AjaxResult.error("当前健康豆数值不足，无法兑换！"); } if (Objects.isNull(goodsOrder.getIntegralExchangeCount()) || goodsOrder.getIntegralExchangeCount() <= 0) { return AjaxResult.error("兑换商品数量不正确，无法兑换！"); diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/patientcenter/impl/PatientCenterServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/patientcenter/impl/PatientCenterServiceImpl.java index e0cd745..014fe50 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/patientcenter/impl/PatientCenterServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/patientcenter/impl/PatientCenterServiceImpl.java @@ -302,29 +302,29 @@ public class PatientCenterServiceImpl implements PatientCenterService { GoodsAttributeDetails goodsAttributeDetails = nursingStationGoodsMapper.selectGoodsAttributeDetailsGoodsStockById(goodsOrder.getGoodsAttributeDetailsId()); //判断当前商品是否可兑换商品 if (Objects.nonNull(goodsAttributeDetails) && CouponAndIntegralFlagEnum.NOT_CONVERTIBLE.getInfo().equals(goodsAttributeDetails.getIntegralExchangeFlag())) { - return AjaxResult.error("当前商品非积分兑换商品，无法兑换！"); + return AjaxResult.error("当前商品非健康豆兑换商品，无法兑换！"); } //判断积分兑换数值是否正确 boolean integralExchangeSill = Objects.nonNull(goodsAttributeDetails) && Objects.isNull(goodsAttributeDetails.getIntegralExchangeSill()); boolean equalIntegralExchangeSill = Objects.nonNull(goodsAttributeDetails) && !goodsOrder.getIntegralExchangeSill().equals(goodsAttributeDetails.getIntegralExchangeSill()); if (BooleanUtils.isTrue(integralExchangeSill) || BooleanUtils.isTrue(equalIntegralExchangeSill)) { - return AjaxResult.error("当前商品兑换需要使用的积分数值不正确，无法兑换！"); + return AjaxResult.error("当前商品兑换需要使用的健康豆数量不正确，无法兑换！"); } //判断积分兑换商品数目是否正确 boolean integralExchangeCount = Objects.nonNull(goodsAttributeDetails) && Objects.isNull(goodsAttributeDetails.getIntegralExchangeCount()); boolean equalIntegralExchangeCount = Objects.nonNull(goodsAttributeDetails) && !goodsOrder.getIntegralExchangeCount().equals(goodsAttributeDetails.getIntegralExchangeCount()); if (BooleanUtils.isTrue(integralExchangeCount) || BooleanUtils.isTrue(equalIntegralExchangeCount)) { - return AjaxResult.error("当前积分兑换商品的数量不正确，无法兑换！"); + return AjaxResult.error("当前健康豆兑换商品的数量不正确，无法兑换！"); } //判断库存是否充足 if (Objects.isNull(goodsAttributeDetails.getGoodsStock()) || goodsAttributeDetails.getGoodsStock() == 0) { - return AjaxResult.error("当前商品库存不足，无法购买！"); + return AjaxResult.error("当前商品库存不足，无法兑换！"); } //判读用户账户积分是否充足 AtomicInteger patientIntegral = new AtomicInteger(Objects.isNull(patientInfo.getIntegral()) ? 0 : patientInfo.getIntegral()); AtomicInteger exchangeIntegralSkill = new AtomicInteger(Objects.isNull(goodsOrder.getIntegralExchangeSill()) ? 0 : goodsOrder.getIntegralExchangeSill()); if (patientIntegral.get() < exchangeIntegralSkill.get()) { - return AjaxResult.error("当前用户的账户积分数值不足，无法兑换！"); + return AjaxResult.error("当前用户的健康豆数目值不足，无法兑换！"); } //判断商品库存数量是否满足兑换数量 AtomicInteger goodsStock = new AtomicInteger(goodsAttributeDetails.getGoodsStock()); diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/wechatpaymentinfo/impl/WeChatPayNotifyServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/wechatpaymentinfo/impl/WeChatPayNotifyServiceImpl.java index c50932a..8c61dfd 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/wechatpaymentinfo/impl/WeChatPayNotifyServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/wechatpaymentinfo/impl/WeChatPayNotifyServiceImpl.java @@ -140,6 +140,7 @@ public class WeChatPayNotifyServiceImpl implements WeChatPayNotifyService { resultMap.put("message", "通知验签失败"); return JSON.toJSONString(resultMap); } + log.info(accountFlag + "微信通知的请求体信息 ===> {}", body); String nonce = request.getHeader("Wechatpay-Nonce"); String timestamp = request.getHeader("Wechatpay-Timestamp"); String signature = request.getHeader("Wechatpay-Signature"); @@ -147,7 +148,12 @@ public class WeChatPayNotifyServiceImpl implements WeChatPayNotifyService { NotificationRequest notificationRequest = new NotificationRequest.Builder().withSerialNumber(serialNo) .withNonce(nonce).withTimestamp(timestamp).withSignature(signature).withBody(body).build(); NotificationHandler handler = new NotificationHandler(xylVerifier, xylWeChatPaymentConfig.getXylPaymentKey().getBytes(StandardCharsets.UTF_8)); - Notification notification = handler.parse(notificationRequest); + Notification notification = null; + try { + notification = handler.parse(notificationRequest); + } catch (Exception e) { + log.warn("微信支付回调异常，异常信息为：{}", e.getMessage()); + } if (Objects.isNull(notification)) { log.error(accountFlag + "微信通知验签失败，请求体 ====> {}", body); response.setStatus(500); diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/wechatpaymentinfo/impl/WeChatRefundServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/wechatpaymentinfo/impl/WeChatRefundServiceImpl.java index 51029e5..7b59392 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/wechatpaymentinfo/impl/WeChatRefundServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/wechatpaymentinfo/impl/WeChatRefundServiceImpl.java @@ -395,12 +395,12 @@ public class WeChatRefundServiceImpl implements WeChatRefundService { patientIntegralChange.setChangeIntegral(stockIntegralNum); patientIntegralChange.setChangeTime(LocalDateTime.now()); patientIntegralChange.setChangeType(IntegralChangeType.COMMODITY_EXCHANGE.getInfo()); - patientIntegralChange.setChangeRemark("积分兑换商品订单新增积分变更"); + patientIntegralChange.setChangeRemark("健康豆兑换商品订单新增健康豆变更"); patientIntegralChange.setChangeIntegralChannel(StringUtils.isBlank(goodsOrderInfo.getOrderChannel()) ? "" : goodsOrderInfo.getOrderChannel()); patientIntegralChange.setCreateTime(LocalDateTime.now()); int integralChange = patientIntegralChangeMapper.insertPatientIntegralChange(patientIntegralChange); if (integralChange <= 0) { - log.error("积分兑换商品-生成积分变更记录表信息失败，积分变更信息：{}", integralChange); + log.error("健康豆兑换商品-生成健康豆变更记录表信息失败，健康豆变更信息：{}", integralChange); throw new ServiceException("确认退款失败，请联系管理员！"); } return AjaxResult.success();