9.8
This commit is contained in:
DESKTOP-369JRHT\12997
parent
a5fc73266f
commit
5cbaaba1dd
68
.idea/inspectionProfiles/Project_Default.xml
Normal file
68
.idea/inspectionProfiles/Project_Default.xml
Normal file
@ -0,0 +1,68 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="AliAccessStaticViaInstance" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AliArrayNamingShouldHaveBracket" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AliControlFlowStatementWithoutBraces" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AliDeprecation" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AliEqualsAvoidNull" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AliLongLiteralsEndingWithLowercaseL" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AliMissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AliWrapperTypeEquality" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaAbstractClassShouldStartWithAbstractNaming" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaAbstractMethodOrInterfaceMethodMustUseJavadoc" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaAvoidApacheBeanUtilsCopy" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaAvoidCallStaticSimpleDateFormat" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaAvoidCommentBehindStatement" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaAvoidComplexCondition" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaAvoidConcurrentCompetitionRandom" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaAvoidDoubleOrFloatEqualCompare" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaAvoidManuallyCreateThread" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaAvoidMissUseOfMathRandom" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaAvoidNegationOperator" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaAvoidNewDateGetTime" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaAvoidPatternCompileInMethod" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaAvoidReturnInFinally" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaAvoidStartWithDollarAndUnderLineNaming" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaAvoidUseTimer" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaBigDecimalAvoidDoubleConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaBooleanPropertyShouldNotStartWithIs" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaClassCastExceptionWithSubListToArrayList" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaClassCastExceptionWithToArray" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaClassMustHaveAuthor" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaClassNamingShouldBeCamel" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaCollectionInitShouldAssignCapacity" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaCommentsMustBeJavadocFormat" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaConcurrentExceptionWithModifyOriginSubList" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaConstantFieldShouldBeUpperCase" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaCountDownShouldInFinally" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaDontModifyInForeachCircle" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaEnumConstantsMustHaveComment" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaExceptionClassShouldEndWithException" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaIbatisMethodQueryForList" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaLockShouldWithTryFinally" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaLowerCamelCaseVariableNaming" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaMethodReturnWrapperType" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaMethodTooLong" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaPackageNaming" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaPojoMustOverrideToString" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaPojoMustUsePrimitiveField" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaPojoNoDefaultValue" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaRemoveCommentedCode" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaServiceOrDaoClassShouldEndWithImpl" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaSneakyThrowsWithoutExceptionType" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaStringConcat" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaSwitchExpression" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaSwitchStatement" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaTestClassShouldEndWithTestNaming" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaThreadLocalShouldRemove" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaThreadPoolCreation" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaThreadShouldSetName" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaTransactionMustHaveRollback" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaUndefineMagicConstant" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaUnsupportedExceptionWithModifyAsList" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaUseQuietReferenceNotation" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="AlibabaUseRightCaseForDateFormat" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
<inspection_tool class="MapOrSetKeyShouldOverrideHashCodeEquals" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
</profile>
|
||||
</component>
|
||||
@ -6,6 +6,11 @@
|
||||
<option name="name" value="Central Repository" />
|
||||
<option name="url" value="https://repo.maven.apache.org/maven2" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Central Repository" />
|
||||
<option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Maven Central repository" />
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
<option value="$PROJECT_DIR$/fuintBackend/pom.xml" />
|
||||
</list>
|
||||
</option>
|
||||
<option name="workspaceImportForciblyTurnedOn" value="true" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
|
||||
@ -159,55 +159,52 @@
|
||||
</el-drawer>
|
||||
|
||||
<el-drawer
|
||||
title="电子储值卡活动配置"
|
||||
title="新增/修改储值卡活动"
|
||||
:visible.sync="dialog"
|
||||
size="50%"
|
||||
ref="drawer"
|
||||
>
|
||||
<div class="demo-drawer__content">
|
||||
<el-form :model="form" :rules="rules" :inline="true" :label-position="labelPosition" >
|
||||
<div style="display: flex;">
|
||||
<div style="font-size: 14px;margin-right: 15px;padding-top: 8px;">电子储值卡活动适配对象</div>
|
||||
<!-- <div style="display: flex;">-->
|
||||
<!-- <div style="font-size: 14px;margin-right: 15px;padding-top: 8px;">电子储值卡活动适配对象</div>-->
|
||||
|
||||
<el-form-item label="" prop="groupOriented" :label-width="formLabelWidth" >
|
||||
<el-radio-group v-model="form.groupOriented">
|
||||
<!-- <el-form-item label="" prop="groupOriented" :label-width="formLabelWidth" >-->
|
||||
<!-- <el-radio-group v-model="form.groupOriented">-->
|
||||
|
||||
<el-radio label="1">不限群体</el-radio>
|
||||
<el-radio label="2">会员等级</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</div>
|
||||
<!-- <el-radio label="1">不限群体</el-radio>-->
|
||||
<!-- <el-radio label="2">会员等级</el-radio>-->
|
||||
<!-- </el-radio-group>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div>{{form.membershipLevel}}</div>-->
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12"> <el-form-item label="会员等级" prop="region" :label-width="formLabelWidth" v-if="form.groupOriented == '2' " >
|
||||
<el-select v-model="form.membershipLevel" multiple placeholder="会员等级" >
|
||||
<el-option v-for="(item,index) in vipname" :key="index" :label="item.name" :value="item.id.toString()"></el-option>
|
||||
</el-select>
|
||||
</el-form-item></el-col>
|
||||
|
||||
|
||||
<el-col :span="14">
|
||||
<el-form-item label="活动名称" label-width="formLabelWidth" prop="rechargeBalance">
|
||||
<el-input v-model="form.name"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="14">
|
||||
<el-form-item label="充值金额" :label-width="formLabelWidth" prop="rechargeBalance">
|
||||
|
||||
<div style="display: flex">
|
||||
<el-form-item label="充值" label-width="" prop="">
|
||||
<div style="width: 250px">
|
||||
<el-input type="number" v-model="form.rechargeBalance" autocomplete="off">
|
||||
<template slot="append">元</template>
|
||||
</el-input>
|
||||
</div>
|
||||
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="14">
|
||||
<el-form-item label="赠送金额" :label-width="formLabelWidth" prop="giftBalance">
|
||||
<el-form-item label="赠送" label-width="" prop="">
|
||||
<div style="width: 250px">
|
||||
<el-input type="number" v-model="form.giftBalance" autocomplete="off">
|
||||
<template slot="append">元</template>
|
||||
</el-input>
|
||||
</div>
|
||||
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</div>
|
||||
|
||||
|
||||
<el-col :span="14">
|
||||
<el-form-item label="赠送积分" :label-width="formLabelWidth" prop="points">
|
||||
<div style="width: 250px">
|
||||
@ -264,22 +261,25 @@
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<div>
|
||||
<el-form-item label="活动状态" :label-width="formLabelWidth" prop="activeStatus">
|
||||
<el-radio-group v-model="form.activeStatus" :disabled="isOnLine">
|
||||
<el-radio label="1">进行中</el-radio>
|
||||
<el-radio label="2">已结束</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
</div>
|
||||
<div>
|
||||
<el-form-item label="上线/下线" :label-width="formLabelWidth" prop="activeStatus">
|
||||
<el-form-item label="活动状态" :label-width="formLabelWidth" prop="activeStatus">
|
||||
<el-radio-group v-model="form.isonline" @input="changeIsOnline">
|
||||
<el-radio label="0">上线</el-radio>
|
||||
<el-radio label="1">下线</el-radio>
|
||||
<el-radio label="0">上架</el-radio>
|
||||
<el-radio label="1">下架</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</div>
|
||||
<div>
|
||||
<el-form-item label="赠送电子券" :label-width="formLabelWidth" prop="activeStatus">
|
||||
<el-radio-group v-model="form.isonline" @input="changeIsOnline">
|
||||
<el-radio label="0">不赠送</el-radio>
|
||||
<el-radio label="1">赠送</el-radio>
|
||||
</el-radio-group>
|
||||
<el-button type="primary" style="margin-left: 30px" size="mini" @click="getlistFavorable()" >添加</el-button>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<!-- <el-form-item label="排序" :label-width="formLabelWidth" prop="sort">
|
||||
<el-input-number v-model="form.sort" controls-position="right" :min="1" :max="10"></el-input-number>
|
||||
@ -288,7 +288,7 @@
|
||||
<!-- 赠送卡券-->
|
||||
<!-- 选择优惠券-->
|
||||
<div class="xh-box" >
|
||||
<div class="box-bt"> <div >选择优惠券</div> <el-button type="primary" icon="el-icon-plus" @click="getlistFavorable()" >新增</el-button> </div>
|
||||
|
||||
<div style="margin: 10px 0px">
|
||||
<el-table
|
||||
:data="youhuiquanlist"
|
||||
@ -356,73 +356,73 @@
|
||||
</div>
|
||||
</div>
|
||||
<!-- 选择兑换券-->
|
||||
<div class="xh-box" >
|
||||
<div class="box-bt"> <div >选择兑换券</div> <el-button type="primary" icon="el-icon-plus" @click="getlistExchange()" >新增</el-button> </div>
|
||||
<div style="margin: 10px 0px">
|
||||
<el-table
|
||||
:data="duihuanquanlist"
|
||||
border
|
||||
style="width: 100%">
|
||||
<el-table-column
|
||||
prop="giftCardName"
|
||||
label="卡券名称"
|
||||
width="80">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="date"
|
||||
label="券类型"
|
||||
width="80">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.giftCardType == 0" >商品兑换券</span>
|
||||
<span v-if="scope.row.giftCardType == 1" >洗车券</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="date"
|
||||
label="券详情"
|
||||
width="80">
|
||||
<template slot-scope="scope">
|
||||
<span>{{scope.row.giftCardDetail}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="instruction"
|
||||
label="使用说明"
|
||||
width="0">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="date"
|
||||
label="有效期（天）">
|
||||
<template slot-scope="scope">
|
||||
<span> {{ scope.row.giftCardTime }}天 </span>
|
||||
<!-- <div class="xh-box" >-->
|
||||
<!-- <div class="box-bt"> <div >选择兑换券</div> <el-button type="primary" icon="el-icon-plus" @click="getlistExchange()" >新增</el-button> </div>-->
|
||||
<!-- <div style="margin: 10px 0px">-->
|
||||
<!-- <el-table-->
|
||||
<!-- :data="duihuanquanlist"-->
|
||||
<!-- border-->
|
||||
<!-- style="width: 100%">-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="giftCardName"-->
|
||||
<!-- label="卡券名称"-->
|
||||
<!-- width="80">-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="date"-->
|
||||
<!-- label="券类型"-->
|
||||
<!-- width="80">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span v-if="scope.row.giftCardType == 0" >商品兑换券</span>-->
|
||||
<!-- <span v-if="scope.row.giftCardType == 1" >洗车券</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="date"-->
|
||||
<!-- label="券详情"-->
|
||||
<!-- width="80">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{scope.row.giftCardDetail}}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="instruction"-->
|
||||
<!-- label="使用说明"-->
|
||||
<!-- width="0">-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="date"-->
|
||||
<!-- label="有效期（天）">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span> {{ scope.row.giftCardTime }}天 </span>-->
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="date"
|
||||
label="数量"
|
||||
width="240">
|
||||
<template slot-scope="scope">
|
||||
<el-input-number v-model="scope.row.giftCardTotal" controls-position="right" :min="1" :max="9999"></el-input-number>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="操作"
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="date"-->
|
||||
<!-- label="数量"-->
|
||||
<!-- width="240">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-input-number v-model="scope.row.giftCardTotal" controls-position="right" :min="1" :max="9999"></el-input-number>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="address"-->
|
||||
<!-- label="操作"-->
|
||||
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
@click="deletedhdata(scope.row)"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!-- >-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
<!-- @click="deletedhdata(scope.row)"-->
|
||||
<!-- >删除</el-button>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- 附加特权-->
|
||||
<div class="box-popup">
|
||||
<div class="dis-bit">附加特权</div>
|
||||
@ -725,6 +725,9 @@
|
||||
giftBalance: [
|
||||
{ required: true, message: '不能为空', trigger: 'blur' },
|
||||
],
|
||||
membershipLevel:[
|
||||
{ required: true, message: '不能为空', trigger: 'blur' },
|
||||
],
|
||||
rechargeBalance: [
|
||||
{ required: true, message: '不能为空', trigger: 'blur' },
|
||||
],
|
||||
@ -1168,8 +1171,7 @@
|
||||
padding: 15px;
|
||||
}
|
||||
.box-popup{
|
||||
width: 90%;
|
||||
margin: 10px auto;
|
||||
|
||||
}
|
||||
.dis-bit{
|
||||
width: 100%;
|
||||
@ -1177,6 +1179,7 @@
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 15px;
|
||||
font-weight: bold;
|
||||
}
|
||||
.box-bt{
|
||||
width: 100%;
|
||||
@ -1186,8 +1189,7 @@
|
||||
font-size: 18px;
|
||||
}
|
||||
.xh-box{
|
||||
width: 90%;
|
||||
margin: 10px auto;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
# \u57FA\u672C\u914D\u7F6E
|
||||
server.port=8080
|
||||
env.profile=dev
|
||||
env.properties.path=D:/workspaces/oil-stations/fuintBackend/configure/
|
||||
#env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
|
||||
#env.properties.path=F:/work/oilSystem/fuintBackend/configure/
|
||||
#env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
|
||||
#env.properties.path=D:/work/oilSystem/fuintBackend/configure/
|
||||
env.properties.path=D:/code/bulidmap/oil-station/fuintBackend/configure/
|
||||
#env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
|
||||
|
||||
# \u6570\u636E\u5E93\u914D\u7F6E
|
||||
|
||||
Loading…
Reference in New Issue
Block a user