收银页面查询订单状态

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -1245,12 +1245,17 @@ public class OrderController {
             // 根据订单查询是什么支付方式
             OrderEntity order = orderService.queryObjectByOrderSn(orderSn);
             if(order == null){
-                return R.error("请输入正确的订单号");
+                return R.error("该订单不存在");
             }
             String payFlag = order.getPayFlag();
             if("alipay".equals(payFlag)){
                 AliPayMicropayApiResult aliPayMicropayApiResult = AliPayUtil.aliTradeQuery(orderSn, "");
-                return R.ok();
+                String tradeStatus = aliPayMicropayApiResult.getTradeStatus();
+                if(StringUtils.isBlank(tradeStatus)){
+                    return R.error("交易不存在");
+                }
+                return R.ok("订单号：" +orderSn + "支付方式为：支付宝支付，"+
+                        "订单支付状态："+tradeStatus);
             }else if("weixin".equals(payFlag)){
                 WechatRefundApiResult wechatRefundApiResult = WechatUtil.wxOrderQuery(orderSn);
                 String tradeState = wechatRefundApiResult.getTrade_state();
@@ -1258,7 +1263,8 @@ public class OrderController {
                 if(StringUtils.isBlank(tradeState)){
                     return R.error("交易不存在");
                 }
-                return R.ok("交易状态："+tradeState+"。 交易详情："+tradeStateDesc);
+                return R.ok("订单号：" +orderSn + "支付方式为：微信支付，"+
+                        "订单支付状态："+tradeState+"。 交易详情："+tradeStateDesc);
             }else{
                 return R.ok();
             }

kmall-admin/src/main/webapp/WEB-INF/page/sale/sale.html

@@ -39,9 +39,9 @@
 
                         <Row :gutter="16">
                             <ul class="nav navbar-top-links navbar-right" style="font-size: 1.3em;">
-<!--                                <li>-->
-<!--                                    <i-input v-model="orderSn" @on-enter="queryOrderStatus" placeholder="输入要查询的订单号" id="queryOrderStatus"  />-->
-<!--                                </li>-->
+                                <li>
+                                    <i-input v-model="orderSn" @on-enter="queryOrderStatus" placeholder="输入要查询的订单号" id="queryOrderStatus"  />
+                                </li>
                                 <li >
                                     <span style="margin-right: 40px">&nbsp; 门店：<b>{{storeName}}</b></span>
                                 </li>

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -578,8 +578,8 @@ let vm = new Vue({
         },2000),
 
         queryOrderStatus:function(){
-            $.get("../order/details/"+vm.orderSn, function (r) {
-
+            $.get("../order/queryOrderStatus/"+vm.orderSn, function (r) {
+                alert(r.msg);
             });
         },
         query: function () {