dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-07-30 08:44:28 +08:00
parent dc3716765f
commit bd1919e283
16 changed files with 109 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuintAdmin/src/main.js
View File

@ -60,6 +60,7 @@ Vue.prototype.imgurl = 'http://192.168.0.138:8008'
// Vue.prototype.pcUrl = 'http://192.168.31.178:83/#/homeindex' // 收银台
// Vue.prototype.ztUrl = 'http://192.168.31.178:82/' // 中台
Vue.prototype.cashierUrl = 'https://cashier.youkerr.com/homeindex' // 收银台
Vue.prototype.caUrl = 'http://192.168.31.178:83/' // 收银台校色跳转链接
Vue.prototype.pcUrl = 'https://www.youkerr.com/' // 收银台
Vue.prototype.ztUrl = 'https://oil.youkerr.com/' // 中台
const Collapse= false

13
fuintAdmin/src/store/modules/user.js
View File

@ -58,19 +58,16 @@ const user = {
// dutyRoleCode
Cookies.remove('DUTY_ROLE_CODE');
// sessionStorage.removeItem('DUTY_ROLE_CODE');
Cookies.set("DUTY_ROLE_CODE", res.data.dutyRoleCode);
// sessionStorage.setItem("DUTY_ROLE_CODE", res.data.dutyRoleCode);
//
// sessionStorage.removeItem('IS_BK_LOGIN');
Cookies.remove('IS_ZT_LOGIN');
Cookies.remove('IS_CA_LOGIN');
if (res.data.ownerId == "3") {
setToken(res.data.token)
commit('SET_TOKEN', res.data.token)
Cookies.remove('IS_ZT_LOGIN');
// sessionStorage.removeItem('IS_ZT_LOGIN');
}if (res.data.dutyRoleCode == "2"){
// 收银台跳转
Cookies.set("IS_CA_LOGIN", JSON.stringify(res.data));
}else {
// Cookies.set("IS_ZT_LOGIN", JSON.stringify(res.data));
Cookies.set("IS_ZT_LOGIN", JSON.stringify(res.data));

16
fuintAdmin/src/views/login.vue
View File

@ -280,19 +280,23 @@ export default {
}
app.$store.dispatch("Login", this.loginForm).then(() => {
// Cookies.set("DUTY_ROLE_CODE", res.data.dutyRoleCode);
if (Cookies.get("DUTY_ROLE_CODE") && Cookies.get("DUTY_ROLE_CODE") == 2) {
// if (sessionStorage.getItem('IS_ZT_LOGIN')&& sessionStorage.getItem('IS_ZT_LOGIN') == 2) {
location.replace(this.cashierUrl);
}else {
console.log(1234567890)
// if (Cookies.get("DUTY_ROLE_CODE") && Cookies.get("DUTY_ROLE_CODE") == 2) {
// // if (sessionStorage.getItem('IS_ZT_LOGIN')&& sessionStorage.getItem('IS_ZT_LOGIN') == 2) {
// location.replace(this.cashierUrl);
// }else {
if (Cookies.get("IS_ZT_LOGIN")) {
const data = JSON.parse(Cookies.get("IS_ZT_LOGIN"))
console.log("dataJSON",data)
location.replace(this.ztUrl+"resource_oilbank?token="+data.token);
}else if (Cookies.get("IS_CA_LOGIN")){
const data = JSON.parse(Cookies.get("IS_CA_LOGIN"))
console.log("this.caUrl",this.caUrl)
location.replace(this.caUrl+"resource_oilbank?token="+data.token);
}else {
app.$router.push({ path: this.redirect || "/" }).catch(()=>{});
}
}
// }
}).catch(() => {

18
fuintAdmin_zt/src/views/Site/components/afterff.vue
View File

@ -14,15 +14,7 @@ export default {
return {
dialogVisible:false,
dialogVisible2:false,
tableData: [{
price:2000,
yprice:2500,
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
status:'进行中',
upadate: '2016-05-02',
}, ],
tableData: [],
form: {
deductionRate: '', // 扣点费率
likelyTransactionVolume: '0', // 已发生交易流量
@ -232,23 +224,23 @@ export default {
<el-form :model="form" label-width="120px">
<el-form-item label="扣点费率">
<!-- 假设扣点费率是固定的，这里仅显示 -->
<el-input v-model="form.deductionRate" placeholder="" readonly>
<el-input v-model="form.deductionRate" placeholder="" readonly disabled="true">
<template slot="append">‱</template>
</el-input>
</el-form-item>
<el-form-item label="已发生交易流量">
<el-input v-model="form.likelyTransactionVolume" placeholder="" readonly>
<el-input v-model="form.likelyTransactionVolume" placeholder="" readonly disabled="true">
<template slot="append">万元</template>
</el-input>
</el-form-item>
<el-form-item label="系统服务费统计">
<el-input v-model="form.serviceFeeStatistics" placeholder="" readonly>
<el-input v-model="form.serviceFeeStatistics" placeholder="" readonly disabled="true">
<template slot="append">万元</template>
</el-input>
</el-form-item>
<el-form-item label="系统服务费限制">
<!-- 假设这是固定的，这里仅显示 -->
<el-input v-model="form.serviceFeeLimit" placeholder="" readonly>
<el-input v-model="form.serviceFeeLimit" placeholder="" readonly disabled="true">
<template slot="append">万元</template>
</el-input>
</el-form-item>

16
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
View File

@ -25,6 +25,17 @@
<div class="heng-box" v-if="radio1 == '积分商城分析'"></div>
<div class="heng-box" style="background-color: #FFFFFF" v-else></div>
</div>
<div class="nbox" :class="pointerClass" @click="updateRedio('支付方式分析')">
<div class="fount-box" :style="{ color: radio1 === '支付方式分析' ? '#FF770F' : '#999999' }">支付方式分析</div>
<div class="heng-box" v-if="radio1 == '支付方式分析'"></div>
<div class="heng-box" style="background-color: #FFFFFF" v-else></div>
</div>
<div class="nbox" :class="pointerClass" @click="updateRedio('支付通道分析')">
<div class="fount-box" :style="{ color: radio1 === '支付通道分析' ? '#FF770F' : '#999999' }">支付通道分析</div>
<div class="heng-box" v-if="radio1 == '支付通道分析'"></div>
<div class="heng-box" style="background-color: #FFFFFF" v-else></div>
</div>
</div>
</el-card>
@ -35,6 +46,8 @@
<yunyingfenxi-oil v-if="radio1 === '油品分析'"></yunyingfenxi-oil>
<yunyingfenxi-store v-if="radio1 === '便利店分析'"></yunyingfenxi-store>
<yunyingfenxi-int v-if="radio1 === '积分商城分析'"></yunyingfenxi-int>
<dai_yunyingfenxi-pay-type v-if="radio1 === '支付方式分析'"></dai_yunyingfenxi-pay-type>
<dai_yunyingfenxi-paym v-if="radio1 === '支付通道分析'"></dai_yunyingfenxi-paym>
</template>
</div>
@ -46,6 +59,8 @@ import yunyingfenxiVip from "@/views/financialStatement/yunyingfenxi/tab/vip.vue
import yunyingfenxiInt from "@/views/financialStatement/yunyingfenxi/tab/int.vue";
import yunyingfenxiOil from "@/views/financialStatement/yunyingfenxi/tab/oil.vue";
import yunyingfenxiStore from "@/views/financialStatement/yunyingfenxi/tab/store.vue";
import Dai_yunyingfenxiPaym from "@/views/financialStatement/dai_yunyingfenxi/tab/paym.vue";
import Dai_yunyingfenxiPayType from "@/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue";
export default {
name: "yunyingfenxi-list1",
@ -58,6 +73,7 @@ export default {
}
},
components:{
Dai_yunyingfenxiPayType, Dai_yunyingfenxiPaym,
yunyingfenxiInt,
yunyingfenxiVip,
yunyingfenxiOil,

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/DeptServiceFeeInfoMapper.java
View File

@ -26,6 +26,7 @@ public interface DeptServiceFeeInfoMapper {
*/
DeptServiceFeeInfo queryById(Integer id);
DeptServiceFeeInfo queryByDeptId(Long id);
List<DeptServiceFeeInfo> queryListByDeptId(Long id);
/**
* 查询指定行数据

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptPriceInfoMapper.xml
View File

@ -79,7 +79,7 @@ create_time,create_by,create_name
limit 1
</select>
<select id="getALlInfoBydeptId" resultType="java.util.Map">
select sum(pay_money) payMoney
select COALESCE(SUM(pay_money), 0) payMoney
from all_order_info
where
store_id in

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptServiceFeeInfoMapper.xml
View File

@ -26,7 +26,7 @@ id,deduction_rate,payment_amount,likely_transaction_volume,service_fee_statistic
<select id="queryAllByLimit" resultMap="DeptServiceFeeInfoMap">
select
id,deduction_rate,payment_amount,likely_transaction_volume,
service_fee_statistics,service_fee_limit,status,create_name
service_fee_statistics,service_fee_limit,status,create_name,create_time
from dept_service_fee_info
<where>
dept_id = #{info.deptId}
@ -97,6 +97,12 @@ service_fee_statistics,service_fee_limit,status,create_name
dept_id = #{dept_id}
and status = 2
</select>
<select id="queryListByDeptId" resultType="com.fuint.business.deptPay.entity.DeptServiceFeeInfo">
select
id,deduction_rate,payment_amount,likely_transaction_volume,service_fee_statistics,service_fee_limit,status
from dept_service_fee_info
where dept_id = #{deptId}
</select>
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">

27
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptServiceFeeInfoServiceImpl.java
View File

@ -16,6 +16,8 @@ import com.fuint.common.dto.AccountInfo;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@ -54,17 +56,40 @@ public class DeptServiceFeeInfoServiceImpl implements DeptServiceFeeInfoService
public IPage<DeptServiceFeeInfo> queryByPage(@Param("page") Page page, DeptServiceFeeInfo deptServiceFeeInfo) {
// AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
// deptServiceFeeInfo.setStoreId(nowAccountInfo.getStoreId());
// 查询是否有数据 没有给个默认值
List<DeptServiceFeeInfo> deptServiceFeeInfos = deptServiceFeeInfoMapper.queryListByDeptId(deptServiceFeeInfo.getDeptId());
if (deptServiceFeeInfos.size() == 0) {
// 如果没有数据 默认给个数据
DeptServiceFeeInfo deptServiceFeeInfo1 = new DeptServiceFeeInfo();
deptServiceFeeInfo1.setDeptId(deptServiceFeeInfo.getDeptId());
deptServiceFeeInfo1.setDeductionRate(5.0);
deptServiceFeeInfo1.setLikelyTransactionVolume(0.0);
deptServiceFeeInfo1.setPaymentAmount(0.0);
deptServiceFeeInfo1.setServiceFeeStatistics(0.0);
deptServiceFeeInfo1.setStatus(1);
deptServiceFeeInfo1.setServiceFeeLimit(10000.0);
this.insert(deptServiceFeeInfo1);
}
// 首先查询进行中的是否已缴费 查询当前进行中的
DeptServiceFeeInfo deptServiceFeeInfo1 = deptServiceFeeInfoMapper.queryByDeptId(deptServiceFeeInfo.getDeptId());
// 查询总的交易数据
Map<String, Object> aLlInfoBydeptId = deptPriceInfoService.getALlInfoBydeptId(deptServiceFeeInfo.getDeptId());
if(ObjectUtil.isEmpty(aLlInfoBydeptId)) {
aLlInfoBydeptId = new HashMap<>();
aLlInfoBydeptId.put("payMoney",0);
}
// 查询已发生的交易
Map<String, Object> allyue = deptServiceFeeInfoMapper.getAllYue(deptServiceFeeInfo.getDeptId());
if(ObjectUtil.isEmpty(allyue)) {
allyue = new HashMap<>();
allyue.put("lto",0);
}
String payMoney = ObjectUtil.isNotEmpty(aLlInfoBydeptId.get("payMoney"))?aLlInfoBydeptId.get("payMoney").toString():"0";
String lto = ObjectUtil.isNotEmpty(allyue.get("lto"))?allyue.get("lto").toString():"0";
// 总的交易数据减去已发生的交易
Double v = Double.parseDouble(payMoney) - Double.parseDouble(lto);
//当缴费时 判断当前是否超出缴费金额
if (v > deptServiceFeeInfo1.getDeductionRate()) {
// 超出金额新增一条数据
@ -93,7 +118,7 @@ public class DeptServiceFeeInfoServiceImpl implements DeptServiceFeeInfoService
public DeptServiceFeeInfo insert(DeptServiceFeeInfo deptServiceFeeInfo) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
// deptServiceFeeInfo.setStoreId(nowAccountInfo.getStoreId());
deptServiceFeeInfo.setDeptId(nowAccountInfo.getDeptId());
// deptServiceFeeInfo.setDeptId(nowAccountInfo.getDeptId());
deptServiceFeeInfo.setCreateName(nowAccountInfo.getRealName());
this.deptServiceFeeInfoMapper.insert(deptServiceFeeInfo);
return deptServiceFeeInfo;

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptTransactionInfoServiceImpl.java
View File

@ -62,7 +62,11 @@ public class DeptTransactionInfoServiceImpl implements DeptTransactionInfoServic
// 查询已跑流量
Map<String, Object> aLlInfoBydeptId = deptPriceInfoService.getALlInfoBydeptId(deptTransactionInfo.getDeptId());
String payMoney = aLlInfoBydeptId.get("payMoney").toString();
if (ObjectUtil.isEmpty(aLlInfoBydeptId)) {
aLlInfoBydeptId = new HashMap<>();
aLlInfoBydeptId.put("payMoney", "0");
}
String payMoney = ObjectUtil.isNotEmpty(aLlInfoBydeptId.get("payMoney"))?aLlInfoBydeptId.get("payMoney").toString():"0";
// 根据deptId查询所有流量
// 流量折合
Map<String, Object> etv = deptTransactionInfoMapper.getSumETV(deptTransactionInfo.getDeptId());
@ -73,6 +77,7 @@ public class DeptTransactionInfoServiceImpl implements DeptTransactionInfoServic
deptTransactionInfoMapper.editStatus(deptTransactionInfo.getDeptId());
// 查询未开始的最旧一个
DeptTransactionInfo deptTransactionInfo2 = deptTransactionInfoMapper.queryByDeptIdLimit(deptTransactionInfo.getDeptId());
if (ObjectUtil.isEmpty(deptTransactionInfo2)) return null;
deptTransactionInfo2.setStatus(1);
deptTransactionInfo2.setRemainingTransactionVolume(deptTransactionInfo2.getRemainingTransactionVolume() -Double.parseDouble(etv1.toString()) );

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysNotifyServiceImpl.java
View File

@ -108,6 +108,8 @@ public class SysNotifyServiceImpl extends ServiceImpl<SysNotifyMapper, SysNotif
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
// sysNotify.setStoreId(nowAccountInfo.getStoreId());
sysNotify.setCreateName(nowAccountInfo.getRealName());
sendNotify();
this.sysNotifyMapper.insert(sysNotify);
return sysNotify;
}
@ -121,6 +123,7 @@ public class SysNotifyServiceImpl extends ServiceImpl<SysNotifyMapper, SysNotif
@Override
public SysNotify update(SysNotify sysNotify) {
this.sysNotifyMapper.update(sysNotify);
sendNotify();
return this.queryById(sysNotify.getId());
}

1
fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java
View File

@ -235,7 +235,6 @@ public class BackendLoginController extends BaseController {
}
if (ObjectUtils.isNotEmpty(roleById) && ObjectUtils.isNotEmpty(roleById.getRoleCode())) {
response.setDutyRoleCode(roleById.getRoleCode());
}
response.setOwnerId(one.getOwnerId().toString());
response.setTokenCreatedTime(new Date());

1
fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/response/LoginResponse.java
View File

@ -22,4 +22,5 @@ public class LoginResponse implements Serializable {
private String phone;
private String ownerId;
private String dutyRoleCode;
// private String ;
}

10
fuintBackend/fuint-repository/src/main/resources/mapper/TAccountMapper.xml
View File

@ -90,12 +90,12 @@
</select>
<select id="getAccountByRolsId" resultType="com.fuint.repository.model.TAccount">
select
dept_id deptId,
dept_name deptName,
turnover_type turnoverType
from t_account
ta.dept_id deptId,
td.dept_name deptName,
td.turnover_type turnoverType
from t_account ta left join sys_dept td on ta.dept_id = td.dept_id
where role_ids = #{rolsId}
group by dept_id
group by ta.dept_id
</select>
<select id="getByRoleId" resultType="com.fuint.repository.model.TAccount">
SELECT

27
fuintCashierWeb/src/permission.js
View File

@ -12,20 +12,25 @@ const whiteList = ['/login', '/auth-redirect']
router.beforeEach((to, from, next) => {
NProgress.start()
if (true) {
const urlParams = new URLSearchParams(window.location.search);
console.log("urlParams111",urlParams)
console.log("urlParams111",window.location.search)
const data = urlParams.get('token');
console.log("token",data); // 输出: "value"
// if (true) {
// const urlParams = new URLSearchParams(window.location.search);
// console.log("urlParams111",urlParams)
// console.log("urlParams111",window.location.search)
// const data = urlParams.get('token');
// console.log("token",data); // 输出: "value"
//
// if(data) {
// console.log(data); // 输出: "value"
// setToken(data);
// }
// }
if(data) {
console.log(data); // 输出: "value"
if (to.path === '/resource_oilbank') {
console.log("111111111111111111111oil")
const urlParams = new URLSearchParams(window.location.search);
const data = urlParams.get('token');
setToken(data);
}
}
if (getToken()) {
to.meta.title && store.dispatch('settings/setTitle', to.meta.title)

6
fuintCashierWeb/src/router/index.js
View File

@ -61,6 +61,7 @@ export const constantRoutes = [
name: 'Index',
meta: { title: '系统首页', icon: 'dashboard', affix: true }
},
// {
// path: 'HandoverDetails',
// component: () => import('@/views/cashier/NewComponents/HandoverDetails'),
@ -73,6 +74,11 @@ export const constantRoutes = [
name: 'cashier',
meta: { title: '收银', icon: 'dashboard', affix: true },
children:[
{
path: '/resource_oilbank',
name: 'homeindex',
component: () => import('@/views/cashier/NewComponents/homeindex'),
},
{
path: '/homeindex',
name: 'homeindex',