Merge remote-tracking branch 'origin/master'

luodangjia

2024-04-28 94e9dc3adb80baf6e1d7d56e54a93917996bc339

 rest/src/main/java/cn/stylefeng/rest/ijpay/controller/WxPayController.java

@@ -107,6 +107,35 @@
         totalAmount = counsellingOrder.getPayAmount();
      }


      // 判断转换后的BigDecimal是否为0
      if (totalAmount.compareTo(BigDecimal.ZERO) == 0) {
         if (req.getOrderNo().startsWith(OrderTypeEnum.MENTAL_TEST.getCode())) {
            // 心理测试订单
            orderMentalTestService.paySuccess(req.getOrderNo(), req.getOrderNo(), String.valueOf(totalAmount), PayTypeEnum.ALIPAY.getCode());
         } else if (req.getOrderNo().startsWith(OrderTypeEnum.CONSULT_ONE.getCode())) {
            // 心理咨询1V1订单
            mentalTestOrderBizService.paySuccessOrderConsultOne(req.getOrderNo(), req.getOrderNo(), String.valueOf(totalAmount), PayTypeEnum.ALIPAY.getCode());
         } else if (req.getOrderNo().startsWith(OrderTypeEnum.COURSE_ORDER.getCode())) {
            //课程订单
            OrderPayRequest orderPayRequest = new OrderPayRequest();
            orderPayRequest.setOrderNo(req.getOrderNo());
            orderPayRequest.setTransactionNo(req.getOrderNo());
            orderPayRequest.setPayType("2");
            orderPayRequest.setOrderType(1);
            courseOrderService.payCourseOrder(orderPayRequest);
         } else if (req.getOrderNo().startsWith(OrderTypeEnum.COUNSELLING_ORDER.getCode())) {
            //咨询订单
            OrderPayRequest orderPayRequest = new OrderPayRequest();
            orderPayRequest.setOrderNo(req.getOrderNo());
            orderPayRequest.setTransactionNo(req.getOrderNo());
            orderPayRequest.setPayType("2");
            orderPayRequest.setOrderType(2);
            counsellingOrderService.payCounsellingOrder(orderPayRequest);
         }
         return new SuccessResponseData("支付成功");
      }

      // 设置支付配置
      WxPayApiConfigKit.putApiConfig(getApiConfig());
      //WxPayApiConfigKit.setThreadLocalAppId(wxPayBean.getAppId());
@@ -156,9 +185,8 @@

      Map<String, String> packageParams = WxPayKit.appPrepayIdCreateSign(wxPayApiConfig.getAppId(), wxPayApiConfig.getMchId(), prepayId, wxPayApiConfig.getPartnerKey(), SignType.MD5);

      String jsonStr = JSON.toJSONString(packageParams);
      log.info("微信APP支付返回参数：{}", jsonStr);
      return new SuccessResponseData(jsonStr);
      log.info("微信APP支付返回参数：{}", JSONUtil.toJsonStr(packageParams));
      return new SuccessResponseData(packageParams);
   }

   /**