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

更新9.15

Browse Source
This commit is contained in:
许允枞 2024-09-15 23:51:27 +08:00
parent 5af9a9092c
commit a5b7f4b5bf
11 changed files with 81 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/dataSources.xml
View File

@ -6,6 +6,11 @@
<synchronize>true</synchronize>
<jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mysql://47.94.122.58:3306</jdbc-url>
<jdbc-additional-properties>
<property name="com.intellij.clouds.kubernetes.db.host.port" />
<property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
<property name="com.intellij.clouds.kubernetes.db.container.port" />
</jdbc-additional-properties>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component>

8
fuintAdmin_zt/src/api/indexBanner/index.js
View File

@ -62,3 +62,11 @@ export function resetPwd(data) {
data: data
})
}
// 获取部门名称
export function getDeptName() {
return request({
url: '/backendApi/login/getDeptName',
method: 'get',
// data: data
})
}

14
fuintAdmin_zt/src/layout/components/Navbar.vue
View File

@ -31,7 +31,7 @@
</div>
<el-dropdown class="d-s" trigger="click">
<div class="d-s">
<div class="title_">百业兴总部</div>
<div class="title_">{{ deptName }}</div>
<img :src="avatar" style="width: 28px;height: 28px;margin: 0px 10px" />
<span class="user-name">{{ name }}</span>
<i class="el-icon-caret-bottom"/>
@ -73,7 +73,7 @@
</template>
<script>
import { getAccountInfo ,resetPwd } from '@/api/indexBanner/index'
import { getAccountInfo ,resetPwd ,getDeptName} from '@/api/indexBanner/index'
import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import TopNav from '@/components/TopNav'
@ -110,6 +110,7 @@ export default {
password:'',
passwords:''
},
deptName:'',
rules:{
// password: [
// { required: true, message: '请输入密码', trigger: 'blur' },
@ -142,6 +143,9 @@ export default {
Search,
FuintDoc
},
created() {
this.getDeptName()
},
computed: {
...mapGetters([
'sidebar',
@ -184,6 +188,12 @@ export default {
})
},
getDeptName(){
getDeptName().then(res=>{
// console.log("获取到的deptName",res)
this.deptName = res.data.deptName
})
},
postparssword(ruleForm){
if (this.ruleForm.password !== this.ruleForm.passwords) {
this.$message({

21
fuintAdmin_zt/src/views/Site/index.vue
View File

@ -196,9 +196,9 @@
v-model="cascader" :props="defaultProps" @change="handleChanges" :placeholder="parentName" ></el-cascader>
</el-form-item>
<!-- <el-form-item label="上级部门" prop="parentId">-->
<!-- <treeselect v-model="cascader" :options="Thetree" :normalizer="normalizer" @change="handleChanges" placeholder="啊" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="上级部门" prop="parentId">-->
<!-- <treeselect v-model="cascader" :options="Thetree" :normalizer="normalizer" @change="handleChanges" placeholder="啊" />-->
<!-- </el-form-item>-->
<el-form-item v-if="deptType == 2" label="油站名称" prop="deptName">
<el-input :disabled="isTopDept" v-model="ruleForm.deptName" style="width: 670px"></el-input>
</el-form-item>
@ -290,7 +290,7 @@
<el-row >
<el-col :span="20">
<el-form-item label="计费方式" prop="turnoverType">
<span v-if="isTopDept">
<span v-if="isTopDept ">
<el-radio-group :disabled="isTopDept" v-model="ruleForm.turnoverType" @input="changeTheBillingRule">
<el-radio v-if="ruleForm.turnoverType=='1'" label=1>无限制</el-radio>
<el-radio v-if="ruleForm.turnoverType=='5'" label=5>年付费</el-radio>
@ -343,7 +343,7 @@
</template>
</el-row>
</template>
<template v-if="ruleForm.deptType == '3'">
<template v-if="ruleForm.deptType == '3' ">
<el-row >
<el-col :span="20">
<el-form-item label="计费方式" prop="turnoverType">
@ -1431,6 +1431,8 @@ export default {
console.log('点树',data)
console.log("ruleForm",this.ruleForm)
this.isAdd = false
this.cleanUp()
@ -1479,7 +1481,8 @@ export default {
// 修改树
handleChange(value) {
console.log(value);
console.log("ruleForm",value);
},
handleChangeInputNumber(value) {
@ -1775,9 +1778,9 @@ export default {
},
// <el-button size="mini" type="text" on-click={ () => this.appedit(data) }>修改</el-button>
renderContent(h, { node, data, store }) {
console.log("node",node)
console.log("data",data)
console.log("store",store)
// console.log("node",node)
// console.log("data",data)
// console.log("store",store)
let isAdd = data.deptType == '3'
return (

2
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
View File

@ -27,7 +27,7 @@
<el-option label="小程序" value="applet"/>
<el-option label="收银台" value="cashier"/>
<el-option label="POS端" value="POS"/>
<!-- <el-option label="其他" value=""/>-->
<el-option label="其他" value="PC"/>
</el-select>
</el-form-item>
<el-form-item label="" prop="payType" style="width: 180px">

3
fuintAdmin_zt/src/views/system/notify/page/mode.vue
View File

@ -14,7 +14,7 @@
<el-form-item label="" prop="notificationType">
<el-select v-model="queryParams.notificationType" placeholder="请选择通知类型" clearable style="width: 240px;">
<el-option label="到期提醒" value="到期提醒"></el-option>
<el-option label="库存预警" value="库存预警"></el-option>
<el-option label="系统升级" value="系统升级"></el-option>
<!-- 添加其他选项 -->
</el-select>
</el-form-item>
@ -106,6 +106,7 @@
<el-form-item label="通知类型" :required="true">
<el-select v-model="form.notificationType" placeholder="请选择通知类型" style="width: 300px">
<el-option label="到期提醒" value="到期提醒"></el-option>
<el-option label="系统升级" value="系统升级"></el-option>
<!-- 添加其他选项 -->
</el-select>
</el-form-item>

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/controller/CardValueOrdersController.java
View File

@ -63,7 +63,7 @@ public class CardValueOrdersController extends BaseController {
return getSuccessResult(this.cardValueOrdersService.selectCardValueOrders(page, cardValueOrders));
}
@GetMapping("/selectCardValueOrdersByZtDz")
public ResponseObject selectCardValueOrdersByZtDz(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
public ResponseObject selectCardValueOrdersByZtDz(@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
@Param("cardValueOrders") CardValueOrders cardValueOrders) {
Page page = new Page(pageNo, pageSize);

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/CardValueOrdersMapper.java
View File

@ -29,6 +29,6 @@ public interface CardValueOrdersMapper extends BaseMapper<CardValueOrders> {
IPage<CardValueOrders> selectCardValueOrders(Page page,@Param("order") CardValueOrders order);
IPage<CardValueOrders> selectCardValueOrdersByZtDz(Page page,@Param("order") CardValueOrders order);
IPage<CardValueOrders> selectCardValueOrdersByZtDz(@Param("page") Page page,@Param("order") CardValueOrders order);
}

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
View File

@ -589,7 +589,8 @@
sum(CASE WHEN pay_type = 'balance' THEN pay_money ELSE 0 END) balanceMoney,
sum(CASE WHEN pay_type = 'ALIPAY' THEN pay_money ELSE 0 END) alipayMoney,
sum(CASE WHEN status = 'refund' THEN pay_money ELSE 0 END) refMoney,
count(CASE WHEN status = 'refund' THEN pay_money ELSE 0 END) refCount
# count(CASE WHEN status = 'refund' THEN pay_money ELSE 0 END) refCount
count(CASE WHEN status = 'refund' THEN 1 ELSE NULL END) refCount
from all_order_info
<where>
<if test="order.storeIds != null">

21
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
View File

@ -29,6 +29,8 @@ import com.fuint.common.util.RedisLock;
import com.fuint.common.util.TokenUtil;
import com.fuint.system.dept.mapper.SysDeptMapper;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -46,6 +48,8 @@ import java.util.concurrent.TimeUnit;
public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserBalance> implements UserBalanceService {
private static final Logger log = LoggerFactory.getLogger(UserBalanceServiceImpl.class);
@Resource
LJUserGradeService ljUserGradeService;
@Autowired
@ -98,10 +102,19 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
Map<String, Object> leiJiInfo = allOrderInfoMapper.getLeiJiInfo(record);
if (ObjectUtil.isNotEmpty(leiJiInfo)) {
record.setLeijiMoney(leiJiInfo.get("leijiMoney").toString());// 累计消费金额
record.setLeijiNum(leiJiInfo.get("leijiNum").toString()); // 累计消费次数
record.setLeijiMoneyRef(leiJiInfo.get("leijiMoneyRef").toString()); // 累计退款余额
record.setLeijiNumRef(leiJiInfo.get("leijiNum").toString()); // 累计退款笔数
// log.info("累计消费信息："+JSON.toJSONString(leiJiInfo));
if (ObjectUtil.isNotEmpty(leiJiInfo.get("leijiMoneyRef"))) {
record.setLeijiMoney(leiJiInfo.get("leijiMoney").toString());// 累计消费金额
}
if (ObjectUtil.isNotEmpty(leiJiInfo.get("leijiMoneyRef"))) {
record.setLeijiNum(leiJiInfo.get("leijiNum").toString()); // 累计消费次数
}
if (ObjectUtil.isNotEmpty(leiJiInfo.get("leijiMoneyRef"))) {
record.setLeijiMoneyRef(leiJiInfo.get("leijiMoneyRef").toString()); // 累计退款余额
}
if (ObjectUtil.isNotEmpty(leiJiInfo.get("leijiNumRef"))) {
record.setLeijiNumRef(leiJiInfo.get("leijiNum").toString()); // 累计退款笔数
}
}
// 电子礼品卡余额

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

@ -38,6 +38,8 @@ import org.apache.commons.lang3.ObjectUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.Subject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
@ -60,6 +62,9 @@ import java.util.concurrent.TimeUnit;
@RequestMapping("/backendApi/login")
public class BackendLoginController extends BaseController {
private static final Logger log = LoggerFactory.getLogger(BackendLoginController.class);
/**
* 后台账号接口
* */
@ -329,6 +334,10 @@ public class BackendLoginController extends BaseController {
LambdaQueryWrapper<TAccount> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TAccount::getAccountName, accountName);
TAccount one = accountService.getOne(queryWrapper);
log.info("登录信息:{}:",one);
if (ObjectUtil.isEmpty(one)){
throw new RuntimeException("用户不存在！");
}
// if (ObjectUtils.isNotEmpty(one) && ObjectUtils.isNotEmpty(one.getOwnerId()) && one.getOwnerId().toString().equals("3")){
// return getFailureResult(201,"请登录油站端！");
// }
@ -595,4 +604,15 @@ public class BackendLoginController extends BaseController {
return getSuccessResult(true);
}
@ApiOperation(value = "获取部门名称")
@RequestMapping(value = "/getDeptName", method = RequestMethod.GET)
public ResponseObject getDeptName() {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
LambdaQueryWrapper<SysDept> queryWrapper1 = new LambdaQueryWrapper<>();
queryWrapper1.eq(SysDept::getDeptId,nowAccountInfo.getDeptId());
SysDept one1 = iSysDeptService.getOne(queryWrapper1);
return getSuccessResult(one1);
}
}