Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

kmall-admin/src/main/resources/mybatis/mapper/OrderDao.xml

@@ -108,7 +108,10 @@
     </select>
 
     <select id="queryObjectByOrderSn" resultType="com.kmall.admin.entity.OrderEntity">
-        select * from mall_order a where order_sn = #{orderSn}
+        select o.*,c.pick_up_code_sn
+        from mall_order o
+        left join mall_pick_up_code c
+        on c.order_sn = o.order_sn where o.order_sn = #{orderSn}
     </select>
 
     <select id="queryList" resultType="com.kmall.admin.entity.OrderEntity">

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

@@ -227,7 +227,6 @@
                             <h4 class="modal-title" id="orderDetailLabel">订单详情</h4>
                         </div>
                         <div class="modal-body">
-
                                 <div class="row" style="border:0">
                                     <div class="col-md-3" id="orderNo">订单编号: {{orderEntity.orderSn}}</div>
                                     <div class="col-md-3" id="serialNumber">支付流水号: <span>{{orderProcessRecord.payTransactionId}}</span></div>
@@ -272,6 +271,11 @@
                                 <div class="col-md-3" id="orderTaxes">订单预估税费: {{tax}}</div>
                             </div>
                             <div class="row" style="border:0">
+                                <div class="col-md-3" id="payName">姓名: {{orderEntity.payName}}</div>
+                                <div class="col-md-3" id="mobile">手机号: {{orderEntity.payMobile}}</div>
+                                <div class="col-md-3" id="pickUpCodeSn">取货码: {{orderEntity.pickUpCodeSn}}</div>
+                            </div>
+                            <div class="row" style="border:0">
                                 <div class="col-md-12" id="invetoryReceipt">失败原因: {{response}}</div>
                             </div>
                             <table id="goodsDetailTable" class="table .table-striped" style="margin-top: 50px;">

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

@@ -928,7 +928,7 @@ let vm = new Vue({
 
         },
         queryOrderDetail:function(orderSn,pickUpCode){
-            var storeId = sessionStorage.getItem("storeId");;
+            var storeId = sessionStorage.getItem("storeId");
             $.get("../order/orderDetail/"+orderSn, function (r) {
                 if (r.code == 0) {
                     vm.orderProcessRecord = r.resultObj.orderProcessRecordEntity;