直邮需求新增修改

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

@@ -154,13 +154,7 @@ public class CategoryController {
         map.put("parentId", "0");
         ParamUtils.setQueryPowerByRoleType(map, "storeId", "merchSn", "thirdPartyMerchCode");
         List<CategoryEntity> list = categoryService.queryList(map);
-        List<CategoryEntity> categoryEntities = new ArrayList<>();
-        for (CategoryEntity e: list) {
-            if(e.getSortOrder() != 0){
-                categoryEntities.add(e);
-            }
-        }
-        return R.ok().put("list", categoryEntities);
+        return R.ok().put("list", list);
     }
 
     /**

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

@@ -731,7 +731,8 @@ public class OrderController {
 
         ExcelExport ee = new ExcelExport("订单信息");
 
-        String[] header = new String[]{"订单编号","商户订单编号", "所属门店", "订单状态", "SKU", "商品名称", "数量", "销售价", "实际支付金额", "保税模式", "快递公司名称", "快递单编号", "海关清单编号", "收货人姓名", "收件人手机", "收件人省份", "收件人城市", "收件人区县", "收件人地址", "下单时间", "支付流水号"};
+        String[] header = new String[]{"订单编号","商户订单编号", "所属门店", "订单状态", "SKU", "商品名称", "数量", "销售价", "实际支付金额", "保税模式", "快递公司名称", "快递单编号", "海关清单编号", "收货人姓名", "收件人手机", "收件人省份", "收件人城市", "收件人区县", "收件人地址", "下单时间", "支付流水号","身份证号"
+                ,"原产国","规格型号","品牌","单位","毛重(kg)","净重"};
 
         List<Map<String, Object>> list = new ArrayList<>();
         if (orderList != null && orderList.size() != 0) {
@@ -763,6 +764,13 @@ public class OrderController {
 
                 map.put("OrderStartTime", orderEntity.getOrderProcessRecord()==null?"":DateUtils.format(orderEntity.getOrderProcessRecord().getAddOrderStartTime(),"yyyy-MM-dd HH:mm:ss"));
                 map.put("PayId", orderEntity.getPayTransactionId());
+                map.put("IdNo", orderEntity.getIdNo());
+                map.put("OriCntCode", orderEntity.getOriCntCode());
+                map.put("CiqProdModel", orderEntity.getCiqProdModel());
+                map.put("Brand", orderEntity.getBrand());
+                map.put("UnitCode", orderEntity.getUnitCode());
+                map.put("GrossWeight", orderEntity.getGrossWeight());
+                map.put("NetWeight", orderEntity.getNetWeight());
 
                 list.add(map);
             }

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

@@ -182,6 +182,28 @@ public class GoodsEntity implements Serializable {
     private String thirdPartyMerchCode;
     private String isStockShare;
 
+    //毛重,kg
+    private BigDecimal grossWeight;
+
+    //净重,kg
+    private BigDecimal netWeight;
+
+    public BigDecimal getGrossWeight() {
+        return grossWeight;
+    }
+
+    public void setGrossWeight(BigDecimal grossWeight) {
+        this.grossWeight = grossWeight;
+    }
+
+    public BigDecimal getNetWeight() {
+        return netWeight;
+    }
+
+    public void setNetWeight(BigDecimal netWeight) {
+        this.netWeight = netWeight;
+    }
+
     public String getIsStockShare() {
         return isStockShare;
     }

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

@@ -149,6 +149,83 @@ public class OrderEntity implements Serializable {
 
     private String createrSn;
 
+    private String idNo;
+    //毛重,kg
+    private BigDecimal grossWeight;
+
+    //净重,kg
+    private BigDecimal netWeight;
+    //品牌
+    private String brand;
+    /**
+     * 国检规格型号
+     */
+    private String ciqProdModel;
+    /**
+     * 原产国代码，海关编码
+     */
+    private String oriCntCode;
+    /**
+     * 计量单位代码，参见海关编码
+     */
+    private String unitCode;
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public String getCiqProdModel() {
+        return ciqProdModel;
+    }
+
+    public void setCiqProdModel(String ciqProdModel) {
+        this.ciqProdModel = ciqProdModel;
+    }
+
+    public String getOriCntCode() {
+        return oriCntCode;
+    }
+
+    public void setOriCntCode(String oriCntCode) {
+        this.oriCntCode = oriCntCode;
+    }
+
+    public String getUnitCode() {
+        return unitCode;
+    }
+
+    public void setUnitCode(String unitCode) {
+        this.unitCode = unitCode;
+    }
+
+    public BigDecimal getGrossWeight() {
+        return grossWeight;
+    }
+
+    public void setGrossWeight(BigDecimal grossWeight) {
+        this.grossWeight = grossWeight;
+    }
+
+    public BigDecimal getNetWeight() {
+        return netWeight;
+    }
+
+    public void setNetWeight(BigDecimal netWeight) {
+        this.netWeight = netWeight;
+    }
+
+    public String getIdNo() {
+        return idNo;
+    }
+
+    public void setIdNo(String idNo) {
+        this.idNo = idNo;
+    }
+
     public String getModerSn() {
         return moderSn;
     }

kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/MkDistHierServiceImpl.java

@@ -342,17 +342,23 @@ public class MkDistHierServiceImpl implements MkDistHierService {
 
     @Override
     public int deleteBatch(Integer[] distHierIds) {
-        for(int j=0; j<distHierIds.length; j++) {
-            MkDistHierEntity hierEntity = mkDistHierDao.queryObject(distHierIds[j]);
+        List<String> hierNameList = new ArrayList<>();
+        List<String> allocationSizeList = new ArrayList<>();
+        for(int i=0; i<distHierIds.length; i++) {
+            MkDistHierEntity hierEntity = mkDistHierDao.queryObject(distHierIds[i]);
             //查询该分销层级关系是否已与渠道销售分配信息关联
             Map<String, Object> allocationMap = new HashMap<>();
             allocationMap.put("distChnlId", hierEntity.getDistChnlId());
             allocationMap.put("distId", hierEntity.getDistId());
-            List<MkDistSellAllocationEntity> allocationEntityList =  mkDistSellAllocationDao.queryAllocationByMap(allocationMap);
+            List<MkDistSellAllocationEntity> allocationEntityList = mkDistSellAllocationDao.queryAllocationByMap(allocationMap);
             if(allocationEntityList != null && allocationEntityList.size() > 0){
-                throw new RRException("当前删除的分销层级关系已与渠道销售分配信息关联，请勿删除");
+                hierNameList.add(hierEntity.getDistHierName());
+                allocationSizeList.add(allocationEntityList.size()+"条");
             }
         }
+        if(hierNameList != null && hierNameList.size() > 0){
+            throw new RRException("当前删除的层级名称【"+hierNameList.get(0)+"】的分销层级关系已创建【"+allocationSizeList.get(0)+"】渠道销售分配信息关联，请勿删除");
+        }
         return mkDistHierDao.deleteBatch(distHierIds);
     }
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/MkDistSellAllocationServiceImpl.java

@@ -18,10 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 渠道销售分配，分销商针对某个商品sku的销售分配Service实现类
@@ -49,6 +46,8 @@ public class MkDistSellAllocationServiceImpl implements MkDistSellAllocationServ
     private ProductStoreRelaDao productStoreRelaDao;
     @Autowired
     private MkDistSellAllocationHistoryDao mkDistSellAllocationHistoryDao;
+    @Autowired
+    private MkDistSellStatisDao mkDistSellStatisDao;
 
     @Override
     public MkDistSellAllocationEntity queryObject(Integer sellAllocId) {
@@ -298,7 +297,30 @@ public class MkDistSellAllocationServiceImpl implements MkDistSellAllocationServ
     }
 
     @Override
-    public int deleteBatch(Integer[]sellAllocIds) {
+    public int deleteBatch(Integer[] sellAllocIds) {
+        List<String> storeList = new ArrayList<>();
+        List<String> goodsList = new ArrayList<>();
+        List<String> statisSizeList = new ArrayList<>();
+        for (int i = 0; i < sellAllocIds.length; i++){
+            MkDistSellAllocationEntity allocationEntity = mkDistSellAllocationDao.queryObject(sellAllocIds[i]);
+            Map map = new HashMap();
+            map.put("thirdMerchSn", allocationEntity.getThirdMerchSn());
+            map.put("distChnlId", allocationEntity.getDistChnlId());
+            map.put("distId", allocationEntity.getDistId());
+            map.put("storeId", allocationEntity.getStoreId());
+            map.put("goodsId", allocationEntity.getGoodsId());
+            List<MkDistSellStatisEntity> statisEntityList = mkDistSellStatisDao.queryList(map);
+            if(statisEntityList != null && statisEntityList.size() > 0){
+                StoreEntity storeEntity = storeDao.queryObject(allocationEntity.getStoreId());
+                GoodsEntity goodsEntity = goodsDao.queryObject(allocationEntity.getGoodsId());
+                storeList.add(storeEntity.getStoreName());
+                goodsList.add(goodsEntity.getName());
+                statisSizeList.add(statisEntityList.size()+"条");
+            }
+        }
+        if(storeList != null && storeList.size() > 0){
+            throw new RRException("当前删除的对应门店【"+storeList+"】商品【"+goodsList+"】的分配信息已生成【"+statisSizeList+"】出货订单（销售统计数据），请勿删除！");
+        }
         return mkDistSellAllocationDao.deleteBatch(sellAllocIds);
     }
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/MkDistServiceImpl.java

@@ -1,13 +1,16 @@
 package com.kmall.admin.service.impl.mk;
 
 import com.kmall.admin.dao.mk.MkDistDao;
+import com.kmall.admin.dao.mk.MkDistHierDao;
 import com.kmall.admin.entity.mk.MkDistEntity;
+import com.kmall.admin.entity.mk.MkDistHierEntity;
 import com.kmall.admin.service.mk.MkDistService;
 import com.kmall.admin.utils.ShiroUtils;
 import com.kmall.common.utils.RRException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -23,6 +26,8 @@ import java.util.Map;
 public class MkDistServiceImpl implements MkDistService {
     @Autowired
     private MkDistDao mkDistDao;
+    @Autowired
+    private MkDistHierDao mkDistHierDao;
 
     @Override
     public MkDistEntity queryObject(Integer distId) {
@@ -86,7 +91,18 @@ public class MkDistServiceImpl implements MkDistService {
     }
 
     @Override
-    public int deleteBatch(Integer[]distIds) {
+    public int deleteBatch(Integer[] distIds) {
+        List<String> distNameList = new ArrayList<>();
+        for (int i=0; i<distIds.length;i++){
+            MkDistHierEntity mkDistHierEntity = mkDistHierDao.selectDistHierByDistId(distIds[i]);
+            if (mkDistHierEntity != null) {
+                MkDistEntity mkDistEntity = mkDistDao.queryObject(distIds[i]);
+                distNameList.add(mkDistEntity.getDistName());
+            }
+        }
+        if(distNameList.size() > 0 ){
+            throw new RRException("当前删除的分销商"+distNameList+"已创建层级关系，不能删除");
+        }
         return mkDistDao.deleteBatch(distIds);
     }
 }

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

@@ -64,6 +64,9 @@
         <result column="storeRetailPrice" property="storeRetailPrice" />
         <result column="third_party_merch_code" property="thirdPartyMerchCode" />
         <result column="isStockShare" property="isStockShare" />
+        <result column="gross_weight" property="grossWeight" />
+        <result column="net_weight" property="netWeight" />
+
     </resultMap>
 
     <select id="queryObject" resultType="com.kmall.admin.entity.GoodsEntity">
@@ -294,6 +297,8 @@
 			`promotion_tag`,
 			`app_exclusive_price`,
 			`is_app_exclusive`,
+            `gross_weight`,
+            `net_weight`,
 			`is_limited`,
 			`is_hot`,
 			`creater_sn`,
@@ -339,6 +344,8 @@
 			#{promotionTag},
 			#{appExclusivePrice},
 			#{isAppExclusive},
+            #{grossWeight},
+            #{netWeight},
 			#{isLimited},
 			#{isHot},
 			#{createrSn},
@@ -388,6 +395,8 @@
             <if test="promotionTag != null">`promotion_tag` = #{promotionTag}, </if>
             <if test="appExclusivePrice != null">`app_exclusive_price` = #{appExclusivePrice}, </if>
             <if test="isAppExclusive != null">`is_app_exclusive` = #{isAppExclusive}, </if>
+            <if test="grossWeight != null">`gross_weight` = #{grossWeight}, </if>
+            <if test="netWeight != null">`net_weight` = #{netWeight}, </if>
             <if test="isLimited != null">`is_limited` = #{isLimited}, </if>
             <if test="isHot != null">`is_hot` = #{isHot}, </if>
             <if test="createrSn != null">`creater_sn` = #{createrSn}, </if>

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

@@ -63,6 +63,12 @@
         <result property="payTransactionId" column="pay_transaction_id"/>
         <result property="storeName" column="store_name"/>
         <result property="moderSn" column="moder_sn"/>
+        <result property="unitCode" column="unit_code"/>
+        <result property="ciqProdModel" column="ciq_prod_model"/>
+        <result property="oriCntCode" column="ori_cnt_code"/>
+        <result property="brand" column="brand"/>
+        <result column="gross_weight" property="grossWeight" />
+        <result column="net_weight" property="netWeight" />
     </resultMap>
 
     <select id="queryObject" resultType="com.kmall.admin.entity.OrderEntity">
@@ -96,7 +102,29 @@
 
     <select id="queryList" resultType="com.kmall.admin.entity.OrderEntity">
         SELECT
-        o.*,
+        o.order_sn,
+        o.merch_order_sn,
+        o.order_status,
+        o.actual_price,
+        o.order_biz_type,
+        o.shipping_no,
+        o.shipping_name,
+        o.shipping_code,
+        o.consignee,
+        o.mobile,
+        o.province,
+        o.city,
+        o.district,
+        o.address,
+        o.add_time,
+        o.pay_id,
+        o.pay_status,
+        o.shipping_status,
+        o.is_merge_pay,
+        o.buyer_pay_check,
+        o.order_price,
+        o.moder_sn,
+        o.id,
         u.username AS username,
         p.is_payment_send,
         p.is_ele_order_send,
@@ -120,6 +148,9 @@
         <if test="thirdPartyMerchCode != null and thirdPartyMerchCode.trim() != ''">
             AND s.third_party_merch_code = #{thirdPartyMerchCode}
         </if>
+        <if test="orderBizType != null and orderBizType != ''">
+            AND o.order_biz_type = #{orderBizType}
+        </if>
         <if test="merchOrderSn != null and merchOrderSn.trim() != ''">
             AND o.merch_order_sn = #{merchOrderSn}
         </if>
@@ -155,7 +186,7 @@
                 order by ${sidx} ${order}
             </when>
             <otherwise>
-                order by id desc
+                order by o.id desc
             </otherwise>
         </choose>
         <if test="offset != null and limit != null">
@@ -165,23 +196,50 @@
 
     <select id="queryExportList" resultType="com.kmall.admin.entity.OrderEntity">
         SELECT
-            o.*,
-            u.username AS username,
-            p.is_payment_send,
-            p.is_ele_order_send,
-            p.is_customs_send,
-            g.sku,
-            g.goods_name,
-            g.number,
-            g.retail_price,
-            s.store_name
+        o.order_sn,
+        o.merch_order_sn,
+        o.order_status,
+        o.actual_price,
+        o.order_biz_type,
+        o.shipping_no,
+        o.shipping_name,
+        o.shipping_code,
+        o.consignee,
+        o.mobile,
+        o.province,
+        o.city,
+        o.district,
+        o.address,
+        o.add_time,
+        o.pay_id,
+        o.pay_transaction_id,
+        u.id_no 'idNo',
+        u.username AS username,
+        p.is_payment_send,
+        p.is_ele_order_send,
+        p.is_customs_send,
+        g.sku,
+        g.goods_name,
+        g.number,
+        g.retail_price,
+        s.store_name,
+        nc.NAME ori_cnt_code,
+        good.ciq_prod_model,
+        good.brand,
+        uc.NAME unit_code,
+        good.gross_weight * g.number gross_weight,
+        good.net_weight * g.number net_weight
         FROM
-          mall_order o
+        mall_order o
         LEFT JOIN mall_user u ON o.user_id = u.id
         LEFT JOIN mall_order_process_record p ON o.order_sn = p.order_sn
-        Left join mall_order_goods g on o.id = g.order_id
-        left join mall_store s on o.store_id = s.id
-        WHERE 1=1
+        LEFT JOIN mall_order_goods g ON o.id = g.order_id
+        LEFT JOIN mall_store s ON o.store_id = s.id
+        LEFT JOIN mall_goods good ON good.id = g.goods_id
+        LEFT JOIN sys_cus_nation_code nc ON nc.CODE = good.ori_cnt_code
+        LEFT JOIN sys_cus_unit_code uc ON uc.CODE = good.unit_code
+        WHERE
+        1 =1
         <if test="startTime != null and startTime != ''">
             AND o.add_time <![CDATA[ >  ]]> #{startTime}
         </if>
@@ -191,6 +249,9 @@
         <if test="storeId != null and storeId != ''">
             AND o.store_id = #{storeId}
         </if>
+        <if test="orderBizType != null and orderBizType != ''">
+            AND o.order_biz_type = #{orderBizType}
+        </if>
         <if test="thirdPartyMerchCode != null and thirdPartyMerchCode.trim() != ''">
             AND s.third_party_merch_code = #{thirdPartyMerchCode}
         </if>
@@ -229,7 +290,7 @@
                 order by ${sidx} ${order}
             </when>
             <otherwise>
-                order by id desc
+                order by o.id desc
             </otherwise>
         </choose>
         <if test="offset != null and limit != null">
@@ -252,6 +313,9 @@
         <if test="thirdPartyMerchCode != null and thirdPartyMerchCode.trim() != ''">
             AND s.third_party_merch_code = #{thirdPartyMerchCode}
         </if>
+        <if test="orderBizType != null and orderBizType != ''">
+            AND o.order_biz_type = #{orderBizType}
+        </if>
         <if test="merchOrderSn != null and merchOrderSn.trim() != ''">
             AND o.merch_order_sn = #{merchOrderSn}
         </if>

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

@@ -215,7 +215,8 @@
                         <!--<Input-number :min="0.01" :step="0.01" v-model="goods.retailPrice" placeholder="零售价" style="width: 268px;"/>-->
                     <!--</Form-item>-->
                     <Form-item label="商品库存" prop="goodsNumber" v-show="isStockShare">
-                        <i-input v-model="goods.goodsNumber" placeholder="商品库存" style="width: 268px;"/>
+                        <!--<i-input v-model="goods.goodsNumber" placeholder="商品库存" style="width: 268px;"/>-->
+                        <Input-number :min="1" :step="1" v-model="goods.goodsNumber" placeholder="商品库存" style="width: 268px;"/>
                     </Form-item>
                     <Form-item label="商品税率（0.00）" prop="goodsRate">
                         <Input-number :min="0.001" :step="0.001" v-model="goods.goodsRate" placeholder="商品税率" style="width: 268px;"/>
@@ -317,8 +318,7 @@
                     <Form-item label="计量单位" prop="unitCode">
                         <i-select v-model="goods.unitCode" filterable placeholder="计量单位"
                                   label-in-value>
-                            <i-option v-for="cusUnitCode in cusUnitCodeList" :value="cusUnitCode.code" :key="cusUnitCode.sn">{{cusUnitCode.name}}
-                            </i-option>
+                            <i-option v-for="cusUnitCode in cusUnitCodeList" :value="cusUnitCode.code" :key="cusUnitCode.sn">{{cusUnitCode.name}}</i-option>
                         </i-select>
                     </Form-item>
                     <Form-item label="海关商品编码" prop="cusGoodsCode">
@@ -330,13 +330,18 @@
                     <Form-item label="原产国" prop="oriCntCode">
                         <i-select v-model="goods.oriCntCode" filterable placeholder="原产国"
                                   label-in-value>
-                            <i-option v-for="cusNationCode in cusNationCodeList" :value="cusNationCode.code" :key="cusNationCode.sn">{{cusNationCode.name}}
-                            </i-option>
+                            <i-option v-for="cusNationCode in cusNationCodeList" :value="cusNationCode.code" :key="cusNationCode.sn">{{cusNationCode.name}}</i-option>
                         </i-select>
                     </Form-item>
                     <Form-item label="海关申报要素" prop="cusDeclEle">
                         <i-input v-model="goods.cusDeclEle" placeholder="海关申报要素"/>
                     </Form-item>
+                <Form-item label="毛重,kg" prop="grossWeight">
+                    <Input-number :min="0" :step="0" v-model="goods.grossWeight" placeholder="毛重" style="width: 268px;"/>
+                </Form-item>
+                <Form-item label="净重,kg" prop="netWeight">
+                    <Input-number :min="0" :step="0" v-model="goods.netWeight" placeholder="净重" style="width: 268px;"/>
+                </Form-item>
                 <!--</i-form>-->
             </Tab-Pane>
             <!--<Tab-Pane label="规格" name="name3">

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

@@ -22,7 +22,14 @@
                 <i-col span="3">
                     <i-input v-model="q.merchOrderSn" @on-enter="query" placeholder="商户订单号"/>
                 </i-col>
-                <i-col span="3">
+                <i-col span="2">
+                    <i-select v-model="q.orderBizType" placeholder="货品业务类型">
+                        <i-option v-for="macro in orderBizTypeList" :value="macro.value" :key="macro.id">{{macro.name}}
+                        </i-option>
+                        <!--<i-option value="402">完成</i-option>-->
+                    </i-select>
+                </i-col>
+                <i-col span="2">
                     <i-select v-model="q.orderStatus" placeholder="订单状态">
                         <i-option v-for="macro in orderStatusList" :value="macro.value" :key="macro.id">{{macro.name}}
                         </i-option>

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

@@ -6,6 +6,7 @@ $(function () {
     let startTime = getQueryString("startTime");
     let endTime = getQueryString("endTime");
     let storeId = getQueryString("storeId");
+    let orderBizType = getQueryString("orderBizType");
     let url = '../order/list?1';
     if (shippingStatus) {
         url += '&shippingStatus=' + shippingStatus;
@@ -28,6 +29,9 @@ $(function () {
     if (storeId) {
         url += '&storeId=' + storeId;
     }
+    if (orderBizType) {
+        url += '&orderBizType=' + orderBizType;
+    }
     $("#jqGrid").jqGrid({
         url: url,
         datatype: "json",
@@ -214,7 +218,8 @@ let vm = new Vue({
             startTime: '',
             endTime: '',
             storeId: '',
-            payStatus:''
+            payStatus:'',
+            orderBizType:''
         },
         refundMoney: 0,
         shipping: {},
@@ -233,7 +238,8 @@ let vm = new Vue({
             /*name: [
                 {required: true, message: '名称不能为空', trigger: 'blur'}
             ]*/
-        }
+        },
+        orderBizTypeList:[]
     },
     methods: {
         query: function () {
@@ -381,7 +387,8 @@ let vm = new Vue({
                     'startTime': vm.q.startTime,
                     'endTime': vm.q.endTime,
                     'storeId': vm.q.storeId,
-                    'payStatus': vm.q.payStatus
+                    'payStatus': vm.q.payStatus,
+                    'orderBizType': vm.q.orderBizType
                 },
                 page: page
             }).trigger("reloadGrid");
@@ -394,7 +401,8 @@ let vm = new Vue({
                 startTime: '',
                 endTime: '',
                 storeId: '',
-                payStatus: ''
+                payStatus: '',
+                orderBizType: ''
             };
         },
         lookDetail: function (rowId) { //第三步：定义编辑操作
@@ -496,7 +504,8 @@ 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.storeId = vm.q.storeId,params.payStatus = vm.q.payStatus;
+                , params.startTime = vm.q.startTime, params.endTime = vm.q.endTime, params.storeId = vm.q.storeId,params.payStatus = vm.q.payStatus,
+                params.orderBizType = vm.q.orderBizType;
 
             exportFile('#rrapp', '../order/export', params);
             /*$.ajax({
@@ -530,6 +539,9 @@ let vm = new Vue({
         $.get("../sys/macro/queryMacrosByValue?value=payStatus", function (r) {
             vm.payStatusList = r.list;
         });
+        $.get("../sys/macro/queryMacrosByValue?value=goodsBizType", function (r) {
+            vm.orderBizTypeList = r.list;
+        });
     }
 });