已收费列表无法查询问题

src/main/java/cn/hnthyy/thmz/controller/mz/MzChargeDetailController.java

@@ -225,6 +225,8 @@ public class MzChargeDetailController {
                     User tokenUser = TokenUtil.getUser(httpServletRequest);
                     mzChargeDetailPageDto.setOpId(tokenUser.getUserIdCode());
                 }
+                mzChargeDetailPageDto.setPageIndex(mzChargeDetailPageDto.getPageIndex() != null ? mzChargeDetailPageDto.getPageIndex() : 0);
+                mzChargeDetailPageDto.setPageSize(mzChargeDetailPageDto.getPageSize() != null ? mzChargeDetailPageDto.getPageSize() : 5);
                 pageViewVo.setPageIndex(mzChargeDetailPageDto.getPageIndex());
                 pageViewVo.setPageSize(mzChargeDetailPageDto.getPageSize());
                 //mzChargeDetailService.refshOldSystemReceiptData();

src/main/java/cn/hnthyy/thmz/service/pay/NongPayService.java

@@ -8,6 +8,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -23,8 +25,12 @@ public class NongPayService {
         JSONObject result = new JSONObject();
         result.put("code", ResultCode.pay_error.getCode());
         body.put("payType", "0");
+        String amount = body.get("amount");
+        BigDecimal amountBigDecimal = new BigDecimal(amount);
+        String payAmount = String.valueOf(amountBigDecimal.multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_UP));
         // todo 测试写死1分钱
         body.put("amount", "1");
+//        body.put("amount", payAmount);
         body.put("subject", body.get("subject"));
         body.put("body", body.get("body"));
         JSONObject channelExtra = new JSONObject();
@@ -67,4 +73,11 @@ public class NongPayService {
         }
         return result;
     }
+
+    public static void main(String[] args) {
+        String amount = "10";
+        BigDecimal amountBigDecimal = new BigDecimal(amount);
+        String payAmount = String.valueOf(amountBigDecimal.multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_UP));
+        System.out.println(payAmount);
+    }
 }

src/main/resources/logback-spring.xml

@@ -70,6 +70,20 @@
             <pattern>%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{10}) - %cyan(%msg%n)</pattern>
         </encoder>
     </appender>
+    <!-- 打印MyBatis执行的SQL语句及参数 -->
+    <!--<logger name="cn.hnthyy.thmz.mapper" level="DEBUG" additivity="false">
+        <appender-ref ref="consoleLog"/> &lt;!&ndash; 输出到控制台 &ndash;&gt;
+        <appender-ref ref="fileInfoLog"/> &lt;!&ndash; 同时输出到info日志文件 &ndash;&gt;
+    </logger>
+    <logger name="org.apache.ibatis" level="DEBUG" additivity="false">
+        <appender-ref ref="consoleLog"/>
+        <appender-ref ref="fileInfoLog"/>
+    </logger>
+    <logger name="org.springframework.jdbc" level="DEBUG" additivity="false">
+        <appender-ref ref="consoleLog"/>
+        <appender-ref ref="fileInfoLog"/>
+    </logger>-->
+
     <!--指定最基础的日志输出级别-->
     <root level="INFO">
         <!--appender将会添加到这个loger-->

src/main/resources/static/js/mz/registration.js

@@ -219,6 +219,7 @@ $(function () {
         payByCode();
     });
 
+
     /**
      * 保存挂号信息
      */
@@ -246,7 +247,7 @@ $(function () {
         if (patientId == null || patientId == "") {
             savePatient(1);
         } else {
-            saveMzyReqrec();
+            codePay(() => saveMzyReqrec());
         }
 
     });
@@ -346,6 +347,33 @@ $(function () {
 
 });
 
+function codePay(callback) {
+    var authCode = $('#paymentCode').val();
+    var money = $('#cash').val();
+    $.ajax({
+        type: "POST",
+        url: '/thmz/NongPay/unifiedOrder',
+        contentType: "application/json;charset=UTF-8",
+        dataType: "json",
+        data: JSON.stringify({
+            "amount": money,
+            "authCode": authCode,
+            "subject": "门诊挂号",
+            "body": "门诊挂号收费"
+        }),
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        success: function (res) {
+            if (res.code === 9000) {
+                if(res.data && (res.data.state === 2 || res.data.orderState === 2)) {
+                    $("#traceNo").val(res.data.mchOrderNo);
+                    $("#outTraceNo").val(res.data.payOrderId);
+                    callback();
+                }
+            }
+        }
+    });
+}
+
 
 /**
  * 刷新列表,解决越来越快的问题
@@ -1686,7 +1714,8 @@ function saveMzyReqrec() {
                 "agtordnum": $("#qrCodeParam").val(),
                 "transDate": $("#transDate").val(),
                 "parChannel": $("#payChannel").val(),
-                "traceNo": $("#traceNo").val()
+                "traceNo": $("#traceNo").val(),
+                "outTraceNo": $("#outTraceNo").val()
             },
             "responceType": $("#patientsNature").val(),
             "mzyRequestId": mzyRequestId,

src/main/resources/static/js/mz/toll_administration.js

@@ -789,6 +789,7 @@ function queryParams(params) {
     } else if (payMarkGroup == 2) {
         temp.mzChargeDetail.payMark = 1;
     }
+    console.log('param=', temp)
     return temp;
 };
 

src/main/resources/templates/mz/registration.html

@@ -457,7 +457,7 @@
                             </label>
                             <div class="col-md-3 col-sm-3 col-xs-12">
                                 <input id="cash" class="form-control col-md-5 col-xs-12" type="number"
-                                       data-placement="bottom-right" min="0" onchange="checkFee()">
+                                       data-placement="bottom-right" min="0" onchange="checkFee()" readonly>
                             </div>
                             <!--<div class="col-md-4 col-sm-4 col-xs-12">
                                 <button type="button" class="btn btn-primary" id="addPayType">
@@ -478,6 +478,16 @@
                             </div>
                         </div>
                     </div>
+                    <div class="item form-group">
+                        <div class="col-md-12 col-sm-12 col-xs-12">
+                            <div class="col-md-2 col-sm-2 col-xs-12"></div>
+                            <label class="control-label col-md-3 col-sm-3 col-xs-12">付款码：
+                            </label>
+                            <div class="col-md-6 col-sm-6 col-xs-12">
+                                <input class="form-control col-md-5 col-xs-12" id="paymentCode" autocomplete="off"/>
+                            </div>
+                        </div>
+                    </div>
                 </form>
             </div>
             <div class="modal-footer">
@@ -492,9 +502,11 @@
                 <input type="hidden" id="transDate"/>
                 <!-- POS 支付渠道（CHANNEL_ALIPAY  支付宝，CHANNEL_WEPAY  微信，CHANNEL_DRAGONPAY  龙支付，CHANNEL_UNIONCODEPAY  银联二维码，CHANNEL_UNIONPAY  其他银行卡交易）-->
                 <input type="hidden" id="payChannel"/>
-                <!--凭证号-->
+                <!--凭证号（商户订单号）-->
                 <input type="hidden" id="traceNo"/>
-                <button type="button" class="btn btn-primary" id="consume">刷卡/扫码</button>
+                <!--支付系统订单号（外部生成）-->
+                <input type="hidden" id="outTraceNo"/>
+<!--                <button type="button" class="btn btn-primary" id="consume">刷卡/扫码</button>-->
                 <button type="button" class="btn btn-primary" id="saveConfirmFee">确定</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
             </div>