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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
13405411873 2023-10-16 17:44:31 +08:00
commit 3f93a5fa53
9 changed files with 176 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
fuintAdmin/src/components/map/mapComponent.vue
View File

@ -3,13 +3,21 @@
<div style="margin: 20px 0px">
<div style="display: flex">
<p style="margin-right: 34px">省市区</p>
<el-cascader :options="options" clearable style="margin-top: 8px"></el-cascader>
<el-cascader
v-model="input"
:options="options"
clearable
style="margin-top: 8px"
@change="changeOption"></el-cascader>
</div>
<div style="display: flex">
<p style="margin-right: 20px">选择区域</p>
<div id="container" class="container" clearable style="margin-top: 15px"></div>
</div>
</div>
{{form.lng}}
{{form.lat}}
{{form.address}}
<p>详细地址：<el-input v-model="form.address"
placeholder="请输入内容"
style="width: 50%"
@ -38,8 +46,8 @@ export default {
keywords: "",
// 位置信息
form: {
lng: "105.602725",
lat: "37.076636",
lng: "",
lat: "",
address: "",
adcode: "", //地区编码
},
@ -51,18 +59,23 @@ export default {
value:'',
label:'',
children:[],
}
},
district:'',
input:'',
}
},
created() {
this.form = this.pform;
this.getOption();
},
mounted() {
this.initAMap();
},
methods:{
changeOption(val){
this.remoteMethod(val[2]);
},
getOption(){
this.form = this.pform;
let _this = this;
getClient().then(response => {
this.options = response.data.list;
@ -73,11 +86,11 @@ export default {
AMapLoader.load({
key: "b5abec514cab7c71cb0572765131e6fc", // 申请好的Web端开发者Key，首次调用 load 时必填
version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
plugins: ["AMap.Geocoder", "AMap.AutoComplete"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
plugins: ["AMap.Geocoder", "AMap.AutoComplete","AMap.DistrictSearch"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
}).then((AMap) => {
this.map = new AMap.Map("container", {
viewMode: "3D", //是否为3D地图模式
zoom: 5, //初始化地图级别
viewMode: "2D", //是否为3D地图模式
zoom: 11, //初始化地图级别
center: [_this.form.lng, _this.form.lat], //初始化地图中心点位置
});
//地址逆解析插件
@ -129,17 +142,31 @@ export default {
},
// 搜索
remoteMethod(query) {
console.log(query);
let _this = this;
if (query !== "") {
this.loading = true;
setTimeout(() => {
this.loading = false;
this.AutoComplete.search(query, (status, result) => {
this.options = result.tips;
// this.AutoComplete.search(query, (status, result) => {
// console.log(result.tips);
// });
var opts = {
subdistrict: 0, //返回下一级行政区
extensions: "all", //返回行政区边界坐标组等具体信息
level: "city" //查询行政级别为 市
};
this.district = new AMap.DistrictSearch(opts); //行政区查询插件
//进入就显示整个国家范围
this.district.search(query, function(status, result) {
_this.form.lng = result.districtList[0].center.lng
_this.form.lat = result.districtList[0].center.lat
_this.toGeoCoder();
_this.initAMap();
});
}, 200);
} else {
// this.options = [];
// this.form = this.pform;
this.initAMap();
}
},
// 选中提示

98
fuintAdmin/src/views/staff/list.vue
View File

@ -252,6 +252,14 @@
:value="dict.value"
/>
</el-select>
<br/>
<el-tooltip
class="item"
effect="dark"
placement="bottom">
<div slot="content">加油时选择加油员场景使用,选择不显示加油员将无法被指定<br/>(需系统开启加油选择加油员功能)终端支持:(PC、POS、小程序)</div>
<span>加油时选择加油员场景使用,选择...</span>
</el-tooltip>
</el-form-item>
</el-col>
<el-col :span="8">
@ -264,6 +272,14 @@
:value="dict.value"
/>
</el-select>
<br/>
<el-tooltip
class="item"
effect="dark"
placement="bottom">
<div slot="content"> 启用后,当前账户登录POS端后油品收银必选加油员才可进行<br/>下步操作(需系统开启加油选择加油员功能) </div>
<span>启用后,当前账户登录POS端后油...</span>
</el-tooltip>
</el-form-item>
</el-col>
<el-col :span="8">
@ -276,6 +292,14 @@
:value="dict.value"
/>
</el-select>
<br/>
<el-tooltip
class="item"
effect="dark"
placement="bottom">
<div slot="content"> 交易订单显示信息、终端支持:(PC、<br/>POS、小程序) </div>
<span>交易订单显示信息、终端支持:(PC...</span>
</el-tooltip>
</el-form-item>
</el-col>
</el-row>
@ -290,6 +314,14 @@
:value="dict.value"
/>
</el-select>
<br/>
<el-tooltip
class="item"
effect="dark"
placement="bottom">
<div slot="content"> 收款成功接收的公众号模板消息通知,需<br/>关注公众号,且本站小程序中会员手机号<br/>信息与当前员工手机号一致 </div>
<span>收款成功接收的公众号模板消息...</span>
</el-tooltip>
</el-form-item>
</el-col>
<el-col :span="8">
@ -302,6 +334,8 @@
:value="dict.value"
/>
</el-select>
<br/>
<span> 多选,已选油枪号的交易将发送模板消息 </span>
</el-form-item>
</el-col>
<el-col :span="8">
@ -314,6 +348,14 @@
:value="dict.value"
/>
</el-select>
<br/>
<el-tooltip
class="item"
effect="dark"
placement="bottom">
<div slot="content">当前账户下可查看交易的时间范围(PC、<br/>POS端)</div>
<span>当前账户下可查看交易的时间范...</span>
</el-tooltip>
</el-form-item>
</el-col>
</el-row>
@ -328,6 +370,8 @@
:value="dict.value"
/>
</el-select>
<br/>
<span> 根据需求自行选择模式 </span>
</el-form-item>
</el-col>
<el-col :span="8">
@ -340,6 +384,14 @@
:value="dict.value"
/>
</el-select>
<br/>
<el-tooltip
class="item"
effect="dark"
placement="bottom">
<div slot="content"> 若无权限,则无法查看交班统计信息和<br/>进行交班操作 </div>
<span>若无权限,则无法查看交班统计...</span>
</el-tooltip>
</el-form-item>
</el-col>
<el-col :span="8">
@ -352,6 +404,8 @@
:value="dict.value"
/>
</el-select>
<br/>
<span> 进行交班处理后是否退出当前账户 </span>
</el-form-item>
</el-col>
</el-row>
@ -366,6 +420,14 @@
:value="dict.value"
/>
</el-select>
<br/>
<el-tooltip
class="item"
effect="dark"
placement="bottom">
<div slot="content"> 全部记录:查看所有员工交班记录,名下<br/>记录:员工自己名下记录(需有交班权限才可查看),<br/>禁用权限:无权限查看交班记录,记录为空 </div>
<span>全部记录:查看所有员工交班记录...</span>
</el-tooltip>
</el-form-item>
</el-col>
<el-col :span="8">
@ -378,6 +440,14 @@
:value="dict.value"
/>
</el-select>
<br/>
<el-tooltip
class="item"
effect="dark"
placement="bottom">
<div slot="content"> 交班信息是否显示商户号统计信息,禁<br/>用后当前员工则无商户号统计信息 </div>
<span>交班信息是否显示商户号统计信...</span>
</el-tooltip>
</el-form-item>
</el-col>
<el-col :span="8">
@ -390,6 +460,14 @@
:value="dict.value"
/>
</el-select>
<br/>
<el-tooltip
class="item"
effect="dark"
placement="bottom">
<div slot="content"> 交易信息是否可以筛选员工进行查<br/>询,启用后可筛选、则反之 </div>
<span>交易信息是否可以筛选员工进行...</span>
</el-tooltip>
</el-form-item>
</el-col>
</el-row>
@ -403,6 +481,8 @@
:props="props"
@change="handleNodeClick1"
clearable></el-cascader>
<br/>
<span> POS手持机中功能对应操作权限 </span>
</div>
</el-form-item>
</el-col>
@ -415,6 +495,8 @@
:props="props"
@change="handleNodeClick2"
clearable></el-cascader>
<br/>
<span> 小程序管理端功能对应操作权限 </span>
</div>
</el-form-item>
</el-col>
@ -428,6 +510,14 @@
:value="dict.value"
/>
</el-select>
<br/>
<el-tooltip
class="item"
effect="dark"
placement="bottom">
<div slot="content"> 状态禁用后,当前账户则无法进行<br/>登录和操作</div>
<span>状态禁用后,当前账户则无法进行登...</span>
</el-tooltip>
</el-form-item>
</el-col>
</el-row>
@ -458,6 +548,7 @@ export default {
'jbjl','official','notice','special_prem','role'],
data() {
return {
drawer: false,
// 标题
title: "",
// 遮罩层
@ -575,6 +666,9 @@ export default {
// this.getStoreList();
},
methods: {
showDesc(){
this.drawer = true;
},
handleNodeClick1(data) {
this.form.posPrem = JSON.stringify(data);
},
@ -691,8 +785,8 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
if (!this.form.id) {
this.form.posPrem = JSON.parse(this.form.posPrem);
this.form.appletPrem = JSON.parse(this.form.appletPrem);
this.form.posPrem = JSON.stringify(this.form.posPrem);
this.form.appletPrem = JSON.stringify(this.form.appletPrem);
addStaff(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;

4
fuintAdmin/src/views/staff/storeInfo/index.vue
View File

@ -7,6 +7,10 @@
<map-componment :pform="form"></map-componment>
<p>详细地址：<el-input v-model="store.address"
placeholder="请输入内容"
style="width: 50%"
></el-input></p>
<div style="display: flex;margin-bottom: 20px">
<span style="margin-right: 10px">店铺福利：</span>
<el-checkbox-group v-model="welfare" ref="" @change="getCheckbox">

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilName.java
View File

@ -1,5 +1,7 @@
package com.fuint.business.petrolStationManagement.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fuint.repository.model.base.BaseEntity;
import io.swagger.annotations.ApiModel;
@ -16,6 +18,7 @@ import lombok.Data;
@Data
public class OilName extends BaseEntity {
@ApiModelProperty("商户名")
@TableId(value = "id", type = IdType.AUTO)
public Long id; //id（主键)
private String oilType; // 油品类型
private String oilName; //油品名称
@ -26,5 +29,7 @@ public class OilName extends BaseEntity {
private String ifDelete; //
private String receivingUnits; //
private String unit; //
private Integer storeId; //
}

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilNumber.java
View File

@ -1,5 +1,7 @@
package com.fuint.business.petrolStationManagement.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fuint.repository.model.base.BaseEntity;
import io.swagger.annotations.ApiModel;
@ -17,6 +19,7 @@ import lombok.Data;
@Data
public class OilNumber extends BaseEntity {
@ApiModelProperty("商户名")
@TableId(value = "number_id", type = IdType.AUTO)
public Integer numberId; //id（主键)
private String oilType; // 油品类型
private String oilName; //油品名称
@ -30,6 +33,6 @@ public class OilNumber extends BaseEntity {
private String remark; //
private String ifDelete; //
private String unit; //
private String storeId; //
private Integer storeId; //
}

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilPresetPrices.java
View File

@ -1,5 +1,7 @@
package com.fuint.business.petrolStationManagement.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fuint.repository.model.base.BaseEntity;
import lombok.Data;
@ -16,18 +18,19 @@ import java.util.Date;
@Data
public class OilPresetPrices extends BaseEntity {
@TableId(value = "number_id", type = IdType.AUTO)
private Long presetId; // id（主键)
private Long oilType; // 预设油号 id
private Double currentPetrolPrices; // 当前油站价
private Double presetOilPrices; // 预设油站价
private Double currentGbPrice; // 当前国标价
private Double presetGbPrice; // 预设国标价
// private String createTime; // 创建时间
// private String updateTime; // 更新时间
private String effectiveTime; // 生效时间（时间戳）
private Integer ifDelete; // 是否删除（0未删除|1删除）
private Integer state; // 状态
private Integer numberId; // 状态
private Integer storeId; // 关联的店铺id
// /**

19
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml
View File

@ -75,18 +75,17 @@
<update id="updateOilNumber">
update oil_number
<set>
<if test=" oilType != null">oil_type= #{oilType},</if>
<if test=" oilName != null">oil_name= #{oilName},</if>
<if test=" oilPrice != null">oil_price= #{oilPrice},</if>
<if test=" gbPrice != null">gb_price= #{gbPrice},</if>
<if test=" receivingUnits != null">receiving_units= #{receivingUni},</if>
<if test=" oilType != null and oilType != ''">oil_type= #{oilType},</if>
<if test=" oilName != null and oilName != ''">oil_name= #{oilName},</if>
<if test=" oilPrice != null and oilPrice != ''" >oil_price= #{oilPrice},</if>
<if test=" gbPrice != null and gbPrice != ''">gb_price= #{gbPrice},</if>
<if test=" receivingUnits != null and receivingUnits != ''">receiving_units= #{receivingUnits},</if>
<if test=" createTime != null">create_time= #{createTime},</if>
<if test=" updateTime != null">update_time= #{updateTime},</if>
<if test=" state != null"> state = #{state},</if>
<if test=" sort != null">sort= #{sort},</if>
<if test=" remark != null">remark= #{remark},</if>
<if test=" ifDelete != null">if_delete= #{ifDelete},</if>
<if test=" unit != null">unit= #{unit},</if>
<if test=" state != null and state != ''"> state = #{state},</if>
<if test=" sort != null and sort != ''">sort= #{sort},</if>
<if test=" remark != null and remark != ''">remark= #{remark},</if>
<if test=" unit != null and unit != ''">unit= #{unit},</if>
</set>
where number_id = #{numberId}
</update>

17
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilPresetPricesServiceImpl.java
View File

@ -14,6 +14,7 @@ import com.fuint.quartz.domain.SysJob;
import com.fuint.quartz.service.ISysJobService;
import org.quartz.SchedulerException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@ -52,6 +53,7 @@ public class OilPresetPricesServiceImpl extends ServiceImpl<OilPresetPricesMappe
}
@Override
@Transactional(rollbackFor = Exception.class)
public int insertOilPresetPrices(OilPresetPrices presetPrices) {
// Date date = new Date();
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
@ -61,9 +63,12 @@ public class OilPresetPricesServiceImpl extends ServiceImpl<OilPresetPricesMappe
//
// SysJob sysJob = new SysJob();
// sysJob.setJobGroup("sdsd");
// sysJob.setJobGroup("dssd");
// sysJob.setInvokeTarget("ssdsd");
// sysJob.setJobGroup("1111");
// sysJob.setJobGroup("1111");
// sysJob.setInvokeTarget("1111");
// sysJob.setConcurrent("1");
// sysJob.setCronExpression("1111");
//
// try {
// iSysJobService.insertJob(sysJob);
// } catch (SchedulerException e) {
@ -73,9 +78,9 @@ public class OilPresetPricesServiceImpl extends ServiceImpl<OilPresetPricesMappe
// }
Instant instant = Instant.parse(presetPrices.getEffectiveTime());
Long timestamp = instant.toEpochMilli();
presetPrices.setEffectiveTime(timestamp.toString());
// Instant instant = Instant.parse(presetPrices.getEffectiveTime());
// Long timestamp = instant.toEpochMilli();
// presetPrices.setEffectiveTime(timestamp.toString());
return baseMapper.insertOilPresetPrices(presetPrices);
}

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJRegionServiceImpl.java
View File

@ -47,7 +47,7 @@ public class LJRegionServiceImpl extends ServiceImpl<LJRegionMapper, LJRegion> i
dto.setCity(new ArrayList<>());
regionDto.setLabel(mtRegion.getName());
regionDto.setValue(mtRegion.getCode());
regionDto.setValue(mtRegion.getName());
regionDto.setChildren(new ArrayList<>());
treeData.add(dto);
list.add(regionDto);
@ -69,7 +69,7 @@ public class LJRegionServiceImpl extends ServiceImpl<LJRegionMapper, LJRegion> i
dto.setLevel(mtRegion.getLevel() + "");
regionDto.setLabel(mtRegion.getName());
regionDto.setValue(mtRegion.getCode());
regionDto.setValue(mtRegion.getName());
List<RegionDto> regionArr = new ArrayList<>();
List<LJRegionDto> region = new ArrayList<>();
@ -85,7 +85,7 @@ public class LJRegionServiceImpl extends ServiceImpl<LJRegionMapper, LJRegion> i
dto1.setLevel(mtRegion1.getLevel() + "");
regionDto1.setLabel(mtRegion1.getName());
regionDto1.setValue(mtRegion1.getCode());
regionDto1.setValue(mtRegion1.getName());
regionArr.add(dto1);
region.add(regionDto1);