浏览代码

feature: 核酸预约

wuyongyi 2 年之前
父节点
当前提交
817ca74058

+ 4 - 4
onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/core/utils/ContextHelper.java

@@ -11,13 +11,13 @@ public final class ContextHelper {
 
     // 提供一些包装方法,方便本地调试使用
     public static int getCurrentTerminalWrapped() {
-//        return TerminalEnum.NFYYBYFY_ALIPAY_MP.getValue();
-        return WebAppContext.current().getTerminal();
+        return TerminalEnum.NFYYBYFY_ALIPAY_MP.getValue();
+//        return WebAppContext.current().getTerminal();
     }
 
     public static int getCurrentUserIdWrapped() {
-//        return 5;
-        return WebAppContext.current().getUserId();
+        return 173140;
+//        return WebAppContext.current().getUserId();
     }
 
     public static String getAlipayUidWrapped() {

+ 5 - 2
onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/NucleicServiceImpl.java

@@ -117,6 +117,9 @@ public class NucleicServiceImpl implements NucleicService {
         if (request.getDeptCode().equals("500")) {
             deptId = 670;
         }
+        int paymentChannel = request.getFee() > 0
+                ? PaymentChannelEnum.ALI_PAY.getValue()
+                : PaymentChannelEnum.FREE.getValue();
         String startTime = Checker.getStringValue(request.getStartTime());
         String endTime = Checker.getStringValue(request.getEndTime());
         int userId = ContextHelper.getCurrentUserIdWrapped();
@@ -135,7 +138,7 @@ public class NucleicServiceImpl implements NucleicService {
                 .setUserId(userId)
                 .setMedicalCardId(request.getMedicalId())
                 .setScheduleItemCode(request.getNucleicItemId())
-                .setPaymentChannel(PaymentChannelEnum.ALI_PAY.getValue())
+                .setPaymentChannel(paymentChannel)
                 .setSource(source)
                 .setPeriod(request.getDatePeriod())
                 .setDoctorTitle("")
@@ -152,7 +155,7 @@ public class NucleicServiceImpl implements NucleicService {
         }
         //非互联网医院名医诊区挂号
         NucleicOrderConfirmResponseData data = new NucleicOrderConfirmResponseData();
-        data.setAmount("0");
+        data.setAmount(String.format("%.2f", request.getFee() / 100d));
         data.setOrderId(String.valueOf(res.getOrderId()));
         data.setOrderNo(res.getOrderNo());
         return data;