Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem
This commit is contained in:
DESKTOP-369JRHT\12997
commit
8a86d5b0e9
@ -20,7 +20,7 @@
|
||||
</el-switch>
|
||||
</div>
|
||||
</div>
|
||||
<div style="margin-top: 20px"><el-button type="primary" icon="el-icon-plus" @click="addMerchant">添加商户信息</el-button></div>
|
||||
<div style="margin-top: 20px"><el-button type="primary" icon="el-icon-plus" v-hasPermi="['Merchant:add']" @click="addMerchant">添加商户信息</el-button></div>
|
||||
<div class="content-box">
|
||||
<!-- <el-card class="box-card" shadow="hover" v-for="(item,index) in 10" :key="index">-->
|
||||
<!-- <div slot="header" class="clearfix">-->
|
||||
@ -48,12 +48,14 @@
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(item)"
|
||||
v-hasPermi="['Merchant:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(item)"
|
||||
v-hasPermi="['Merchant:delete']"
|
||||
>删除</el-button>
|
||||
</span>
|
||||
</div>
|
||||
@ -88,7 +90,8 @@
|
||||
</div>
|
||||
|
||||
<div class="cont-box" >
|
||||
<div><el-button type="primary" icon="el-icon-plus" @click="addOil">添加规则</el-button></div>
|
||||
<div><el-button type="primary" icon="el-icon-plus"
|
||||
v-hasPermi="['payment:add']" @click="addOil">添加规则</el-button></div>
|
||||
<div><el-button type="success" icon="el-icon-s-promotion" @click="open">发布规则</el-button></div>
|
||||
</div>
|
||||
<div class="hangbox" v-for="(item,index) in oilConfigList" :key="item.id">
|
||||
@ -102,8 +105,10 @@
|
||||
<div style="margin-right: 20px"> %更换支付通道 </div>
|
||||
<!-- <div class="jiaong"> 参与次数不固定次数 </div>-->
|
||||
|
||||
<el-button type="primary" icon="el-icon-edit" @click="editOilConfig(item.id)">编辑</el-button>
|
||||
<el-button type="danger" icon="el-icon-close" @click="deleteOilConfig(item.id)">删除</el-button>
|
||||
<el-button type="primary" icon="el-icon-edit"
|
||||
v-hasPermi="['payment:edit']" @click="editOilConfig(item.id)">编辑</el-button>
|
||||
<el-button type="danger" icon="el-icon-close"
|
||||
v-hasPermi="['payment:delete']" @click="deleteOilConfig(item.id)">删除</el-button>
|
||||
</div>
|
||||
<!-- <div class="hangbox" v-for="(item,index) in 3" :key="index">-->
|
||||
<!-- <div>{{index + 1}}.通道</div>-->
|
||||
|
||||
@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Lazy;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@ -51,6 +52,7 @@ public class CreditUnitServiceImpl extends ServiceImpl<CreditUnitMapper, CreditU
|
||||
hangBillVo.setParams(creditUnit.getParams());
|
||||
List<HangBillVo> hangBillVos = hangBillService.selectHangBillsByCreditUnit(hangBillVo);
|
||||
record.setHangBillTotal(hangBillVos.size());
|
||||
DecimalFormat df = new DecimalFormat("#.00");
|
||||
Double hangBillAmount = 0.0;
|
||||
Integer returnTotal = 0;
|
||||
Double returnAmount = 0.0;
|
||||
@ -66,11 +68,11 @@ public class CreditUnitServiceImpl extends ServiceImpl<CreditUnitMapper, CreditU
|
||||
noReturnAmount += billVo.getOutstandAmount();
|
||||
}
|
||||
}
|
||||
record.setHangBillAmount(hangBillAmount);
|
||||
record.setHangBillAmount(Double.valueOf(df.format(hangBillAmount)));
|
||||
record.setReturnTotal(returnTotal);
|
||||
record.setReturnAmount(returnAmount);
|
||||
record.setReturnAmount(Double.valueOf(df.format(returnAmount)));
|
||||
record.setNoReturnTotal(noReturnTotal);
|
||||
record.setNoReturnAmount(noReturnAmount);
|
||||
record.setNoReturnAmount(Double.valueOf(df.format(noReturnAmount)));
|
||||
|
||||
record.setHangBillVos(hangBillVos);
|
||||
}
|
||||
|
||||
@ -23,6 +23,13 @@ public interface SourceService extends IService<TSource> {
|
||||
*/
|
||||
List<TSource> getAvailableSources(Integer merchantId);
|
||||
|
||||
/**
|
||||
* 根据父级路径查询当前页中按钮权限
|
||||
* @param path
|
||||
* @return
|
||||
*/
|
||||
List<TSource> getButtonPermi(String path);
|
||||
|
||||
/**
|
||||
* 获取有效的菜单集合
|
||||
*
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package com.fuint.common.service.impl;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.fuint.common.domain.TreeSelect;
|
||||
import com.fuint.common.dto.AccountInfo;
|
||||
@ -45,6 +46,20 @@ public class SourceServiceImpl extends ServiceImpl<TSourceMapper, TSource> imple
|
||||
return tSourceMapper.findByStatus(merchantId, StatusEnum.ENABLED.getKey());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<TSource> getButtonPermi(String path) {
|
||||
List<TSource> byStatusButton = null;
|
||||
QueryWrapper queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("path",path);
|
||||
queryWrapper.eq("status","A");
|
||||
queryWrapper.eq("is_menu","1");
|
||||
TSource tSource = baseMapper.selectOne(queryWrapper);
|
||||
if (ObjectUtil.isNotEmpty(tSource)){
|
||||
byStatusButton = tSourceMapper.findByStatusButton(tSource.getSourceId(), StatusEnum.ENABLED.getKey());
|
||||
}
|
||||
return byStatusButton;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<TSource> getAvailableSources1(Integer merchantId) {
|
||||
List<TSource> byStatus1 = tSourceMapper.findByStatus1(merchantId, StatusEnum.ENABLED.getKey());
|
||||
|
||||
@ -199,9 +199,9 @@
|
||||
:class="{ 'wrap-box2': 'oilCard' == payType }" >
|
||||
<span @click="payMethod('oilCard')">囤油卡</span>
|
||||
</div>-->
|
||||
<div class="wrap-box" value="balance"
|
||||
<div class="wrap-box" value="balance" @click="payMethod('balance')"
|
||||
:class="{ 'wrap-box2': 'balance' == payType }" >
|
||||
<span @click="payMethod('balance')">储值卡</span>
|
||||
<span>储值卡</span>
|
||||
</div>
|
||||
<div class="wrap-box" v-for="item in payList"
|
||||
:key="item.dictValue"
|
||||
@ -210,9 +210,9 @@
|
||||
@click="payMethod(item.dictValue)">
|
||||
<span>{{ item.dictLabel }}</span>
|
||||
</div>
|
||||
<div class="wrap-box" value="credit"
|
||||
<div class="wrap-box" value="credit" @click="addCredits('credit')"
|
||||
:class="{ 'wrap-box2': 'credit' == payType }" >
|
||||
<span @click="addCredits('credit')">挂账</span>
|
||||
<span>挂账</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="center-left-bottom">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user