diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue
index c1f68ee49..f5b5950dc 100644
--- a/fuintAdmin/src/views/member/index.vue
+++ b/fuintAdmin/src/views/member/index.vue
@@ -167,7 +167,7 @@
- ![]()
+ ![]()
@@ -464,6 +464,7 @@ export default {
dicts: ['official','zhzt'],
data() {
return {
+ baseUrl:process.env.VUE_APP_BASE_API,
result:{},
// 是否自动上传
isUpload:false,
diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue
index 68bb45ab4..581a1758f 100644
--- a/fuintAdmin/src/views/member/userInfo.vue
+++ b/fuintAdmin/src/views/member/userInfo.vue
@@ -49,7 +49,9 @@
-
{{ form.description ? form.description : "--" }}
@@ -651,11 +653,17 @@
style="width: 240px"
>
-
-
+
+
-
+
-
+
@@ -242,7 +242,7 @@ export default {
desc: ''
},
form1:{},
- formLabelWidth: '70px',
+ formLabelWidth: '80px',
dialogFormVisible:false,
dialogVisible:false,
show:false,
@@ -252,7 +252,12 @@ export default {
title:"",
merchantConfig:{},
rules:{
-
+ merchantName: [
+ { required: true, message: '请选择支付通道', trigger: 'blur' },
+ ],
+ mchntCd: [
+ { required: true, message: '请填写商户号', trigger: 'blur' },
+ ],
}
}
},
diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue
index dd0810621..b797f9420 100644
--- a/fuintAdmin/src/views/staff/list.vue
+++ b/fuintAdmin/src/views/staff/list.vue
@@ -61,17 +61,17 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -92,11 +92,14 @@
禁用
-
-
-
+
+
+
+
+
+
+
+
+
@@ -158,6 +161,8 @@
+
+
@@ -167,30 +172,36 @@
- 普通员工
- 收银员
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -198,30 +209,30 @@
-
-
- 核销权限
-
-
-
-
-
- 特殊权限
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -257,48 +268,48 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -319,206 +330,206 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- 根据需求自行选择模式 -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -560,11 +571,11 @@
style="margin-top: 100px"
width="20%">
@@ -575,11 +586,12 @@ import QRCode from 'qrcode'
import {getName} from "../../utils/fuint";
import {addStaff, createStaffQrCode, delStaff, getStaff, listStaff, queryStaff, updateStaff} from "@/api/staff/staff";
import {getDuty, listDuty} from "@/api/staff/duty";
+import html2canvas from "html2canvas";
export default {
name: "StaffList",
dicts: ['ywqx','write_off','display','zhzt','transaction','time_frame','handover','handover_quit',
- 'jbjl','official','notice','special_prem','role','shqx'],
+ 'jbjl','official','notice','special_prem','role','shqx','staff_role'],
data() {
return {
// 二维码类型
@@ -590,6 +602,7 @@ export default {
roleList:[],
drawer: false,
dialogVisible: false,
+ baseUrl:process.env.VUE_APP_BASE_API,
// 标题
title: "",
// 遮罩层
@@ -732,9 +745,12 @@ export default {
methods: {
// 获取员工码
getStaffQRcode(id){
- console.log(id)
createStaffQrCode(id).then(res => {
- console.log(res)
+ if (res.code==200){
+ this.title = "员工二维码"
+ this.dialogVisible = true
+ this.imgUrl = res.data
+ }
})
},
// 根据字符串获取二维码图片url地址
@@ -772,14 +788,12 @@ export default {
let imgUrl = canvas.toDataURL("image/png"); //可将 canvas 转为 base64 格式
let a = document.createElement('a')
a.href = imgUrl;
- if (id=='woc'){
- a.download = "核销二维码"; //文件名
- }else {
- a.download = "员工二维码"; //文件名
- }
+ a.download = "员工二维码"; //文件名
document.body.appendChild(a);
a.click(); // 触发点击
document.body.removeChild(a); // 然后移除
+ }).catch(err => {
+ console.log(err)
});
},
showDesc(){
@@ -973,8 +987,8 @@ export default {
margin-bottom: 20px;
}
.qrcode{
- width: 180px;
- height: 180px;
+ width: 200px;
+ height: 300px;
margin-top: 15px;
}
diff --git a/fuintAdmin/src/views/staffCommission/staffCommission.vue b/fuintAdmin/src/views/staffCommission/staffCommission.vue
index 2a76f0754..f0a4d085a 100644
--- a/fuintAdmin/src/views/staffCommission/staffCommission.vue
+++ b/fuintAdmin/src/views/staffCommission/staffCommission.vue
@@ -25,7 +25,7 @@
注:规则按照顺序进行处理并自动更换支付通道，新增或变更规则后需要发布当前规则才生效,发布生效后的规则将从序号1的配置生效
-
启用后,当前账户登录POS端后油品收银必选加油员才可进行
下步操作(需系统开启加油选择加油员功能)
- 启用后,当前账户登录...
- 下步操作(需系统开启加油选择加油员功能)
-
交易订单显示信息、终端支持:(PC、
POS、小程序)
- 交易订单显示信息...
- POS、小程序)
-
多选,已选油枪号的交易将发送
模板消息)
- 多选,已选油枪号...
- 模板消息)
-
当前账户下可查看交易的时间范围(PC、
POS端)
- 当前账户下可查看...
- POS端)
- 根据需求自行选择模式 -
-
若无权限,则无法查看交班统计信息和
进行交班操作
- 若无权限,则无法查看...
- 进行交班操作
-
进行交班处理后是否退出当前账户
- 进行交班处理后是否...
- -
全部记录:查看所有员工交班记录,名下
记录:员工自己名下记录(需有交班权限才可查看),
禁用权限:无权限查看交班记录,记录为空
- 全部记录:查看所有...
- 记录:员工自己名下记录(需有交班权限才可查看),
禁用权限:无权限查看交班记录,记录为空
-
交班信息是否显示商户号统计信息,禁
用后当前员工则无商户号统计信息
- 交班信息是否显示商...
- 用后当前员工则无商户号统计信息
-
交易信息是否可以筛选员工进行查
询,启用后可筛选、则反之
- 交易信息是否可以...
- 询,启用后可筛选、则反之
-
-
-
-
- -
POS手持机中功能对应操作权限
- POS手持机中...
-
-
-
-
-
- -
小程序管理端功能对应操作权限
- 小程序管理端功能...
-
- ![]()
+ ![]()
diff --git a/fuintAdmin_zt/src/api/indexBanner/indexBanner.js b/fuintAdmin_zt/src/api/indexBanner/indexBanner.js
new file mode 100644
index 000000000..1a6dccc18
--- /dev/null
+++ b/fuintAdmin_zt/src/api/indexBanner/indexBanner.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询首页轮播图信息
+export function listIndexBanner(query) {
+ return request({
+ url: '/business/indexBanner/lists',
+ method: 'get',
+ params: query
+ })
+}
+
+// 根据id查询首页轮播图信息
+export function indexBannerInfo(id) {
+ return request({
+ url: '/business/indexBanner/'+id,
+ method: 'get',
+ })
+}
+
+// 添加首页轮播图信息
+export function addIndexBanner(data) {
+ return request({
+ url: '/business/indexBanner',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改首页轮播图信息
+export function updateIndexBanner(data) {
+ return request({
+ url: '/business/indexBanner/lists',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除首页轮播图信息
+export function deleteIndexBanner(id) {
+ return request({
+ url: '/business/indexBanner/'+id,
+ method: 'delete',
+ })
+}
diff --git a/fuintAdmin_zt/src/api/indexBanner/ljstore.js b/fuintAdmin_zt/src/api/indexBanner/ljstore.js
new file mode 100644
index 000000000..4d0dba90e
--- /dev/null
+++ b/fuintAdmin_zt/src/api/indexBanner/ljstore.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 查询所有店铺信息
+export function ljStoreList() {
+ return request({
+ url: '/business/storeInformation/store/list',
+ method: 'get',
+ })
+}
diff --git a/fuintAdmin_zt/src/views/indexBanner/index.vue b/fuintAdmin_zt/src/views/indexBanner/index.vue
new file mode 100644
index 000000000..c98fa5f54
--- /dev/null
+++ b/fuintAdmin_zt/src/views/indexBanner/index.vue
@@ -0,0 +1,169 @@
+
+ core
3.3.3
-
+
+ org.springframework
+ spring-test
+ 5.2.9.RELEASE
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
index 0905b3def..773a411ac 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
@@ -118,17 +118,20 @@ public class MerchantConfigServiceImpl extends ServiceImpl i
*/
@Override
public int insertSupplier(Supplier supplier) {
+ int row = 0;
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
- Integer storeId = nowAccountInfo.getStoreId();
- supplier.setStoreId(storeId);
- int row = baseMapper.insert(supplier);
+ Supplier supplier1 = this.selectSupplierByName(supplier.getName());
+ if (ObjectUtil.isEmpty(supplier1)){
+ supplier.setStoreId(nowAccountInfo.getStoreId());
+ row = baseMapper.insert(supplier);
+ }
return row;
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/controller/IndexBannerController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/controller/IndexBannerController.java
index a5c820b3e..7b5937168 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/controller/IndexBannerController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/controller/IndexBannerController.java
@@ -1,13 +1,12 @@
package com.fuint.business.indexBanner.controller;
+import com.fuint.business.indexBanner.entity.IndexBanner;
import com.fuint.business.indexBanner.service.IndexBannerService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/business/indexBanner")
@@ -15,8 +14,69 @@ public class IndexBannerController extends BaseController {
@Autowired
private IndexBannerService indexBannerService;
+ /**
+ * 根据店铺id查询首页轮播图列表
+ * @param storeId
+ * @return
+ */
@GetMapping("/list/{storeId}")
public ResponseObject list(@PathVariable Integer storeId){
return getSuccessResult(indexBannerService.selectIndexBannerList(storeId));
}
+
+ /**
+ * 根据条件分页查询首页轮播图
+ * @param indexBanner
+ * @param pageNo
+ * @param pageSize
+ * @return
+ */
+ @GetMapping("/lists")
+ public ResponseObject lists(IndexBanner indexBanner,
+ @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+ Page page =new Page(pageNo,pageSize);
+ return getSuccessResult(indexBannerService.selectIndexBanners(page,indexBanner));
+ }
+
+ /**
+ * 根据id查询首页轮播图信息
+ * @param id
+ * @return
+ */
+ @GetMapping("/{id}")
+ public ResponseObject indexBannerInfo(@PathVariable Integer id){
+ return getSuccessResult(indexBannerService.selectIndexBannerById(id));
+ }
+
+ /**
+ * 添加首页轮播图信息
+ * @param indexBanner
+ * @return
+ */
+ @PostMapping
+ public ResponseObject add(@RequestBody IndexBanner indexBanner){
+ return getSuccessResult(indexBannerService.insertIndexBanner(indexBanner));
+ }
+
+ /**
+ * 修改首页轮播图信息
+ * @param indexBanner
+ * @return
+ */
+ @PutMapping
+ public ResponseObject edit(@RequestBody IndexBanner indexBanner){
+ return getSuccessResult(indexBannerService.updateIndexBanner(indexBanner));
+ }
+
+ /**
+ * 删除首页轮播图信息
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/{id}")
+ public ResponseObject delete(@PathVariable Integer id){
+ indexBannerService.deleteIndexBanner(id);
+ return getSuccessResult("OK");
+ }
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/entity/IndexBanner.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/entity/IndexBanner.java
index 650a70f56..f2f6ee03c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/entity/IndexBanner.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/entity/IndexBanner.java
@@ -38,86 +38,8 @@ public class IndexBanner extends BaseEntity implements Serializable {
*/
private String routeUrl;
/**
- * 创建时间
+ * 备注
*/
- private Date createTime;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 更新时间
- */
- private Date updateTime;
- /**
- * 更新人
- */
- private String updateBy;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getStoreId() {
- return storeId;
- }
-
- public void setStoreId(Integer storeId) {
- this.storeId = storeId;
- }
-
- public String getBannerUrl() {
- return bannerUrl;
- }
-
- public void setBannerUrl(String bannerUrl) {
- this.bannerUrl = bannerUrl;
- }
-
- public String getRouteUrl() {
- return routeUrl;
- }
-
- public void setRouteUrl(String routeUrl) {
- this.routeUrl = routeUrl;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
+ private String remark;
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/mapper/IndexBannerMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/mapper/IndexBannerMapper.java
index 15d31dfa0..66601afb9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/mapper/IndexBannerMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/mapper/IndexBannerMapper.java
@@ -1,7 +1,17 @@
package com.fuint.business.indexBanner.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.indexBanner.entity.IndexBanner;
+import org.apache.ibatis.annotations.Param;
public interface IndexBannerMapper extends BaseMapper {
+ /**
+ * 根据条件分页查询首页轮播图信息
+ * @param page
+ * @param indexBanner
+ * @return
+ */
+ IPage selectIndexBanners(Page page, @Param("indexBanner") IndexBanner indexBanner);
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/mapper/xml/IndexBannerMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/mapper/xml/IndexBannerMapper.xml
new file mode 100644
index 000000000..c51d42172
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/mapper/xml/IndexBannerMapper.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ select * from index_banner
+
+
+
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/IndexBannerService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/IndexBannerService.java
index 8e0c5539a..e792af390 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/IndexBannerService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/IndexBannerService.java
@@ -1,10 +1,20 @@
package com.fuint.business.indexBanner.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.indexBanner.entity.IndexBanner;
import java.util.List;
public interface IndexBannerService {
+ /**
+ * 根据条件分页查询首页轮播图信息
+ * @param page
+ * @param indexBanner
+ * @return
+ */
+ IPage selectIndexBanners(Page page,IndexBanner indexBanner);
+
/**
* 根据店铺id查询首页banner图
* @return
@@ -16,7 +26,14 @@ public interface IndexBannerService {
* @param routeUrl
* @return
*/
- IndexBanner selectIndexBannerByRouteUrl(String routeUrl);
+ IndexBanner selectIndexBannerByRouteUrl(String routeUrl,Integer storeId);
+
+ /**
+ * 根据id查询首页轮播图信息
+ * @param id
+ * @return
+ */
+ IndexBanner selectIndexBannerById(int id);
/**
* 添加首页banner图
@@ -31,4 +48,10 @@ public interface IndexBannerService {
* @return
*/
int updateIndexBanner(IndexBanner indexBanner);
+
+ /**
+ * 删除首页轮播图信息
+ * @param id
+ */
+ void deleteIndexBanner(int id);
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/impl/IndexBannerServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/impl/IndexBannerServiceImpl.java
index 78305efae..a309bdd57 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/impl/IndexBannerServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/impl/IndexBannerServiceImpl.java
@@ -2,6 +2,8 @@ package com.fuint.business.indexBanner.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.indexBanner.entity.IndexBanner;
import com.fuint.business.indexBanner.mapper.IndexBannerMapper;
@@ -14,6 +16,11 @@ import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class IndexBannerServiceImpl extends ServiceImpl implements IndexBannerService {
+ @Override
+ public IPage selectIndexBanners(Page page, IndexBanner indexBanner) {
+ return baseMapper.selectIndexBanners(page,indexBanner);
+ }
+
@Override
public List selectIndexBannerList(int storeId) {
// AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
@@ -23,12 +30,18 @@ public class IndexBannerServiceImpl extends ServiceImpl();
queryWrapper.eq("route_url",routeUrl);
+ queryWrapper.eq("store_id",storeId);
return baseMapper.selectOne(queryWrapper);
}
+ @Override
+ public IndexBanner selectIndexBannerById(int id) {
+ return baseMapper.selectById(id);
+ }
+
@Override
public int insertIndexBanner(IndexBanner indexBanner) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
@@ -39,7 +52,7 @@ public class IndexBannerServiceImpl extends ServiceImpl {
*/
public int updateStaff(LJStaff staff);
- public void createStaffQrCode(int id, HttpServletRequest request);
+ public String createStaffQrCode(int id, HttpServletRequest request) throws Exception;
/**
* 设定安全的密码，生成随机的salt并经过1024次 sha-1 hash
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
index 78d1a3da4..45565136a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
@@ -12,6 +12,7 @@ import com.fuint.business.storeInformation.entity.LJStore;
import com.fuint.business.storeInformation.service.ILJStoreService;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.service.AccountService;
+import com.fuint.common.service.SettingService;
import com.fuint.common.util.StringUtils;
import com.fuint.common.util.TokenUtil;
import com.fuint.framework.web.ResponseObject;
@@ -21,12 +22,15 @@ import com.fuint.utils.Digests;
import com.fuint.utils.Encodes;
import jdk.nashorn.internal.parser.Token;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -148,11 +152,12 @@ public class LJStaffServiceImpl extends ServiceImpl impl
account.setAccountName(staff.getMobile());
account.setAccountStatus(1);
account.setRealName(staff.getRealName());
- account.setRoleIds(String.valueOf(staff.getRoleId()));
+ account.setRoleIds("0");
account.setStaffId(staff1.getId());
account.setCreateTime(new Date());
account.setUpdateTime(new Date());
account.setStoreId(storeId);
+ account.setPassword(staff.getPassword());
if (StringUtils.isNotEmpty(staff.getRefundPassword())){
account.setPassword(staff.getPassword());
}else {
@@ -171,16 +176,28 @@ public class LJStaffServiceImpl extends ServiceImpl impl
@Override
public int updateStaff(LJStaff staff) {
int row = baseMapper.updateById(staff);
+ if (StringUtils.isNotEmpty(staff.getPassword())){
+ TAccount tAccount = accountService.selectAccountByUserName(staff.getMobile());
+ tAccount.setPassword(staff.getPassword());
+ accountService.entryptPassword(tAccount);
+ try {
+ accountService.editAccount(tAccount,null);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
return row;
}
@Autowired
private ILJStoreService storeService;
@Autowired
+ private SettingService settingService;
+ @Autowired
private BackendFileController backendFileController;
@Override
- public void createStaffQrCode(int id, HttpServletRequest request) {
+ public String createStaffQrCode(int id, HttpServletRequest request) throws Exception {
// 根据id查询员工信息和店铺信息
LJStaff staff = this.selectStaffById(id);
LJStore store = storeService.selectStoreByStoreId(staff.getStoreId());
@@ -193,10 +210,12 @@ public class LJStaffServiceImpl extends ServiceImpl impl
//背景图片路径 loge图片 二维码 输出地址
createLogoCodePicture(backgroundImage, logoImage, url, finalPath, area,store.getAddress());
+ File file =new File(finalPath);
+ FileInputStream fileInputStream =new FileInputStream(file);
+ MultipartFile resFile = new MockMultipartFile("file", file.getName(), null, fileInputStream);
// 返回图片路径
- ResponseObject responseObject = backendFileController.uploadFileLocal(request);
- System.out.println(responseObject.getData());
-// staff.setStaffCode("/statics"+url1.split("/statics")[1]);
+ String saveFile = backendFileController.saveFile(resFile);
+ return saveFile;
}
@Override
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java
index 55745866f..fbb15f50b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java
@@ -47,9 +47,9 @@ public class QrCodeUtils {
//设置颜色。
g.setColor(Color.BLACK);
// 店铺名称位置文字绘制到指定位置
- g.drawString(storeName, 290, 880);
+ g.drawString(storeName, 200, 880);
// // 将码牌编号文字绘制到指定位置
- g.drawString(storeNumber, 290, 800);
+// g.drawString(storeNumber, 200, 800);
g.dispose();
// 输出图片
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
index 85990b1b8..3592729a1 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -401,6 +401,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
@Override
public Map scanAppletQrCode(Map map) {
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Map res = new HashMap<>();
String authCode = map.get("authCode");
// 油品订单金额
@@ -415,14 +416,14 @@ public class OilOrderServiceImpl extends ServiceImpl i
String[] split = authCode.split("19");
// 获取用户id
Integer userId = Integer.valueOf(split[1]);
- res = this.updateUserBalanceAndInsetOrder(userId,map,oilAmount,oilOrders);
+ res = this.updateUserBalanceAndInsetOrder(userId,map,oilAmount,oilOrders,nowAccountInfo.getStoreId());
}
// 二维码支付
if (authCode.contains("9E")) {
String[] split = authCode.split("9E");
// 获取用户id
Integer userId = Integer.valueOf(split[1]);
- res = this.updateUserBalanceAndInsetOrder(userId,map,oilAmount,oilOrders);
+ res = this.updateUserBalanceAndInsetOrder(userId,map,oilAmount,oilOrders,nowAccountInfo.getStoreId());
}
}
return res;
@@ -438,10 +439,10 @@ public class OilOrderServiceImpl extends ServiceImpl i
* @param oilOrders 油品订单
* @return 是否成功
*/
- private Map updateUserBalanceAndInsetOrder(int userId,Map map,Double oilAmount,List oilOrders){
+ private Map updateUserBalanceAndInsetOrder(int userId,Map map,Double oilAmount,List oilOrders,Integer storeId){
Map res = new HashMap<>();
// 根据userId查询用户储值卡信息
- UserBalance balance = userBalanceService.selectUserBalance(userId);
+ UserBalance balance = userBalanceService.selectUserBalanceByStorId(userId,storeId);
// 根据用户id查询用户信息
LJUserVo userVo1 = userService.selectUserById(userId);
@@ -507,7 +508,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
cashierOrder.setTerminal(map.get("terminal"));
cashierOrder.setOilOrderId(oilOrder.getId());
cashierOrderService.insertCashierOrder(cashierOrder);
- this.updateGrowthValue1(oilAmount,userId, Integer.valueOf(oilOrder.getOils()),0.0);
+ this.updateGrowthValue1(oilAmount,userId, Integer.valueOf(oilOrder.getOils()),0.0,storeId);
this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,map.get("payType"),userId,"applet");
res.put("success","success");
@@ -573,7 +574,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
// cashierOrder.setOilDiscountAmount(Double.valueOf(map.get("oilDiscount")));
cashierOrder.setTerminal(map.get("terminal"));
cashierOrder.setOilOrderId(oilOrder.getId());
- this.updateGrowthValue1(0.0,userId, Integer.valueOf(oilOrder.getOils()),refuelMoneyLiters-Double.valueOf(oilOrders.get(i).get("liters").toString()));
+ this.updateGrowthValue1(0.0,userId, Integer.valueOf(oilOrder.getOils()),refuelMoneyLiters-Double.valueOf(oilOrders.get(i).get("liters").toString()),storeId);
}
}else {
@@ -623,8 +624,8 @@ public class OilOrderServiceImpl extends ServiceImpl i
* @param oilId 油号id
* @param refuelMoney 扣除的囤油卡升数
*/
- private void updateGrowthValue1(Double oilActualPay,Integer userid,Integer oilId,Double refuelMoney){
- UserBalance balance = userBalanceService.selectUserBalance(userid);
+ private void updateGrowthValue1(Double oilActualPay,Integer userid,Integer oilId,Double refuelMoney,Integer storeId){
+ UserBalance balance = userBalanceService.selectUserBalanceByStorId(userid,storeId);
JSONArray refuelMoneys = JSONArray.parseArray(balance.getRefuelMoney());
if (oilActualPay==0.0){
if (ObjectUtil.isNotEmpty(refuelMoneys)){
@@ -884,7 +885,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
Integer dieselGrowthValue = null;
Integer naturalGrowthValue = null;
LJStore store = storeService.selectStoreByStoreId(storeId);
- UserBalance balance = userBalanceService.selectUserBalance(userid);
+ UserBalance balance = userBalanceService.selectUserBalanceByStorId(userid,storeId);
int growth = balance.getGrowthValue();
balance.setRefuelMoney(refuelMoney);
// 查询会员等级列表信息
@@ -943,7 +944,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
// 根据用户id查询用户余额信息
LJStore store = storeService.selectStoreByStoreId(storeId);
- UserBalance balance = userBalanceService.selectUserBalance(userId);
+ UserBalance balance = userBalanceService.selectUserBalanceByStorId(userId,storeId);
// 修改余额信息
Double beforeBalance = balance.getCardBalance();
Double afterBalance = beforeBalance - amount;
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/ExportController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/ExportController.java
index e802f3654..e1f584a3f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/ExportController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/ExportController.java
@@ -108,7 +108,7 @@ public class ExportController extends BaseController{
LJUserVo ljUser = new LJUserVo();
ljUser.setUserNo("51246214");
- ljUser.setName("会员");
+ ljUser.setName("张三");
ljUser.setOpenId("15245698512");
ljUser.setMobile("15245698512");
ljUser.setIdcard("845126542514568542");
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/FixingLevelController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/FixingLevelController.java
index 80bedaab0..722f0c249 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/FixingLevelController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/FixingLevelController.java
@@ -37,6 +37,15 @@ public class FixingLevelController extends BaseController {
return getSuccessResult(list);
}
+ /**
+ * 根据店铺id查询所有固定等级信息
+ * @return
+ */
+ @GetMapping("/allFixingLevel")
+ public ResponseObject allFixingLevel(){
+ return getSuccessResult(fixingLevelService.selectFixingLevels());
+ }
+
/**
* 根据id查询固定等级信息
* @param id
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java
index f6098acbe..263b6be9f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java
@@ -125,7 +125,7 @@ public class LJUserController extends BaseController {
*/
@GetMapping("/userBalanceByUserId")
public ResponseObject getUserBalanceByUserId(){
- return getSuccessResult(userBalanceService.selectUserBalanceByUserId());
+ return getSuccessResult(userBalanceService.getUserBalance());
}
/**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/FixingLevelService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/FixingLevelService.java
index 7544d3503..18b4d31ff 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/FixingLevelService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/FixingLevelService.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.fuint.business.userManager.entity.FixingLevel;
+import java.util.List;
+
/**
* 固定等级 业务层
*/
@@ -16,6 +18,12 @@ public interface FixingLevelService extends IService {
*/
public IPage selectFixingLevelList(Page page, FixingLevel fixingLevel);
+ /**
+ * 根据当前店铺id查询所有固定等级信息
+ * @return
+ */
+ public List selectFixingLevels();
+
/**
* 根据id查询固定等级信息
* @param id
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/ChainStoreConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/ChainStoreConfigServiceImpl.java
index 2e0c45b0c..285123a11 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/ChainStoreConfigServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/ChainStoreConfigServiceImpl.java
@@ -92,6 +92,8 @@ public class ChainStoreConfigServiceImpl extends ServiceImpl();
+ queryWrapper.eq("chain_store_id",store.getChainStoreId());
+ return baseMapper.selectOne(queryWrapper);
}
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/FixingLevelServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/FixingLevelServiceImpl.java
index d896e35f4..5298ae515 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/FixingLevelServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/FixingLevelServiceImpl.java
@@ -17,6 +17,8 @@ import com.fuint.common.util.TokenUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* 固定等级信息 业务层
*/
@@ -50,6 +52,14 @@ public class FixingLevelServiceImpl extends ServiceImpl selectFixingLevels() {
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
+ return baseMapper.selectList(queryWrapper);
+ }
+
/**
* 根据id查询固定等级信息
* @param id
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
index 96a1c9992..69f8b1964 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
@@ -45,9 +45,9 @@ public class LJUserServiceImpl extends ServiceImpl impleme
*/
@Override
public IPage selectUserList(Page page, LJUserVo user) {
-// AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
-// Integer storeId = nowAccountInfo.getStoreId();
-// user.setStoreId(storeId);
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId());
+ user.setChainStoreId(store.getChainStoreId());
IPage ljUserIPage = baseMapper.selectUserList(page, user);
return ljUserIPage;
}
@@ -319,7 +319,7 @@ public class LJUserServiceImpl extends ServiceImpl impleme
certifiedMemberMapper.update(certifiedMember,queryWrapper);
// 修改余额会员等级信息
- UserBalance balance = balanceService.selectUserBalance(userVo.getId());
+ UserBalance balance = balanceService.selectUserBalanceByStorId(userVo.getId(),userVo.getStoreId());
if (!ObjectUtil.isEmpty(balance)){
balance.setGradeId(userVo.getGradeId());
balance.setFixingLevel(userVo.getFixingLevel());
@@ -337,7 +337,7 @@ public class LJUserServiceImpl extends ServiceImpl impleme
public void clearRule() {
List list = this.selectUsersList();
for (LJUserVo userVo : list) {
- UserBalance balance = balanceService.selectUserBalance(userVo.getId());
+ UserBalance balance = balanceService.selectUserBalanceByStorId(userVo.getId(),userVo.getStoreId());
LJUserGrade ljUserGrade = userGradeService.selectUserGradeById(userVo.getGradeId());
if (!ObjectUtil.isEmpty(ljUserGrade) && !ObjectUtil.isEmpty(balance)){
// 修改账户成长值信息
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/AccountService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/AccountService.java
index ea5352535..9f0d3bad0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/AccountService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/AccountService.java
@@ -54,6 +54,13 @@ public interface AccountService extends IService {
* */
TAccount createAccountInfo(TAccount accountInfo, List duties);
+ /**
+ * 根据登录名查询员工账户信息
+ * @param accountName
+ * @return
+ */
+ TAccount selectAccountByUserName(String accountName);
+
/**
* 获取账号角色ID
*
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
index fe63c3c1a..fed4873af 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
@@ -2,6 +2,7 @@ package com.fuint.common.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -226,6 +227,13 @@ public class AccountServiceImpl extends ServiceImpl im
}
}
+ @Override
+ public TAccount selectAccountByUserName(String accountName) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("account_name",accountName);
+ return baseMapper.selectOne(queryWrapper);
+ }
+
/**
* 获取账号角色ID
*
diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue
index 11f742f56..131d9ccc8 100644
--- a/gasStation-uni/pages/my/my.vue
+++ b/gasStation-uni/pages/my/my.vue
@@ -290,12 +290,12 @@
method: 'get',
params: this.query
}).then(res => {
- if (res.code == 200) {
+ if (res.data) {
this.cardBalance = res.data.cardBalance,
/* if (res.data.refuelMoney!=null && res.data.refuelMoney!=""){
this.refuelMoney = JSON.parse(res.data.refuelMoney);
} */
- this.refuelMoney = JSON.parse(res.data.refuelMoney);
+ this.refuelMoney = JSON.parse(res.data.refuelMoney);
}
})
},
diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue
index 473d6e815..c0dd6b585 100644
--- a/gasStation-uni/pages/refuel/refuel.vue
+++ b/gasStation-uni/pages/refuel/refuel.vue
@@ -6,7 +6,7 @@
-
+
{{store.name}}{{store.description ? "("+store.description+")" : ""}}
{{store.address}}
- ￥{{oilPrice}}/{{oilUnit}}
+ ￥{{oilPrice}}/{{oilUnit ? oilUnit : "L"}}
-
+
切换站点
diff --git a/gasStation-uni/pagesMy/VIP/vip.vue b/gasStation-uni/pagesMy/VIP/vip.vue
index f129b1d28..fdbe793df 100644
--- a/gasStation-uni/pagesMy/VIP/vip.vue
+++ b/gasStation-uni/pagesMy/VIP/vip.vue
@@ -1,6 +1,6 @@
-
+
会员
@@ -136,6 +136,14 @@
+
+
+
+ 会员
+
+ 当前店铺不存在会员等级信息
+
@@ -186,6 +194,8 @@
naturalGasRule:[],
// 连锁店配置信息
chainStoreConfig: {},
+ // 当前店铺是否存在会员等级信息
+ isExist:false,
}
},
onLoad() {
@@ -221,12 +231,17 @@
url: "business/userManager/userGrade/getGradeList/"+storeId,
method: 'get',
}).then((res) => {
- this.userGradeList = res.data
- this.userGrade = res.data[0]
- if (res.data[0].preferential == '自定义优惠'){
- this.gasolineRule = JSON.parse(res.data[0].gasolineRule)
- this.dieselRule = JSON.parse(res.data[0].dieselRule)
- this.naturalGasRule = JSON.parse(res.data[0].naturalGasRule)
+ if (res.data){
+ this.isExist = true
+ this.userGradeList = res.data
+ this.userGrade = res.data[0]
+ if (res.data[0].preferential == '自定义优惠'){
+ this.gasolineRule = JSON.parse(res.data[0].gasolineRule)
+ this.dieselRule = JSON.parse(res.data[0].dieselRule)
+ this.naturalGasRule = JSON.parse(res.data[0].naturalGasRule)
+ }
+ }else{
+ this.isExist = false
}
})
},
diff --git a/gasStation-uni/pagesMy/myorder/myorder.vue b/gasStation-uni/pagesMy/myorder/myorder.vue
index 9999bf542..d26338c7e 100644
--- a/gasStation-uni/pagesMy/myorder/myorder.vue
+++ b/gasStation-uni/pagesMy/myorder/myorder.vue
@@ -30,7 +30,10 @@
{{getStoreName(storeList,item.storeId)}}
- {{getPayName(payList,item.orderStatus)}}
+
+ 已支付
+ 支付失败
+ 未支付
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.storeId ? storeName(storeList,scope.row.storeId) : "--"}}
+
+
+
+
+ {{scope.row.remark ? scope.row.remark : "--"}}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+ 这是一段信息
+
+
+
+
+
+
+
+
+
diff --git a/fuintBackend/fuint-application/pom.xml b/fuintBackend/fuint-application/pom.xml
index 43b16ac1d..5a11b9151 100644
--- a/fuintBackend/fuint-application/pom.xml
+++ b/fuintBackend/fuint-application/pom.xml
@@ -189,7 +189,11 @@
+ 新增配置
+
+
+