From 39ae83445d16d37a3c02e0dfdeb1be15eac0e2c2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 15 Mar 2021 21:36:12 +0800
Subject: [PATCH] 分销员后台0315
---
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html | 97 ++++++++++++++++++++++++--------
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html | 3 -
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanOrderService.java | 21 ++-----
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml | 1
zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderListVo.java | 2
5 files changed, 82 insertions(+), 42 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanOrderService.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanOrderService.java
index 61115d1..7fce100 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanOrderService.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanOrderService.java
@@ -11,20 +11,10 @@
import com.matrix.system.fenxiao.dto.LoadSetOrderListDtoDto;
import com.matrix.system.fenxiao.dto.UpdateSetOrderDoneDto;
import com.matrix.system.fenxiao.entity.ShopSalesmanOrder;
-import com.matrix.system.fenxiao.vo.FenXiaoSettingVo;
import com.matrix.system.fenxiao.vo.LoadFenxiaoOrderBasicVo;
import com.matrix.system.fenxiao.vo.LoadFenxiaoOrderListVo;
import com.matrix.system.fenxiao.vo.LoadSetOrderListDtoVo;
import com.matrix.system.hive.action.util.QueryUtil;
-import com.matrix.system.hive.bean.ShoppingGoods;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -81,10 +71,11 @@
public AjaxResult updateSetOrderDone(UpdateSetOrderDoneDto updateSetOrderDoneDto) {
//设置用户公司ID
QueryUtil.setQueryLimitCom(updateSetOrderDoneDto);
-// String orderIds = updateSetOrderDoneDto.getOrderIds();
-// if(StrUtil.isNotEmpty(orderIds)){
-// List<Integer> idsList = new ArrayList<>();
-// List<String> idsStringList = Arrays.asList(orderIds.split(","));
+ String orderIds = updateSetOrderDoneDto.getOrderIds();
+ /**
+ if(StrUtil.isNotEmpty(orderIds)){
+ List<Integer> idsList = new ArrayList<>();
+ List<String> idsStringList = Arrays.asList(orderIds.split(","));
//产生订单结算记录
//记录收益流水
@@ -113,7 +104,7 @@
// invitationRevenueFlow.setBusinessId(invitationOrder.getOrderId());
// shopRevenueFlowDao.insert(invitationRevenueFlow);
-// }
+ }*/
return AjaxResult.buildFailInstance("操作成功");
}
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderListVo.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderListVo.java
index d3c41d7..b397718 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderListVo.java
@@ -22,6 +22,8 @@
private String address;
@ApiModelProperty(value = "客户")
private String custom;
+ @ApiModelProperty(value = "客户openId")
+ private String customUserId;
@ApiModelProperty(value = "推广员")
private String parentSale;
@ApiModelProperty(value = "收益类型")
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml
index be189d8..34510ff 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml
@@ -89,6 +89,7 @@
(select order_money from shop_order where id = a.order_id) actualBalance,
(select store_name from shop_store where store_id = (select store_id from shop_order where id = a.order_id)) address,
b.nick_name custom,
+ b.open_id customUserId,
(select nick_name from biz_user where open_id = b.parent_open_id) parentSale,
a.revenue_type profitType,
a.amount profitBalance,
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 4f2f4e6..09b2b96 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
@@ -39,19 +39,19 @@
<el-col class="line" :span="8" style="text-align: center">
<el-card class="box-card" style="background-color: #eee;border-radius: 30px;">
<div>待计算金额</div>
- <div style="padding: 5px;font-size: 18px;">￥{{basicdetail.balance}}</div>
+ <div style="padding: 5px;font-size: 30px;">￥{{basicdetail.balance}}</div>
</el-card >
</el-col>
<el-col class="line" :span="8" style="text-align: center">
<el-card class="box-card" style="background-color: #eee;border-radius: 30px;">
<div>待结算人数</div>
- <div style="padding: 5px;font-size: 18px;">{{basicdetail.waitNum}}人</div>
+ <div style="padding: 5px;font-size: 30px;">{{basicdetail.waitNum}}人</div>
</el-card >
</el-col>
<el-col class="line" :span="8" style="text-align: center">
<el-card class="box-card" style="background-color: #eee;border-radius: 30px;">
<div>待结算订单</div>
- <div style="padding: 5px;font-size: 18px;">{{basicdetail.waitOrderNum}}笔</div>
+ <div style="padding: 5px;font-size: 30px;">{{basicdetail.waitOrderNum}}笔</div>
</el-card >
</el-col>
</el-row>
@@ -63,6 +63,32 @@
<el-col :span="6">
<el-button type="primary" @click="setOrderDone()">批量结算</el-button>
</el-col>
+ <el-dialog title="本次结算分销订单" :visible.sync="dialogFormVisible">
+ <el-form :model="formSelect">
+ <el-form-item label="结算金额：" :label-width="formLabelWidth">
+ <div style="font-size: 30px;color: red">￥{{formSelect.jsje}}</div>
+ </el-form-item>
+ <el-form-item label="结算订单：" :label-width="formLabelWidth">
+ <div style="font-size: 20px;">{{formSelect.jsdds}}单</div>
+ </el-form-item>
+ <el-form-item label="结算人数：" :label-width="formLabelWidth">
+ <div style="font-size: 20px;">{{formSelect.jsrs}}人</div>
+ </el-form-item>
+ <el-form-item label="结算方式：" :label-width="formLabelWidth">
+ <el-radio-group v-model="formSelect.jsfs">
+ <el-radio-button label="1">线下结算</el-radio-button>
+ <el-radio-button label="2">微信余额支付</el-radio-button>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="备注：" :label-width="formLabelWidth">
+ <el-input type="textarea" :rows="3" v-model="formSelect.bz" autocomplete="off"></el-input>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="dialogFormVisible = false">取 消</el-button>
+ <el-button type="primary" @click="updateSetOrderDone()">确 定</el-button>
+ </div>
+ </el-dialog>
<el-col>
<el-form ref="form" :model="form" inline >
<el-form-item label="结算状态" prop="orderType">
@@ -271,11 +297,22 @@
height:'calc(100vh - 240px)',
//基本数据
basicdetail:{},
- //--分销订单
+
+
//选中操作
multipleSelection: [],
orderIds:"",
orderNums:0,
+ dialogFormVisible: false,
+ formSelect: {
+ jsje: '',
+ jsdds: '',
+ jsrs: '',
+ jsfs: 2,
+ bz: ''
+ },
+ formLabelWidth: '120px',
+ //--分销订单
// 条件查询结算状态
orderTypeList:[
{value:'',label:'全部'},
@@ -436,35 +473,47 @@
//拼接出一个逗号隔开的字符串
let submitDate = "";
let orderNum = 0;
+ let orderBalance = 0;
+ let name = [];
for (let i = 0; i < _this.multipleSelection.length; i++) {
let order = _this.multipleSelection[i];
- let orderId = order.id;
- orderNum = orderNum + 1;
- submitDate = submitDate +orderId+",";
+ //待审核的计算到弹出框
+ let ordersetType = order.settleType;
+ if(ordersetType == 1){
+ let orderId = order.id;
+ name.push(order.customUserId);
+ orderNum = orderNum + 1;
+ orderBalance = orderBalance + order.profitBalance;
+ submitDate = submitDate +orderId+",";
+ }
}
_this.orderIds = submitDate;
_this.orderNums = orderNum;
+ _this.formSelect.jsdds = orderNum;
+ _this.formSelect.jsje = orderBalance;
+ _this.formSelect.jsrs = _this.distinctFunction(name).length;
+ },
+ //去重
+ distinctFunction(name){
+ var arr = name,
+ result = [],
+ i,
+ j,
+ len = arr.length;
+ for(i = 0; i < len; i++){
+ for(j = i + 1; j < len; j++){
+ if(arr[i] === arr[j]){
+ j = ++i;
+ }
+ }
+ result.push(arr[i]);
+ }
+ return result;
},
//批量结算
setOrderDone() {
if(this.orderNums > 0){
- this.$confirm('是否结算选中的'+this.orderNums+'条数据?', '批量结算', {
- distinguishCancelAndClose: true,//设置关闭按钮和不通过按钮的区别
- confirmButtonText: '确认',
- cancelButtonText: '取消',
- type: 'info'
- }).then(() => {
- //通过
- this.updateSetOrderDone();
- }).catch(action => {
- //不通过
- if(action === 'cancel'){
- console.log("cancel");
- }else{
- //关闭按钮
- console.log("close");
- }
- });
+ this.dialogFormVisible = true;
}else{
this.$message({
message: '至少需要选中一条数据',
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 97bc047..80c154c 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
@@ -385,7 +385,6 @@
tgtpSubmit(){
let _this = this;
let imageUrl = _this.imageUrl;
- alert(imageUrl);
let data= {
imageUrl:imageUrl,
};
@@ -400,8 +399,6 @@
});
},
handleAvatarSuccess(res, file) {
- //this.imageUrl = URL.createObjectURL(file.raw);
- //alert(res.path);
this.imageUrl = res.path;
},
beforeAvatarUpload(file) {
--
Gitblit v1.9.1