From 0c60f5608fc8f738eb138e32f583c329ed5aa81d Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 17 Mar 2021 14:46:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html           |    2 
 zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html           |    2 
 zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadParamSettingDto.java          |   25 ++++++
 zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html          |   61 ++++++++++++--
 zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java         |   69 ++++++++++++++--
 zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java        |    4 
 zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java           |    4 
 zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html            |   12 ++-
 zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java |   19 ++--
 zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopOrderDetailVo.java             |    3 
 zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadParamSettingBasicDto.java     |   20 +++++
 zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java         |    3 
 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml            |   16 ++-
 13 files changed, 192 insertions(+), 48 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java
index 46cdaf9..5c511b7 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java
@@ -1,7 +1,6 @@
 package com.matrix.system.fenxiao.action;
 
 import com.matrix.core.pojo.AjaxResult;
-import com.matrix.system.fenxiao.dto.ChangeSaleManGradeDto;
 import com.matrix.system.fenxiao.dto.LoadFenxiaoOrderBasicDto;
 import com.matrix.system.fenxiao.dto.LoadFenxiaoOrderListDto;
 import com.matrix.system.fenxiao.dto.LoadSetOrderListDtoDto;
@@ -10,7 +9,6 @@
 import com.matrix.system.fenxiao.vo.LoadFenxiaoOrderBasicVo;
 import com.matrix.system.fenxiao.vo.LoadFenxiaoOrderListVo;
 import com.matrix.system.fenxiao.vo.LoadSetOrderListDtoVo;
-
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
@@ -63,7 +61,7 @@
     /**
      * 结算记录
      */
-    @ApiOperation(value = "分销订单")
+    @ApiOperation(value = "结算记录")
     @ApiResponses({
     	@ApiResponse(code = 200, message = "OK",  response = LoadSetOrderListDtoVo.class)
     })
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java
index f7ef70f..5ba6f89 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java
@@ -55,32 +55,81 @@
     @ApiResponses({
             @ApiResponse(code = 200, message = "OK",  response = ShopSalesmanDetailVo.class)
     })
-    @PostMapping(value = "/findShopSalesmanDetail")
+    @PostMapping(value = "/loadParamSettingBasic")
     public @ResponseBody
-    AjaxResult findShopSalesmanDetail(@RequestBody ShopSalesmanDetailDto shopSalesmanDetailDto) {
+    AjaxResult findShopSalesmanDetail(@RequestBody LoadParamSettingBasicDto loadParamSettingBasicDto) {
     	//设置用户公司ID
-    	QueryUtil.setQueryLimitCom(shopSalesmanDetailDto);
+    	QueryUtil.setQueryLimitCom(loadParamSettingBasicDto);
     	AjaxResult result= AjaxResult.buildSuccessInstance("查询成功");
     	//根据OPENID查询基础信息
-    	String userId = shopSalesmanDetailDto.getUserId();
-    	String applyId = shopSalesmanDetailDto.getApplyId();
+    	String userId = loadParamSettingBasicDto.getUserId();
+    	String applyId = loadParamSettingBasicDto.getApplyId();
     	SalesmanBasicDetailVo salesmanBasicDetailVo = shopSalesmanApplyService.selectShopSalesmanDetailByOpenId(userId,Long.parseLong(applyId));
     	result.putInMap("basicdetail", salesmanBasicDetailVo);
+        return result;
+    }
+
+    /**
+     * 分销员详情页面绑定客户
+     */
+    @ApiOperation(value = "分销员详情页面绑定客户")
+    @PostMapping(value = "/loadParamSetting")
+    public @ResponseBody
+    AjaxResult loadParamSetting(@RequestBody LoadParamSettingDto loadParamSettingDto) {
+        //设置用户公司ID
+        QueryUtil.setQueryLimitCom(loadParamSettingDto);
+        AjaxResult result= AjaxResult.buildSuccessInstance("查询成功");
         //排序
-        if(StringUtils.isBlank(shopSalesmanDetailDto.getSort())){
-        	shopSalesmanDetailDto.setSort("create_time");
-        	shopSalesmanDetailDto.setOrder("desc");
+        if(StringUtils.isBlank(loadParamSettingDto.getSort())){
+        	loadParamSettingDto.setSort("create_time");
+        	loadParamSettingDto.setOrder("desc");
         }
         //查询绑定客户信息
-        Page<ShopCustomDetailVo> page = new Page(shopSalesmanDetailDto.getPageNum(), shopSalesmanDetailDto.getPageSize());
-        IPage<ShopCustomDetailVo> customDetailRows = shopSalesmanApplyService.findCustomDetail(page,shopSalesmanDetailDto);
+        Page<ShopCustomDetailVo> page = new Page(loadParamSettingDto.getPageNum(), loadParamSettingDto.getPageSize());
+        IPage<ShopCustomDetailVo> customDetailRows = shopSalesmanApplyService.findCustomDetail(page,loadParamSettingDto);
         result.putInMap("customDetailRecords", customDetailRows.getRecords());
         result.putInMap("customDetailTotal", customDetailRows.getTotal());
+        return result;
+    }
+
+    /**
+     * 分销员详情页面邀请下级
+     */
+    @ApiOperation(value = "分销员详情页面邀请下级")
+    @PostMapping(value = "/loadParamSettinglow")
+    public @ResponseBody
+    AjaxResult loadParamSettinglow(@RequestBody ShopSalesmanDetailDto shopSalesmanDetailDto) {
+        //设置用户公司ID
+        QueryUtil.setQueryLimitCom(shopSalesmanDetailDto);
+        AjaxResult result= AjaxResult.buildSuccessInstance("查询成功");
+        //排序
+        if(StringUtils.isBlank(shopSalesmanDetailDto.getSort())){
+            shopSalesmanDetailDto.setSort("create_time");
+            shopSalesmanDetailDto.setOrder("desc");
+        }
         //查询邀请下级信息
         Page<ShopCustomDetailVo> pageLow = new Page(shopSalesmanDetailDto.getPageNum(), shopSalesmanDetailDto.getPageSize());
         IPage<ShopCustomDetailVo> customLowRows = shopSalesmanApplyService.findCustomLow(pageLow,shopSalesmanDetailDto);
         result.putInMap("customLowRecords", customLowRows.getRecords());
         result.putInMap("customLowTotal", customLowRows.getTotal());
+        return result;
+    }
+
+    /**
+     * 分销员详情页面收益订单
+     */
+    @ApiOperation(value = "分销员详情页面收益订单")
+    @PostMapping(value = "/loadParamSettingOrder")
+    public @ResponseBody
+    AjaxResult loadParamSettingOrder(@RequestBody ShopSalesmanDetailDto shopSalesmanDetailDto) {
+        //设置用户公司ID
+        QueryUtil.setQueryLimitCom(shopSalesmanDetailDto);
+        AjaxResult result= AjaxResult.buildSuccessInstance("查询成功");
+        //排序
+        if(StringUtils.isBlank(shopSalesmanDetailDto.getSort())){
+            shopSalesmanDetailDto.setSort("create_time");
+            shopSalesmanDetailDto.setOrder("desc");
+        }
         //查询收益订单
         Page<ShopOrderDetailVo> pageOrder = new Page(shopSalesmanDetailDto.getPageNum(), shopSalesmanDetailDto.getPageSize());
         IPage<ShopOrderDetailVo> orderRows = shopSalesmanApplyService.findShopOrderDetail(pageOrder,shopSalesmanDetailDto);
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
index 4b5aad7..e881f7a 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.matrix.system.fenxiao.dto.LoadParamSettingDto;
 import com.matrix.system.fenxiao.dto.ShopSalesmanAppliingDto;
 import com.matrix.system.fenxiao.dto.ShopSalesmanApplyDto;
 import com.matrix.system.fenxiao.dto.ShopSalesmanDetailDto;
@@ -42,7 +43,7 @@
 			@Param("companyId")Long companyId,@Param("applyId")long applyId);
 
 	IPage<ShopCustomDetailVo> findCustomDetail(Page<ShopCustomDetailVo> page,
-											   @Param("record")ShopSalesmanDetailDto shopSalesmanDetailDto);
+											   @Param("record")LoadParamSettingDto loadParamSettingDto);
 
 	IPage<ShopCustomDetailVo> findCustomLow(Page<ShopCustomDetailVo> pageLow,
 			@Param("record")ShopSalesmanDetailDto shopSalesmanDetailDto);
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadParamSettingBasicDto.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadParamSettingBasicDto.java
new file mode 100644
index 0000000..2255170
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadParamSettingBasicDto.java
@@ -0,0 +1,20 @@
+package com.matrix.system.fenxiao.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "LoadParamSettingBasicDto", description = "查询参数")
+public class LoadParamSettingBasicDto {
+	
+	@ApiModelProperty(value ="会员OPENID")
+	private String userId;
+
+	@ApiModelProperty(value ="申请记录ID")
+	private String applyId;
+	
+	@ApiModelProperty(hidden = true)
+	private Long companyId;
+
+}
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadParamSettingDto.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadParamSettingDto.java
new file mode 100644
index 0000000..65c479b
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadParamSettingDto.java
@@ -0,0 +1,25 @@
+package com.matrix.system.fenxiao.dto;
+
+import com.matrix.core.pojo.BasePageQueryDto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "LoadParamSettingDto", description = "查询参数")
+public class LoadParamSettingDto extends BasePageQueryDto {
+	
+	@ApiModelProperty(value ="会员姓名")
+	private String userName;
+	
+	@ApiModelProperty(value ="会员OPENID")
+	private String userId;
+
+	@ApiModelProperty(value ="申请记录ID")
+	private String applyId;
+	
+	@ApiModelProperty(hidden = true)
+	private Long companyId;
+	
+}
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
index 097564a..e1aca9d 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
@@ -234,9 +234,8 @@
 		return shopSalesmanApplyDao.selectShopSalesmanDetailByOpenId(userId,companyId,applyId);
 	}
 
-	public IPage<ShopCustomDetailVo> findCustomDetail(Page<ShopCustomDetailVo> page,
-                                                      ShopSalesmanDetailDto shopSalesmanDetailDto) {
-		return shopSalesmanApplyDao.findCustomDetail(page,shopSalesmanDetailDto);
+	public IPage<ShopCustomDetailVo> findCustomDetail(Page<ShopCustomDetailVo> page,LoadParamSettingDto loadParamSettingDto) {
+		return shopSalesmanApplyDao.findCustomDetail(page,loadParamSettingDto);
 	}
 
 	public IPage<ShopCustomDetailVo> findCustomLow(Page<ShopCustomDetailVo> pageLow,
@@ -288,7 +287,7 @@
         bizUserDao.updateByModel(findByOpenId);
         shopSalesmanApplyDao.updateById(shopSalesmanApply);
         
-        return AjaxResult.buildFailInstance("修改等级成功");
+        return AjaxResult.buildSuccessInstance("修改等级成功");
 	}
 
     @Transactional(rollbackFor = Exception.class)
@@ -303,7 +302,7 @@
         }
         findByOpenId.setParentOpenId("");
         bizUserDao.updateByModel(findByOpenId);
-        return AjaxResult.buildFailInstance("解绑成功");
+        return AjaxResult.buildSuccessInstance("解绑成功");
 	}
 
     @Transactional(rollbackFor = Exception.class)
@@ -324,7 +323,7 @@
         ShopSalesmanApply selectById = shopSalesmanApplyDao.selectById(applyid);
         selectById.setApplyStatus(ShopSalesmanApply.APPLY_STATUS_XTQX);
         shopSalesmanApplyDao.updateById(selectById);
-		return AjaxResult.buildFailInstance("操作成功");
+		return AjaxResult.buildSuccessInstance("操作成功");
 	}
 
 	public IPage<FyfaManageVo> findFyfaManageList(Page<FyfaManageVo> page, FyfaManageDto fyfaManageDto) {
@@ -353,7 +352,7 @@
         	return AjaxResult.buildFailInstance("当前行数据不存在,请刷新页面");
         }
         shopSalesmanGradeDao.deleteById(gradeId);
-		return AjaxResult.buildFailInstance("操作成功");
+		return AjaxResult.buildSuccessInstance("操作成功");
 	}
 
     @Transactional(rollbackFor = Exception.class)
@@ -383,7 +382,7 @@
         selectById.setInvitationCommission(invitationCommission);
         selectById.setGradeCondition(updateFyfaDto.getGradeCondition());
         shopSalesmanGradeDao.updateById(selectById);
-		return AjaxResult.buildFailInstance("操作成功");
+		return AjaxResult.buildSuccessInstance("操作成功");
 	}
     
     @Transactional(rollbackFor = Exception.class)
@@ -395,7 +394,7 @@
         BusParameterSettings busParameterSettings = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_TG_PLAN, companyId);
         busParameterSettings.setParamValue3(updateTgjhDto.getTgfa());
         busParameterSettingsDao.updateByModel(busParameterSettings);
-		return AjaxResult.buildFailInstance("保存成功");
+		return AjaxResult.buildSuccessInstance("保存成功");
 	}
 
     @Transactional(rollbackFor = Exception.class)
@@ -407,7 +406,7 @@
         BusParameterSettings busParameterSettings = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_TG_POSTER, companyId);
         busParameterSettings.setParamValue(updateTgtpDto.getImageUrl());
         busParameterSettingsDao.updateByModel(busParameterSettings);
-		return AjaxResult.buildFailInstance("保存成功");
+		return AjaxResult.buildSuccessInstance("保存成功");
 	}
 
     
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopOrderDetailVo.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopOrderDetailVo.java
index a922e46..6d04291 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopOrderDetailVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopOrderDetailVo.java
@@ -19,6 +19,9 @@
 
     @ApiModelProperty(value = "实付金额")
     private Double  orderMoney;
+
+    @ApiModelProperty(value = "订单状态")
+    private Integer orderState;
     
     @ApiModelProperty(value = "下单门店")
     private String storeName;
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java
index 3a3af3c..7220655 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java
@@ -76,8 +76,10 @@
 	private String avatarUrl;
 	@ApiModelProperty(value = "邀请人")
 	private String parentUser;
-	@ApiModelProperty(value = "下级客户数")
+	@ApiModelProperty(value = "推广客户")
 	private Integer lowerLevelNum;
+	@ApiModelProperty(value = "邀请下级")
+	private Integer invitedNum;
 
 	@ApiModelProperty(value = "累计收益")
 	private BigDecimal totalRevenue;
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
index f08e8b0..038ebd0 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -68,6 +68,8 @@
 		WHERE s.open_id = a.parent_user_id ) parentUser,
 		( SELECT COUNT(*) FROM biz_user
 		WHERE parent_open_id = a.user_id AND is_sales != 1 ) lowerLevelNum,
+		( SELECT COUNT(*) FROM biz_user
+		WHERE parent_open_id = a.user_id AND is_sales = 1 ) invitedNum,
 		( SELECT IFNULL(sum(IFNULL(amount, 0)), 0) FROM shop_salesman_order
 		WHERE user_id = a.user_id AND order_status = 2 AND sales_user_id = a.user_id ) totalRevenue,
 		( SELECT IFNULL(sum(IFNULL(amount, 0)), 0) FROM shop_salesman_order
@@ -218,10 +220,10 @@
 
 	<select id="findCustomDetail" resultType="com.matrix.system.fenxiao.vo.ShopCustomDetailVo">
 		SELECT
-		a.user_id userId,
+		b.open_id userId,
 		b.avatar_url avatarUrl,
 		b.nick_name nickname,
-		b.binding_parent_time createTime,
+		a.create_time createTime,
 		a.apply_way applyWay,
 		(select COUNT(*) from shop_salesman_order c where c.order_status = 1 and c.sales_user_id = a.user_id) doneNum
 		FROM
@@ -243,14 +245,14 @@
 	</select>
 	<select id="findCustomLow" resultType="com.matrix.system.fenxiao.vo.ShopCustomDetailVo">
 		SELECT
-		a.user_id userId,
+		b.open_id userId,
 		b.avatar_url avatarUrl,
 		b.nick_name nickname,
-		b.binding_parent_time createTime,
+		a.create_time createTime,
 		a.apply_way applyWay
 		FROM
 		shop_salesman_apply a
-		LEFT JOIN biz_user b ON b.parent_open_id = a.user_id
+		LEFT JOIN biz_user b ON b.open_id = a.user_id
 		<where>
 			a.company_id = #{record.companyId}
 			AND b.is_sales = 1
@@ -277,10 +279,12 @@
 		b.avatar_url avatarUrl,
 		c.order_no orderNo,
 		c.order_money orderMoney,
-		(select s.store_name  from shop_store s where s.store_id = c.store_id) storeName
+		c.order_status orderState,
+		f.shop_name storeName
 		from shop_salesman_order a
 		left join biz_user b on b.open_id=a.user_id
 		left join shop_order c on a.order_id=c.id
+		LEFT JOIN sys_shop_info f on f.id = c.store_id
 		<where>
 			a.sales_user_id = #{record.userId}
 			<if test="record.orderType != null and record.orderType != ''">
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html
index 96d333a..71bded8 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html
@@ -41,7 +41,7 @@
         </el-col>
     </el-row>
 
-    <el-row class="table-style"  >
+    <el-row class="table-style"  style="margin-left: 50px;">
         <el-table id="proj" :data="table.rows"  :height="height" stripe @sort-change="sortChange">
             <el-table-column
                     label="会员">
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html
index e51082a..2eb6cdb 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html
@@ -374,7 +374,7 @@
                 jsje: '',
                 jsdds: '',
                 jsrs: '',
-                jsfs: 1,
+                jsfs: 2,
                 bz: ''
             },
             formLabelWidth: '120px',
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html
index 4fe4e60..d972e1b 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html
@@ -113,7 +113,7 @@
     </el-row>
     <el-row>
         <el-tabs v-model="activeName" >
-            <el-tab-pane label="分销员管理" name="first">
+            <el-tab-pane label="绑定客户" name="first">
                 <el-row style="display:flex;align-items: center;text-align: right;">
                     <el-col>
                         <el-form ref="form" :model="form" inline >
@@ -135,7 +135,7 @@
                                 label="客户">
                             <template slot-scope="scope">
                                 <img :src="scope.row.avatarUrl" width="40" height="40" class="head_pic"/>
-                                {{scope.row.nickName}}
+                                {{scope.row.nickname}}
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -161,7 +161,7 @@
                         <el-table-column label="操作" width="240">
                             <template slot-scope="scope">
                                 <el-row style="display:flex;">
-                                    <el-button type="primary" size="mini" @click="openExaminesaleMan(scope.row)">解绑</el-button>
+                                    <el-button type="primary" size="mini" @click="openExamineSaleMan(scope.row)">解绑</el-button>
                                 </el-row>
                             </template>
                         </el-table-column>
@@ -202,7 +202,7 @@
                                 label="客户">
                             <template slot-scope="scope">
                                 <img :src="scope.row.avatarUrl" width="40" height="40" class="head_pic"/>
-                                {{scope.row.nickName}}
+                                {{scope.row.nickname}}
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -221,7 +221,7 @@
                         <el-table-column label="操作" width="240">
                             <template slot-scope="scope">
                                 <el-row style="display:flex;">
-                                    <el-button type="primary" size="mini" @click="openExaminesaleMan(scope.row)">解绑</el-button>
+                                    <el-button type="primary" size="mini" @click="openExamineSaleMan(scope.row)">解绑</el-button>
                                 </el-row>
                             </template>
                         </el-table-column>
@@ -272,6 +272,20 @@
                         <el-table-column
                                 prop="orderMoney"
                                 label="实付金额">
+                        </el-table-column>
+                        <el-table-column
+                                label="订单状态">
+                            <template slot-scope="scope">
+                                <span v-if="scope.row.orderState == 1">待付款</span>
+                                <span v-if="scope.row.orderState == 2">待配送</span>
+                                <span v-if="scope.row.orderState == 3">待收货</span>
+                                <span v-if="scope.row.orderState == 4">待评价</span>
+                                <span v-if="scope.row.orderState == 5">已评价</span>
+                                <span v-if="scope.row.orderState == 6">申请退款</span>
+                                <span v-if="scope.row.orderState == 7">退款成功</span>
+                                <span v-if="scope.row.orderState == 8">退款拒绝</span>
+                                <span v-if="scope.row.orderState == 9">已取消</span>
+                            </template>
                         </el-table-column>
                         <el-table-column
                                 prop="storeName"
@@ -402,6 +416,7 @@
             //加载分类
             loadInfo() {
                 let _this = this;
+                _this.loadParamSettingBasic();
                 _this.loadParamSetting();
                 _this.loadParamSettinglow();
                 _this.loadParamSettingOrder();
@@ -424,6 +439,22 @@
                     }
                 });
             },
+            //加载基本数据信息
+            loadParamSettingBasic() {
+                let _this = this;
+                let data={
+                    userId:userId,
+                    applyId:applyId,
+                };
+                AjaxProxy.requst({
+                    app: _this,
+                    data:data,
+                    url: basePath + '/fenXiao/fenXiaoUser/loadParamSettingBasic',
+                    callback: function (data) {
+                        _this.basicdetail = data.mapInfo.basicdetail;
+                    }
+                });
+            },
             //绑定客户
             loadParamSetting() {
                 let _this = this;
@@ -433,11 +464,11 @@
                 AjaxProxy.requst({
                     app: _this,
                     data:data,
-                    url: basePath + '/fenXiao/fenXiaoUser/findShopSalesmanDetail',
+                    url: basePath + '/fenXiao/fenXiaoUser/loadParamSetting',
                     callback: function (data) {
-                        _this.basicdetail = data.mapInfo.basicdetail;
                         _this.fxyList.rows = data.mapInfo.customDetailRecords;
                         _this.fxyList.total = data.mapInfo.customDetailTotal;
+                        _this.loadParamSettingBasic();
                     }
                 });
             },
@@ -478,11 +509,11 @@
                 AjaxProxy.requst({
                     app: _this,
                     data:data,
-                    url: basePath + '/fenXiao/fenXiaoUser/findShopSalesmanDetail',
+                    url: basePath + '/fenXiao/fenXiaoUser/loadParamSettinglow',
                     callback: function (data) {
-                        _this.basicdetail = data.mapInfo.basicdetail;
                         _this.lowLevelList.rows = data.mapInfo.customLowRecords;
                         _this.lowLevelList.total = data.mapInfo.customLowTotal;
+                        _this.loadParamSettingBasic();
                     }
                 });
             },
@@ -524,10 +555,11 @@
                 AjaxProxy.requst({
                     app: _this,
                     data:data,
-                    url: basePath + '/fenXiao/fenXiaoUser/findShopSalesmanDetail',
+                    url: basePath + '/fenXiao/fenXiaoUser/loadParamSettingOrder',
                     callback: function (data) {
                         _this.orderLevelList.rows = data.mapInfo.orderRecords;
                         _this.orderLevelList.total = data.mapInfo.orderTotal;
+                        _this.loadParamSettingBasic();
                     }
                 });
             },
@@ -586,6 +618,7 @@
             },
             //解绑
             openExamineSaleMan(row) {
+                alert(this.activeName);
                 this.$confirm('是否解绑?', '解绑', {
                     distinguishCancelAndClose: true,//设置关闭按钮和不通过按钮的区别
                     confirmButtonText: '同意',
@@ -617,7 +650,13 @@
                     url: basePath + '/fenXiao/fenXiaoUser/unbundlingSaleMan',
                     callback: function (data) {
                         _this.$message.success(data.info);
-                        this.loadInfo();
+                        if(this.activeName == 'first'){
+                            _this.loadParamSetting();
+                        }
+                        if(this.activeName == 'second'){
+                            _this.loadParamSettinglow();
+                        }
+                        _this.loadParamSettingBasic();
                     }
                 });
             },
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html
index 5ced92d..c111661 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html
@@ -99,7 +99,7 @@
                                         type="selection">
                                 </el-table-column>
                                 <el-table-column
-                                        label="分销员" width="120">
+                                        label="分销员" width="150">
                                     <template slot-scope="scope">
                                         <img :src="scope.row.avatarUrl" width="40" height="40" class="head_pic"/>
                                         {{scope.row.nickname}}
@@ -111,7 +111,11 @@
                                 </el-table-column>
                                 <el-table-column
                                         prop="lowerLevelNum"
-                                        label="下级客户数">
+                                        label="推广客户">
+                                </el-table-column>
+                                <el-table-column
+                                        prop="invitedNum"
+                                        label="邀请下级">
                                 </el-table-column>
                                 <el-table-column
                                         prop="totalRevenue"
@@ -154,7 +158,7 @@
                                             <el-button type="primary" v-if="scope.row.applyStatus == 1" size="mini" @click="openExamineSaleManApply(scope.row)">审核</el-button>
                                             <el-button type="primary" v-if="scope.row.applyStatus == 2" size="mini" @click="openUpdateSaleManGrade(scope.row)">修改等级</el-button>
                                             <el-button type="primary" size="mini" @click="openUpdateSaleManGrade(scope.row)">详情</el-button>
-                                            <el-button type="primary" v-if="scope.row.applyStatus == 2" size="mini" @click="delSaleManGradeApply(scope.row)">删除</el-button>
+                                            <el-button type="danger" v-if="scope.row.applyStatus == 2" size="mini" @click="delSaleManGradeApply(scope.row)">删除</el-button>
                                         </el-row>
                                     </template>
                                 </el-table-column>
@@ -209,7 +213,7 @@
                                     <el-row style="display:flex;">
                                         <el-button type="primary" v-if="scope.row.isDefault == 1" size="mini" @click="addFyfa()">新增</el-button>
                                         <el-button type="primary" size="mini" @click="updateFyfa(scope.row)">保存</el-button>
-                                        <el-button type="primary" v-if="scope.row.isDefault == 2" size="mini" @click="delFyfa(scope.row)">删除</el-button>
+                                        <el-button type="danger" v-if="scope.row.isDefault == 2" size="mini" @click="delFyfa(scope.row)">删除</el-button>
                                     </el-row>
                                 </template>
                             </el-table-column>

--
Gitblit v1.9.1