后台改

lb-module/src/main/java/com/ydd/module/dto/SystemMerchantDto.java

@@ -0,0 +1,253 @@
+package com.ydd.module.dto;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ydd.common.annotation.Excel;
+import com.ydd.module.domain.Agent;
+import com.ydd.module.domain.MerchantDeliveryFee;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Demo class
+ *
+ * @author 14027
+ * @date 2022/3/16 10:50
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+public class SystemMerchantDto implements Serializable {
+
+  /** 客户商家 */
+    @TableId(value = "id")
+    private Long id;
+
+    /** 商家名称 */
+    @Excel(name = "商家名称")
+    private String merchantName;
+
+    /** 代理商Id */
+    @Excel(name = "代理商Id")
+    private Long agentId;
+
+    /** 所属代理商员工 */
+    @Excel(name = "所属代理商员工")
+    private Long personnelId;
+
+    /** 省id */
+    @Excel(name = "省id")
+    private Long provinceId;
+
+    /** 市id */
+    @Excel(name = "市id")
+    private Long cityId;
+
+    /** 区县ID */
+    @Excel(name = "区县ID")
+    private Long districtId;
+
+    /** 所在省 */
+    @ApiModelProperty(value = "所在省")
+    private String provinceName;
+
+    /** 所在城市 */
+    @ApiModelProperty(value = "所在城市")
+    private String cityName;
+
+    /** 所在区 */
+    @ApiModelProperty(value = "所在区")
+    private String districtName;
+
+    @ApiModelProperty(value = "城市code")
+    private String cityCode;
+
+    /** 商家类型 1->单店,2->连锁店 */
+    @Excel(name = "商家类型 1->单店,2->连锁店")
+    private Integer merchantType;
+
+    /** 商户营业执照类型 1->个体， 3->公司 */
+    @Excel(name = "商户营业执照类型 1->个体， 3->公司")
+    private Integer licenseType;
+
+    /** 商家分类ID */
+    @Excel(name = "商家分类ID")
+    private Long categoryId;
+
+    /** 商家LOGO */
+    @Excel(name = "商家LOGO")
+    private String logo;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String contactName;
+
+    /** 手机号码 */
+    @Excel(name = "手机号码")
+    private String mobile;
+
+    private String code;
+
+    /** 商家介绍 */
+    @Excel(name = "商家介绍")
+    private String intro;
+
+    /** 商家图片集, 多张图片用逗号分隔 */
+    @Excel(name = "商家图片集, 多张图片用逗号分隔")
+    private String photoAlbum;
+
+    /** 营业执照 */
+    @Excel(name = "营业执照")
+    private String bizLicense;
+
+    /** 营业执照号码 */
+    @Excel(name = "营业执照号码")
+    private String bizLicenseNo;
+
+    /** 法人姓名 */
+    @Excel(name = "法人姓名")
+    private String legalPerson;
+
+    /** 身份证号码 */
+    @Excel(name = "身份证号码")
+    private String idcardNo;
+
+    /** 法人身份证正面照片 */
+    @Excel(name = "法人身份证正面照片")
+    private String idcardFront;
+
+    /** 法人身份证反面照片 */
+    @Excel(name = "法人身份证反面照片")
+    private String idcardBack;
+
+    @ApiModelProperty(value = "门店拥有人手持身份证营业执照图片")
+    private String bizLicenseIdcard;
+
+    /** 商家地理位置经度 */
+    @Excel(name = "商家地理位置经度")
+    private String lng;
+
+    /** 商家地理位置纬度 */
+    @Excel(name = "商家地理位置纬度")
+    private String lat;
+
+    /** 商家地址 */
+    @Excel(name = "商家地址")
+    private String address;
+
+    /** 详细地址 */
+    @ApiModelProperty(required = true,value = "详细地址")
+    private String street;
+
+    /** 认证错误原因 */
+    @Excel(name = "认证错误原因")
+    private String errorMsg;
+
+    /** 状态：0->禁用，1->待认证, 2->已认证 */
+    @Excel(name = "状态：0->禁用，1->待认证, 2->已认证")
+    private Integer status;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /**
+     * 食品经营许可(蜂鸟)
+     */
+    @Excel(name = "食品经营许可")
+    private String foodLicensePic;
+    /**
+     * 食品经营许可(蜂鸟)
+     */
+    @Excel(name = "绑定运力费用（单位：元）")
+    private BigDecimal bindDeliveryAmount;
+
+    /** 更新时间 */
+    private Date updateTime;
+
+    /** 删除标识位: 0正常 1删除 */
+    @TableLogic
+    private Integer deleted;
+
+    /**
+     * 所属达达配送服务商
+     */
+    private Long dadaDspId;
+
+    /**
+     * 运费包id
+     */
+    private Long freightPackageId;
+
+    /**
+     * 配送商名称
+     */
+    private String dadaDspName;
+
+    private Agent agent;
+
+    private String categoryName;
+
+    private String mtCcategoryName;
+    private Integer ddCcategory;
+    private Integer ssProductType;
+
+    private Map<String, Object> params = new HashMap<>();
+
+    /** 开始时间 */
+    @Excel(name = "开始时间" , width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+
+    /** 结束时间 */
+    @Excel(name = "结束时间" , width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+
+    /**
+     * 打印二维码：1->打印，0->不打印
+     */
+    private Integer openQrCode;
+
+    private Integer merchantId;
+
+    private String thirdShopId;
+
+    private Integer shopId;
+
+    private Integer deliveryId;
+
+    private Integer waimaiId;
+
+    private String memberName;
+
+    private String shopName;
+
+    private String memberMobile;
+
+    private Integer bindStatus;
+
+    private Integer aId;
+
+    private Boolean isPermission;
+
+    private Boolean isNull;
+
+    private String personnelName;
+
+    private List<MerchantDeliveryFee> merchantDeliveryFees;
+
+    private Long packageDiscountId;
+}

lb-module/src/main/java/com/ydd/module/mapper/MerchantMapper.java

@@ -32,7 +32,7 @@ public interface MerchantMapper extends BaseMapper<Merchant> {
 
     List<Integer> findIdsByAgentIdLists(@Param("agentIds") List<Long> agentIds);
 
-    List<Merchant> selectMerchantList(@Param("params")Merchant merchant, @Param("agentIds")List<Long> agentIds);
+    List<Merchant> selectMerchantList(@Param("params")SystemMerchantDto merchantDto, @Param("agentIds")List<Long> agentIds, @Param("agentList")List<Long> agentList);
 
     List<Long> listMerchantIds(@Param("agentIds") List<Long> agentIds);
 

lb-module/src/main/java/com/ydd/module/service/IMerchantService.java

@@ -19,10 +19,10 @@ public interface IMerchantService extends IService<Merchant> {
 
     /**
      * 查询列表
-     * @param merchant 实体
+     * @param merchantDto 实体
      * @return 列表
      */
-    List<Merchant> queryList(Merchant merchant, List<Long> agents);
+    List<Merchant> queryList(SystemMerchantDto merchantDto, List<Long> agents, List<Long> agentList);
 
     Merchant getInfoById(Long id, SysUser user);
 

lb-module/src/main/java/com/ydd/module/service/impl/MerchantServiceImpl.java

@@ -94,106 +94,8 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
     private DeliveryService deliveryClient;
 
     @Override
-    public List<Merchant> queryList(Merchant merchant, List<Long> agents) {
-//        baseMapper.listMerchan(id);
-        LambdaQueryWrapper<Merchant> lqw = Wrappers.lambdaQuery();
-        if (StringUtils.isNotBlank(merchant.getMerchantName())){
-            lqw.like(Merchant::getMerchantName ,merchant.getMerchantName());
-        }
-        if (merchant.getAgentId() != null){
-            lqw.in(Merchant::getAgentId , agents);
-        }
-        if (merchant.getAId() != null){
-            lqw.eq(Merchant::getAgentId , merchant.getAId());
-        }
-        if (merchant.getProvinceId() != null){
-            lqw.eq(Merchant::getProvinceId ,merchant.getProvinceId());
-        }
-        if (merchant.getCityId() != null){
-            lqw.eq(Merchant::getCityId ,merchant.getCityId());
-        }
-        if (merchant.getDistrictId() != null){
-            lqw.eq(Merchant::getDistrictId ,merchant.getDistrictId());
-        }
-        if (merchant.getMerchantType() != null){
-            lqw.eq(Merchant::getMerchantType ,merchant.getMerchantType());
-        }
-        if (merchant.getLicenseType() != null){
-            lqw.eq(Merchant::getLicenseType ,merchant.getLicenseType());
-        }
-        if (merchant.getCategoryId() != null){
-            lqw.eq(Merchant::getCategoryId ,merchant.getCategoryId());
-        }
-        if (StringUtils.isNotBlank(merchant.getLogo())){
-            lqw.eq(Merchant::getLogo ,merchant.getLogo());
-        }
-        if (StringUtils.isNotBlank(merchant.getContactName())){
-            lqw.like(Merchant::getContactName ,merchant.getContactName());
-        }
-        if (StringUtils.isNotBlank(merchant.getMobile())){
-            lqw.like(Merchant::getMobile ,merchant.getMobile());
-        }
-        if (StringUtils.isNotBlank(merchant.getIntro())){
-            lqw.eq(Merchant::getIntro ,merchant.getIntro());
-        }
-        if (StringUtils.isNotBlank(merchant.getPhotoAlbum())){
-            lqw.eq(Merchant::getPhotoAlbum ,merchant.getPhotoAlbum());
-        }
-        if (StringUtils.isNotBlank(merchant.getBizLicense())){
-            lqw.eq(Merchant::getBizLicense ,merchant.getBizLicense());
-        }
-        if (StringUtils.isNotBlank(merchant.getBizLicenseNo())){
-            lqw.eq(Merchant::getBizLicenseNo ,merchant.getBizLicenseNo());
-        }
-        if (StringUtils.isNotBlank(merchant.getLegalPerson())){
-            lqw.eq(Merchant::getLegalPerson ,merchant.getLegalPerson());
-        }
-        if (StringUtils.isNotBlank(merchant.getIdcardNo())){
-            lqw.eq(Merchant::getIdcardNo ,merchant.getIdcardNo());
-        }
-        if (StringUtils.isNotBlank(merchant.getIdcardFront())){
-            lqw.eq(Merchant::getIdcardFront ,merchant.getIdcardFront());
-        }
-        if (StringUtils.isNotBlank(merchant.getIdcardBack())){
-            lqw.eq(Merchant::getIdcardBack ,merchant.getIdcardBack());
-        }
-        if (StringUtils.isNotBlank(merchant.getLng())){
-            lqw.eq(Merchant::getLng ,merchant.getLng());
-        }
-        if (StringUtils.isNotBlank(merchant.getLat())){
-            lqw.eq(Merchant::getLat ,merchant.getLat());
-        }
-        if (StringUtils.isNotBlank(merchant.getAddress())){
-            lqw.eq(Merchant::getAddress ,merchant.getAddress());
-        }
-        if (StringUtils.isNotBlank(merchant.getErrorMsg())){
-            lqw.eq(Merchant::getErrorMsg ,merchant.getErrorMsg());
-        }
-        if (merchant.getStatus() != null){
-            lqw.eq(Merchant::getStatus ,merchant.getStatus());
-        }
-        if (merchant.getStartTime() != null){
-            lqw.ge(Merchant::getCreateTime ,merchant.getStartTime());
-        }
-        if (merchant.getEndTime() != null){
-            lqw.le(Merchant::getCreateTime ,merchant.getEndTime());
-        }
-        if (StringUtils.isNotBlank(merchant.getProvinceName())){
-            lqw.like(Merchant::getProvinceName ,merchant.getProvinceName());
-        }
-        if (StringUtils.isNotBlank(merchant.getCityName())){
-            lqw.like(Merchant::getCityName ,merchant.getCityName());
-        }
-        if (StringUtils.isNotBlank(merchant.getDistrictName())){
-            lqw.like(Merchant::getDistrictName ,merchant.getDistrictName());
-        }
-        if (merchant.getPersonnelId() != null){
-            lqw.eq(Merchant::getPersonnelId , merchant.getPersonnelId());
-        }
-        lqw.orderByDesc(Merchant::getCreateTime);
-        // List<Merchant> list = this.list(lqw);
-
-        List<Merchant> list = baseMapper.selectMerchantList(merchant, agents);
+    public List<Merchant> queryList(SystemMerchantDto merchantDto, List<Long> agents, List<Long> agentList) {
+        List<Merchant> list = baseMapper.selectMerchantList(merchantDto, agents, agentList);
         list.forEach(merchant1 -> {
             if (merchant1.getDadaDspId() != null) {
                 DadaDsp dadaDsp = iDadaDspService.getById(merchant1.getDadaDspId());
@@ -210,15 +112,6 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
                     merchant1.setPersonnelName(personnel.getName());
                 }
             }
-//            if (merchant1.getProvinceId() != null){
-//                merchant1.setProvinceName(iAreaService.getName(merchant1.getProvinceId().intValue()));
-//            }
-//            if (merchant1.getCityId() != null){
-//                merchant1.setCityName(iAreaService.getName(merchant1.getCityId().intValue()));
-//            }
-//            if (merchant1.getDistrictId() != null){
-//                merchant1.setDistrictName(iAreaService.getName(merchant1.getDistrictId().intValue()));
-//            }
             if (merchant1.getCategoryId() != null){
                 MerchantCategory category = iMerchantCategoryService.getById(merchant1.getCategoryId());
                 if (category != null){

lb-module/src/main/resources/mapper/module/merchantMapper.xml

@@ -169,6 +169,12 @@
                 #{agentId}
             </foreach>
         </if>
+        <if test="params.packageDiscountId != null">
+            and mc.agent_id in
+            <foreach collection="agentList" index="index" item="agentId" open="(" separator="," close=")">
+                #{agentId}
+            </foreach>
+        </if>
         <if test="params.personnelId != null">
             and mc.personnel_id = #{params.personnelId}
         </if>
@@ -252,7 +258,7 @@
             and mc.merchant_name like concat('%', #{params.merchantName}, '%')
         </if>
         <if test="params.contactName != null and params.contactName != ''">
-            and mc.contact_name like concat('%', #{params.contactName}, '%')
+            and mc.contact_name l   ike concat('%', #{params.contactName}, '%')
         </if>
         <if test="params.mobile != null and params.mobile != ''">
             and mc.mobile like concat('%', #{params.mobile}, '%')

lb-web/src/main/java/com/ydd/web/controller/MerchantController.java

@@ -11,6 +11,7 @@ import com.ydd.common.core.page.TableDataInfo;
 import com.ydd.common.enums.BusinessType;
 import com.ydd.common.enums.UserTypeEnums;
 import com.ydd.common.utils.poi.ExcelUtil;
+import com.ydd.module.domain.Agent;
 import com.ydd.module.domain.DspDelivery;
 import com.ydd.module.domain.Merchant;
 import com.ydd.module.domain.MerchantCategory;
@@ -18,12 +19,14 @@ import com.ydd.module.dto.*;
 import com.ydd.module.service.*;
 import com.ydd.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 客户商家Controller
@@ -51,16 +54,16 @@ public class MerchantController extends BaseController {
     private final ISysUserService iSysUserService;
 
     @GetMapping("/get/merchantList")
-    public Result getMerchantList(Merchant merchant){
+    public Result getMerchantList(SystemMerchantDto merchantDto){
         SysUser user = getSysUser();
         if (user.getType().equals(UserTypeEnums.AGENT.getCode())){
-            merchant.setAgentId(user.getAgentId());
+            merchantDto.setAgentId(user.getAgentId());
         }
         List<Long> agents = Lists.newArrayList();
-        if (merchant.getAgentId() != null) {
-            agents = iAgentService.listAgent(merchant.getAgentId());
+        if (merchantDto.getAgentId() != null) {
+            agents = iAgentService.listAgent(merchantDto.getAgentId());
         }
-        List<Merchant> list = iMerchantService.queryList(merchant, agents);
+        List<Merchant> list = iMerchantService.queryList(merchantDto, agents, Lists.newArrayList());
         return Result.success(list);
     }
 
@@ -84,23 +87,33 @@ public class MerchantController extends BaseController {
      */
     // @PreAuthorize("@ss.hasPermi('module:merchant:list')")
     @GetMapping("/list")
-    public TableDataInfo list(Merchant merchant) {
+    public TableDataInfo list(SystemMerchantDto merchantDto) {
         SysUser user = getSysUser();
 
         List<Long> agents = Lists.newArrayList();
-        if (user.getType().equals(UserTypeEnums.AGENT.getCode()) && merchant.getAgentId() == null){
-            merchant.setAgentId(user.getAgentId());
+        if (user.getType().equals(UserTypeEnums.AGENT.getCode()) && merchantDto.getAgentId() == null){
+            merchantDto.setAgentId(user.getAgentId());
         }
 
-        if (merchant.getAgentId() != null) {
-            agents = iAgentService.listAgent(merchant.getAgentId());
+        if (merchantDto.getAgentId() != null) {
+            agents = iAgentService.listAgent(merchantDto.getAgentId());
+        }
+
+        if (merchantDto.getAId() != null) {
+            agents = iAgentService.listAgent(merchantDto.getAId().longValue());
         }
 
-        if (merchant.getAId() != null) {
-            agents = iAgentService.listAgent(merchant.getAId().longValue());
+        // 获取代理商优惠包下所有商户
+        List<Long> agentList = Lists.newArrayList();
+        if (merchantDto.getPackageDiscountId() != null) {
+          agentList = iAgentService.list(new QueryWrapper<Agent>().eq("deleted", 0)
+          .eq("package_discount_id", merchantDto.getPackageDiscountId())).stream().map(Agent::getId).collect(Collectors.toList());
+          if (CollectionUtils.isEmpty(agentList)) {
+            return getDataTable(new ArrayList<>());
+          }
         }
         startPage();
-        List<Merchant> list = iMerchantService.queryList(merchant, agents);
+        List<Merchant> list = iMerchantService.queryList(merchantDto, agents, agentList);
         return getDataTable(list);
     }
     /**

web-ui/src/views/module/merchant/index.vue

@@ -11,14 +11,24 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="员工名称" prop="personnelName">
+      <el-form-item label="员工名称" prop="personnelId">
+        <el-select v-model="queryParams.personnelId" filterable clearable placeholder="请选择 / 输入员工">
+          <el-option
+            v-for="item in personnelList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="员工名称" prop="personnelName">
         <el-input
           v-model="queryParams.personnelName"
           placeholder="请输入员工名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="用户昵称" prop="memberName">
         <el-input
           v-model="queryParams.memberName"
@@ -93,10 +103,15 @@
       <el-form-item label="商家地区">
           <OldSend :sendAreaProp="sendAreaProp" @changeArea="changeSendArea" ref="sendArea"/>
       </el-form-item>
+      <el-form-item label="代理商优惠包" prop="packageDiscountId" v-if="this.userType == 1">
+        <el-select v-model="queryParams.packageDiscountId" placeholder="请选择" clearable>
+          <el-option v-for="item in packageDiscountList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
-        <el-button icon="el-icon-download" @click="handleExport()" type="primary">导出</el-button>
+        <el-button icon="el-icon-download" @click="handleExport()" type="primary" v-hasPermi="['module:merchant:export']">导出</el-button>
       </el-form-item>
     </el-form>
 
@@ -128,6 +143,12 @@
           <span v-else>暂无代理</span>
         </template>
       </el-table-column>
+      <el-table-column label="配送商" align="center" prop="dadaDspId" v-if="userType != 2">
+        <template slot-scope="scope">
+          <span v-if="scope.row.dadaDspName">{{scope.row.dadaDspName}}</span>
+          <span v-else>暂无配送商</span>
+        </template>
+      </el-table-column>
       <el-table-column label="所属员工" align="center" prop="personnelId">
         <template slot-scope="scope">
           <span v-if="scope.row.personnelName">{{scope.row.personnelName}}</span>
@@ -262,13 +283,29 @@
               <el-input-number style="width:300px" controls-position="right" :min="0" :max="99999" v-model="form.bindDeliveryAmount" :precision="2" placeholder="请输入绑定运力费用" /> 元
             </el-form-item> -->
             <el-form-item label="绑定运力费用" prop="bindDeliveryAmount">
-              <el-button :type="this.switch == false ? 'success' : 'danger'" @click="setUpBlock()" style="margin-bottom: 20px">
+              <!-- <el-button :type="this.switch == false ? 'success' : 'danger'" @click="setUpBlock()" style="margin-bottom: 20px">
                 {{ this.switch == false ? '设置' : '关闭'}}
               </el-button>
-              <div v-if="this.switch == true" style="color:red">如果关闭，设置 / 修改的收取费用失效！</div>
+              <div v-if="this.switch == true" style="color:red">如果关闭，设置 / 修改的收取费用失效！</div> -->
+              <div class="table">
+                <div class="table-header">
+                  <div class="table-header-item">运力名称</div>
+                  <div class="table-header-item">收取费用(单位：元)</div>
+                </div>
+
+                <div class="table-list" v-for="(list, index) in this.form.merchantDeliveryFees" :key="index">
+                  <div class="table-list-item">
+                    {{ list.deliveryName }}
+                  </div>
+                  <div class="table-list-item">
+                    <el-input-number class="onlyOne" :min="0" :max="99999" placeholder="请输入" :precision="2" v-model="list.amount" :controls="false">
+                    </el-input-number>
+                  </div>
+                </div>
+              </div>
             </el-form-item>
 
-            <el-form-item v-if="this.switch">
+            <!-- <el-form-item v-if="this.switch">
               <div class="table">
                 <div class="table-header">
                   <div class="table-header-item">运力名称</div>
@@ -285,7 +322,7 @@
                   </div>
                 </div>
               </div>
-            </el-form-item>
+            </el-form-item> -->
 
 
           </el-tab-pane>
@@ -348,9 +385,10 @@ export default {
   data() {
     return {
       // 开关
-      switch: false,
       date:[],
+      packageDiscountList: [],
       agentList: [],
+      personnelList: [],
       personnelOption: [],
       activeName: 'first',
       merchantTypeOption:[{
@@ -409,9 +447,11 @@ export default {
       // 客户商家表格数据
       merchantList: [],
       // 弹出层标题
-      title: "",      
+      title: "",
       // 是否显示弹出层
       open: false,
+      // 登录用户类型
+      userType: undefined,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -445,7 +485,8 @@ export default {
         aId: undefined,
         bindDeliveryAmount: undefined,
         personnelName: undefined,
-        personnelId: undefined
+        personnelId: undefined,
+        packageDiscountId: undefined
       },
       exportParams: {
       },
@@ -511,6 +552,7 @@ export default {
   },
   created() {
     this.user = user.actions.getSysUser()
+    this.userType = localStorage.getItem("SYS_USER_TYPE")
     this.getList();
     getAgentList().then(response => {
       console.log('getAgentList', response)
@@ -528,15 +570,27 @@ export default {
       }
     });
 
+    this.$http.get(`/module/personnel/personnelList`).then(({data}) => {
+      console.log('data2', data)
+      if (data) {
+        console.log('data', data)
+        this.personnelList = data
+      }
+    });
+
+    this.$http.get("/module/packageDiscount/getDiscountList").then(({ data }) => {
+      this.packageDiscountList = data
+    })
+
   },
   methods: {
-    setUpBlock() {
-      if(this.switch == false) {
-        this.switch = true
-      }else {
-        this.switch = false
-      }
-    },
+    // setUpBlock() {
+    //   if(this.switch == false) {
+    //     this.switch = true
+    //   }else {
+    //     this.switch = false
+    //   }
+    // },
     changeAgent() {
       this.personnelOption = [];
       this.form.personnelId = undefined;
@@ -544,7 +598,7 @@ export default {
         this.personnelOption = response.data
         console.log("option2", this.personnelOption)
       });
-      
+
     },
 
     changeSendArea(e) {
@@ -578,7 +632,7 @@ export default {
       // window.localStorage.getItem("ss")
       // let routeData = this.$router.resolve({path: '/merchant/edit', query:{ merchantId: row.id } });
       // window.open(routeData.href, '_blank');
-      this.$router.push({ path: '/merchant/edit', query: { merchantId: row.id } })
+      this.$router.push({ path: '/merchant/merchant/edit', query: { merchantId: row.id } })
     },
     introChange(data) {
       this.form.intro = data
@@ -612,7 +666,6 @@ export default {
     },
     // 表单重置
     reset() {
-      this.switch = false;
       this.form = {
         id: undefined,
         merchantName: undefined,
@@ -646,8 +699,7 @@ export default {
         status: 0,
         bindDeliveryAmount: undefined,
         // 客户商家运力收费集合
-        merchantDeliveryFees: [],
-        isInsert: false
+        merchantDeliveryFees: []
       };
       this.personnelOption = [];
       this.resetForm("form");
@@ -728,7 +780,7 @@ export default {
         //   console.log('startArea-district', this.startArea.district)
         //   console.log('startArea-city', this.startArea.city)
         // }else {
-        
+
           if(response.data.provinceName == undefined && response.data.districtName == undefined && response.data.cityName == undefined) {
             this.startArea.provinceName = response.data.provinceName
             this.startArea.districtName = response.data.districtName
@@ -746,7 +798,7 @@ export default {
             }
             console.log('变化前:',area)
             console.log('变化后:',func(area))
-            
+
             // 优化的代码(等同于下面)
             // const newAreaId = name =>(func(area).find(item => item.name === name) || {}).id
             // this.startArea.province = newAreaId(this.startArea.provinceName)
@@ -760,12 +812,12 @@ export default {
             console.log('this.startArea.city:', this.startArea.city)
 
             var cityId = this.startArea.city.substr(0,4)
-            console.log('var cityId', cityId) 
+            console.log('var cityId', cityId)
             this.startArea.district = (func(area).find(item => {return item.name === this.startArea.districtName && item.id.includes(cityId) && item.level === 3}) || {}).id
             console.log('this.startArea.district:', this.startArea.district)
 
-          
-            
+
+
             // this.startArea.district = func(area).filter(item => {
             //   console.log('item', item)
 
@@ -773,14 +825,13 @@ export default {
             //     return true
             //   }
             // }).id
-            
+
             }
         // }
 
         this.areaProp = JSON.parse(JSON.stringify(this.startArea))
         this.form = Object.assign({}, { personnelId: '' }, response.data);
 
-        this.switch = this.form.isInsert
         console.log('form', this.form)
 
         if (response.data.photoAlbum){
@@ -830,19 +881,43 @@ export default {
           this.form.cityName = this.startArea.cityName
           this.form.districtName = this.startArea.districtName
 
-          this.form.isInsert = this.switch
+          console.log('form', this.form)
           if (this.form.id != null) {
-            updateMerchant(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+            // updateMerchant(this.form).then(response => {
+            //   this.msgSuccess("修改成功");
+            //   this.open = false;
+            //   this.getList();
+            // });
+
+            this.$confirm("确定修改数据吗？", "警告", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+            }).then(() => {
+              updateMerchant(this.form).then(response => {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            })
           } else {
-            addMerchant(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+            // addMerchant(this.form).then(response => {
+            //   this.msgSuccess("新增成功");
+            //   this.open = false;
+            //   this.getList();
+            // });
+
+            this.$confirm("确定新增数据吗？", "警告", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+            }).then(() => {
+              addMerchant(this.form).then(response => {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            })
           }
         }
       });
@@ -871,9 +946,11 @@ export default {
       this.exportParams.memberName = this.queryParams.memberName
       this.exportParams.memberMobile = this.queryParams.memberMobile
       this.exportParams.personnelName = this.queryParams.personnelName
+      this.exportParams.personnelId = this.queryParams.personnelId
+      this.exportParams.packageDiscountId = this.queryParams.packageDiscountId
       if (this.date !== null && this.date !== '') {
         if (this.date[0] !== undefined) {
-          this.exportParams.startTime = this.date[0] 
+          this.exportParams.startTime = this.date[0]
           this.exportParams.endTime = this.date[1]
         }
       } else {