Merge branch 'master' of hyq/kmall-pt into master

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

@@ -731,7 +731,7 @@ public class OrderController {
 
         ExcelExport ee = new ExcelExport("订单信息");
 
-        String[] header = new String[]{"订单编号","商户订单编号", "订单状态", "SKU", "商品名称", "数量", "销售价", "实际支付金额", "保税模式", "快递公司名称", "快递单编号", "海关清单编号", "收货人姓名", "收件人手机", "收件人省份", "收件人城市", "收件人区县", "收件人地址", "下单时间", "支付流水号"};
+        String[] header = new String[]{"订单编号","商户订单编号", "所属门店", "订单状态", "SKU", "商品名称", "数量", "销售价", "实际支付金额", "保税模式", "快递公司名称", "快递单编号", "海关清单编号", "收货人姓名", "收件人手机", "收件人省份", "收件人城市", "收件人区县", "收件人地址", "下单时间", "支付流水号"};
 
         List<Map<String, Object>> list = new ArrayList<>();
         if (orderList != null && orderList.size() != 0) {
@@ -742,6 +742,7 @@ public class OrderController {
 
                 map.put("OrderSn", orderEntity.getOrderSn());
                 map.put("MerchOrderSn", orderEntity.getMerchOrderSn());
+                map.put("StoreName", orderEntity.getStoreName());
                 map.put("OrderStatus", StringUtils.isEmpty(orderStatus.toString())? "":Dict.orderStatus.valueOf("item_"+ orderStatus).getItemName());
                 map.put("SKU", orderEntity.getSku());
                 map.put("GoodsName", orderEntity.getGoodsName());

kmall-admin/src/main/java/com/kmall/admin/entity/OrderEntity.java

@@ -143,6 +143,16 @@ public class OrderEntity implements Serializable {
 
     private String payTransactionId;
 
+    private String storeName;
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
     public String getPayTransactionId() {
         return payTransactionId;
     }

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

@@ -61,6 +61,7 @@
         <result property="orderSnWx" column="order_sn_wx"/>
         <result property="isMergePay" column="is_merge_pay"/>
         <result property="payTransactionId" column="pay_transaction_id"/>
+        <result property="storeName" column="store_name"/>
     </resultMap>
 
     <select id="queryObject" resultType="com.kmall.admin.entity.OrderEntity">
@@ -98,7 +99,8 @@
         u.username AS username,
         p.is_payment_send,
         p.is_ele_order_send,
-        p.is_customs_send
+        p.is_customs_send,
+        s.store_name
         FROM
         mall_order o
         LEFT JOIN mall_user u ON o.user_id = u.id
@@ -126,10 +128,10 @@
         <if test="orderSn != null and orderSn.trim() != ''">
             AND o.order_sn LIKE concat('%',#{orderSn},'%')
         </if>
-        <if test="shippingStatus != null">
+        <if test="shippingStatus != null and shippingStatus.trim() != ''">
             AND o.shipping_status = #{shippingStatus}
         </if>
-        <if test="payStatus != null">
+        <if test="payStatus != null and payStatus.trim() != ''">
             AND o.pay_status = #{payStatus}
         </if>
         <if test="orderStatus != null and orderStatus.trim() != ''">
@@ -170,7 +172,8 @@
             g.sku,
             g.goods_name,
             g.number,
-            g.retail_price
+            g.retail_price,
+            s.store_name
         FROM
           mall_order o
         LEFT JOIN mall_user u ON o.user_id = u.id
@@ -199,10 +202,10 @@
         <if test="orderSn != null and orderSn.trim() != ''">
             AND o.order_sn LIKE concat('%',#{orderSn},'%')
         </if>
-        <if test="shippingStatus != null">
+        <if test="shippingStatus != null and shippingStatus.trim() != ''">
             AND o.shipping_status = #{shippingStatus}
         </if>
-        <if test="payStatus != null">
+        <if test="payStatus != null and payStatus.trim() != ''">
             AND o.pay_status = #{payStatus}
         </if>
         <if test="orderStatus != null and orderStatus.trim() != ''">
@@ -257,10 +260,10 @@
         <if test="orderSn != null and orderSn.trim() != ''">
             AND o.order_sn LIKE concat('%',#{orderSn},'%')
         </if>
-        <if test="shippingStatus != null">
+        <if test="shippingStatus != null and shippingStatus.trim() != ''">
             AND o.shipping_status = #{shippingStatus}
         </if>
-        <if test="payStatus != null">
+        <if test="payStatus != null and payStatus.trim() != ''">
             AND o.pay_status = #{payStatus}
         </if>
         <if test="orderStatus != null and orderStatus.trim() != ''">
@@ -304,10 +307,10 @@
         <if test="orderSn != null and orderSn.trim() != ''">
             AND o.order_sn LIKE concat('%',#{orderSn},'%')
         </if>
-        <if test="shippingStatus != null">
+        <if test="shippingStatus != null and shippingStatus.trim() != ''">
             AND o.shipping_status = #{shippingStatus}
         </if>
-        <if test="payStatus != null">
+        <if test="payStatus != null and payStatus.trim() != ''">
             AND o.pay_status = #{payStatus}
         </if>
         <if test="orderStatus != null and orderStatus.trim() != ''">

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

@@ -10,6 +10,13 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="3">
+                    <i-select v-model="q.storeId" placeholder="门店" filterable label-in-value>
+                        <i-option v-for="store in stores" :value="store.id"
+                                  :key="store.id">{{store.storeName}}
+                        </i-option>
+                    </i-select>
+                </i-col>
+                <i-col span="3">
                     <i-input v-model="q.orderSn" @on-enter="query" placeholder="订单号"/>
                 </i-col>
                 <i-col span="3">
@@ -17,16 +24,17 @@
                 </i-col>
                 <i-col span="3">
                     <i-select v-model="q.orderStatus" placeholder="订单状态">
-                        <i-option value="0">待付款</i-option>
-                        <i-option value="101">订单已取消</i-option>
-                        <i-option value="102">订单已删除</i-option>
-                        <i-option value="201">订单已付款</i-option>
-                        <i-option value="300">订单已发货</i-option>
-                        <i-option value="301">用户确认收货</i-option>
-                        <i-option value="401">退款</i-option>
+                        <i-option v-for="macro in orderStatusList" :value="macro.value" :key="macro.id">{{macro.name}}
+                        </i-option>
                         <!--<i-option value="402">完成</i-option>-->
                     </i-select>
                 </i-col>
+                <i-col span="3">
+                    <i-select v-model="q.payStatus" placeholder="支付状态">
+                        <i-option v-for="macro in payStatusList" :value="macro.value" :key="macro.id">{{macro.name}}
+                        </i-option>
+                    </i-select>
+                </i-col>
                 <!--<i-col span="4">
                     <i-select v-model="q.orderType">
                         <i-option value="1">普通订单</i-option>
@@ -42,7 +50,7 @@
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
-            <div class="buttons-group">
+            <div class="buttons-group" style="float: left">
                 #if($shiro.hasPermission("order:export"))
                 <i-button type="primary" @click="exportOrder"><i class="fa fa-cloud-download"></i>&nbsp;导出</i-button>
                 #end

kmall-admin/src/main/webapp/js/shop/order.js

@@ -1,14 +1,15 @@
 $(function () {
-    let shippingStatus = getQueryString("shippingStatus");
+    // let shippingStatus = getQueryString("shippingStatus");
     let payStatus = getQueryString("payStatus");
     let orderStatus = getQueryString("orderStatus");
     let merchOrderSn = getQueryString("merchOrderSn");
     let startTime = getQueryString("startTime");
     let endTime = getQueryString("endTime");
+    let storeId = getQueryString("storeId");
     let url = '../order/list?1';
-    if (shippingStatus) {
-        url += '&shippingStatus=' + shippingStatus;
-    }
+    // if (shippingStatus) {
+    //     url += '&shippingStatus=' + shippingStatus;
+    // }
     if (payStatus) {
         url += '&payStatus=' + payStatus;
     }
@@ -24,11 +25,15 @@ $(function () {
     if (endTime) {
         url += '&endTime=' + endTime;
     }
+    if (storeId) {
+        url += '&storeId=' + storeId;
+    }
     $("#jqGrid").jqGrid({
         url: url,
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
+            {label: '所属门店', name: 'storeName', index: 'storeName', width: 80},
             {label: '订单号', name: 'orderSn', index: 'order_sn', width: 100},
             {label: '会员', name: 'userName', index: 'user_name', width: 80},
             {label: '支付类型', name: 'isMergePay', index: 'is_merge_pay', width: 60,
@@ -122,6 +127,7 @@ $(function () {
             {
                 label: '下单时间', name: 'addTime', index: 'add_time', width: 120,
                 formatter: function (value) {
+                    console.log(value);
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }
             },
@@ -168,7 +174,7 @@ $(function () {
             }
         ],
         viewrecords: true,
-        height: 675,
+        height: 550,
         rowNum: 10,
         rowList: [10, 30, 50],
         rownumbers: true,
@@ -205,7 +211,9 @@ let vm = new Vue({
             orderStatus: '',
             merchOrderSn: '',
             startTime: '',
-            endTime: ''
+            endTime: '',
+            storeId: '',
+            payStatus:''
         },
         refundMoney: 0,
         shipping: {},
@@ -216,7 +224,10 @@ let vm = new Vue({
         },
         macros: [],
         orderProcessRecordEntity: {},
-        orderGoodsList: []
+        orderGoodsList: [],
+        stores: [],
+        orderStatusList:[],
+        payStatusList:[]
     },
     methods: {
         query: function () {
@@ -329,7 +340,9 @@ let vm = new Vue({
                     'orderStatus': vm.q.orderStatus,
                     'merchOrderSn': vm.q.merchOrderSn,
                     'startTime': vm.q.startTime,
-                    'endTime': vm.q.endTime
+                    'endTime': vm.q.endTime,
+                    'storeId': vm.q.storeId,
+                    'payStatus': vm.q.payStatus
                 },
                 page: page
             }).trigger("reloadGrid");
@@ -340,7 +353,9 @@ let vm = new Vue({
                 orderStatus: '',
                 merchOrderSn: '',
                 startTime: '',
-                endTime: ''
+                endTime: '',
+                storeId: '',
+                payStatus: ''
             };
         },
         lookDetail: function (rowId) { //第三步：定义编辑操作
@@ -442,7 +457,7 @@ let vm = new Vue({
         exportOrder: function() {
             var params = {};
             params.orderSn = vm.q.orderSn, params.orderStatus = vm.q.orderStatus, params.merchOrderSn = vm.q.merchOrderSn
-                , params.startTime = vm.q.startTime, params.endTime = vm.q.endTime;
+                , params.startTime = vm.q.startTime, params.endTime = vm.q.endTime, params.storeId = vm.q.storeId,params.payStatus = vm.q.payStatus;
 
             exportFile('#rrapp', '../order/export', params);
             /*$.ajax({
@@ -465,6 +480,17 @@ let vm = new Vue({
         $.get("../shipping/queryAll", function (r) {
             vm.shippings = r.list;
         });
+    },
+    mounted() {
+        $.get("../store/queryAll", function (r) {
+            vm.stores = r.list;
+        });
+        $.get("../sys/macro/queryMacrosByValue?value=orderStatus", function (r) {
+            vm.orderStatusList = r.list;
+        });
+        $.get("../sys/macro/queryMacrosByValue?value=payStatus", function (r) {
+            vm.payStatusList = r.list;
+        });
     }
 });