修复小票查询小票号显示错误

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

@@ -412,11 +412,13 @@
         o.actual_price,
         o.order_price,
         o.pay_time,
-        o.pay_flag
+        o.pay_flag,
+        c.pick_up_code_sn
         from mall_order o
         LEFT JOIN mall_store s on o.store_id = s.id
         LEFT JOIN mall_order_goods g ON o.id = g.order_id
         LEFT JOIN mall_user u ON o.user_id = u.id
+        LEFT JOIN mall_pick_up_code c on c.order_sn = o.order_sn
         WHERE 1=1
         <if test="storeId != null and storeId != ''">
             AND o.store_id = #{storeId}

kmall-admin/src/main/webapp/js/receipt/receiptCheck.js

@@ -21,7 +21,7 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '小票号', name: 'orderSn', index: 'order_sn', align: 'center',width: 120},
+            {label: '小票号', name: 'pickUpCodeSn', index: 'pick_up_code_sn', align: 'center',width: 120},
             {label: '订单号', name: 'orderSn', index: 'order_sn', align: 'center',width: 120},
             {label: '门店地址', name: 'storeName', index: 'storeName', align: 'center',width: 150},
             {label: '操作店员', name: 'userName', index: 'userName', align: 'center',width: 80},