@@ -213,15 +262,51 @@
-
-
-
-
-
-
-
-
-
+
+
+ {{scope.row.storeId}}
+
+
+
+
+ {{scope.row.contacts}}
+
+
+
+
+ {{scope.row.mobile}}
+
+
+
+
+ {{scope.row.balance}}
+
+
+
+
+ {{scope.row.messageNum}}
+
+
+
+
+ {{scope.row.residueNum}}
+
+
+
+
+ {{scope.row.rechargeRecord}}
+
+
+
+
+ {{scope.row.name}}
+
+
+
+
+ {{scope.row.createTime}}
+
+
提交
+ 取 消
-
+
-
-
+
+
-
-
+
+
-
-
-
-
- 提交
+
+
+
-
+
-
+
-
+
-
-
-
- 提交
+
+
@@ -356,6 +444,8 @@ import {deleteApi, getListApi, saveApi, updateApi} from "../../api/sys/message";
import {getToken} from '../../utils/auth'
import {selectChildByDeptId} from "../../api/system/Site/site";
import NotifyMode from "./page/mode.vue";
+import {getCostListApi, saveCostApi, updateCostApi} from "@/api/sys/messageCost";
+import {getStaffByDeptId} from "@/api/staff/staff";
export default {
name: "printIndex",
@@ -363,8 +453,8 @@ export default {
dicts: ['dept_ids', 'message_status'],
data() {
return {
- activeindex: 0,
- tablist: [
+ tabindex: 0,
+ tabs: [
{
name: '短信模板',
},
@@ -404,7 +494,7 @@ export default {
page: 1,
pageSize: 10,
},
- messageRecordList:[],
+ messageRecordList: [],
total2: 0,
// 查询参数
@@ -412,11 +502,11 @@ export default {
page: 1,
pageSize: 10,
},
- messageCostList:[],
- open2:false,
- form2:{},
- open3:false,
- form3:{},
+ messageCostList: [],
+ open2: false,
+ form2: {},
+ open3: false,
+ form3: {},
// 上传地址
uploadAction: process.env.VUE_APP_BASE_API + 'backendApi/file/upload',
@@ -444,6 +534,15 @@ export default {
],
content: [
{required: true, message: "短信介绍不能为空", trigger: "blur"}
+ ],
+ deptId: [
+ {required: true, message: "机构名称不能为空", trigger: "blur"}
+ ],
+ contacts: [
+ {required: true, message: "联系人不能为空", trigger: "blur"}
+ ],
+ mobile: [
+ {required: true, message: "联系方式不能为空", trigger: "blur"}
]
}
};
@@ -453,12 +552,79 @@ export default {
this.selectChildByDeptIdApi()
},
methods: {
- handleAdd2(){
+ getStaff(deptId){
+ getStaffByDeptId(deptId).then(res => {
+ this.form2.contacts = res.data.realName
+ this.form2.mobile = res.data.mobile
+ this.$forceUpdate()
+ })
+ },
+ // 提交按钮
+ submitForm2: function () {
+ this.$refs["form2"].validate(valid => {
+ if (valid) {
+ if (!this.form2.id) {
+ saveCostApi(this.form2).then(res => {
+ if (res.data==1){
+ this.$message.success("添加成功")
+ this.open2 = false
+ this.queryParams2.page = 1;
+ this.getMessageCostList()
+ }else {
+ this.$message.error("添加失败，机构名称不可重复！")
+ }
+ })
+ } else {
+ updateCostApi(this.form).then(res => {
+ if (res.data==1) {
+ this.$message.success("修改成功")
+ this.open = false
+ this.queryParams.page = 1;
+ this.getList()
+ }else {
+ this.$message.error("添加失败，机构名称不可重复！")
+ }
+ })
+ }
+ }
+ });
+ },
+ // 提交按钮
+ submitForm3: function () {
+ this.$refs["form3"].validate(valid => {
+ if (valid) {
+ if (!this.form3.id) {
+ // saveLinkManageApi(this.form).then(res => {
+ // if (res.data==1){
+ // this.$message.success("添加成功")
+ // this.open = false
+ // this.queryParams.page = 1;
+ // this.getList()
+ // }else {
+ // this.$message.error("添加失败，页面/功能名称不可重复")
+ // }
+ // })
+ } else {
+ // updateLinkManageApi(this.form).then(res => {
+ // if (res.data==1) {
+ // this.$message.success("修改成功")
+ // this.open = false
+ // this.queryParams.page = 1;
+ // this.getList()
+ // }else {
+ // this.$message.error("添加失败，页面/功能名称不可重复")
+ // }
+ // })
+ }
+ }
+ });
+ },
+ handleAdd2() {
this.open2 = true
},
- getMessageCostList(){
- getListApi(this.queryParams2).then(res => {
- this.messageCostList = res.data
+ getMessageCostList() {
+ getCostListApi(this.queryParams2).then(res => {
+ this.messageCostList = res.data.records
this.total2 = res.data.total
})
},
@@ -636,24 +802,32 @@ export default {
.tab-box {
width: 100%;
+ height: 40px;
background: #fff;
display: flex;
box-sizing: border-box;
- padding: 0px 50px;
+ margin-bottom: 25px;
+
}
-.f-box {
- height: 40px;
- color: #999999;
- margin-right: 50px;
+.tab_ {
+ width: 85px;
+ height: 100%;
+ //border-bottom: 2px solid #FF770F;
display: flex;
+ font-weight: 500;
+ font-size: 14px;
+ color: #999999;
align-items: center;
-
+ justify-content: center;
+ margin-left: 50px;
+ cursor: pointer;
}
.active {
- color: #FF9655 !important;
- border-bottom: 2px solid #FF9655 !important;
+ border-bottom: 2px solid #FF770F !important;
+ color: #FF770F !important;
}
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/controller/OpenCardGiftController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/controller/OpenCardGiftController.java
new file mode 100644
index 000000000..dee6456e2
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/controller/OpenCardGiftController.java
@@ -0,0 +1,73 @@
+package com.fuint.business.marketingActivity.openCardGift.controller;
+
+import com.fuint.business.marketingActivity.openCardGift.entity.OpenCardGift;
+import com.fuint.business.marketingActivity.openCardGift.service.OpenCardGiftService;
+import com.fuint.framework.web.BaseController;
+import com.fuint.framework.web.ResponseObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 开卡有礼Controller层
+ */
+@RestController
+@RequestMapping("openCardGift")
+public class OpenCardGiftController extends BaseController {
+ @Autowired
+ private OpenCardGiftService openCardGiftService;
+
+ /**
+ * 通过店铺id查询单条数据
+ *
+ * @return 单条数据
+ */
+ @GetMapping
+ public ResponseObject getInfo() {
+ return getSuccessResult(openCardGiftService.queryByStoreId());
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("{id}")
+ public ResponseObject queryById(@PathVariable("id") Integer id) {
+ return getSuccessResult(openCardGiftService.queryById(id));
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param openCardGift 实体
+ * @return 新增结果
+ */
+ @PostMapping
+ public ResponseObject add(@RequestBody OpenCardGift openCardGift) {
+ return getSuccessResult(openCardGiftService.insert(openCardGift));
+ }
+
+ /**
+ * 编辑数据
+ *
+ * @param openCardGift 实体
+ * @return 编辑结果
+ */
+ @PutMapping
+ public ResponseObject edit(@RequestBody OpenCardGift openCardGift) {
+ return getSuccessResult(openCardGiftService.update(openCardGift));
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键
+ * @return 删除是否成功
+ */
+ @DeleteMapping("{id}")
+ public ResponseObject deleteById(@PathVariable Integer id) {
+ return getSuccessResult(openCardGiftService.deleteById(id));
+ }
+
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/entity/OpenCardGift.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/entity/OpenCardGift.java
new file mode 100644
index 000000000..109f1459a
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/entity/OpenCardGift.java
@@ -0,0 +1,98 @@
+package com.fuint.business.marketingActivity.openCardGift.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fuint.framework.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 营销中心-开卡有礼(OpenCardGift)实体类
+ *
+ * @author makejava
+ * @since 2024-08-27 15:41:16
+ */
+@Data
+@TableName("open_card_gift")
+@ApiModel(value = "OpenCardGift对象", description = "营销中心-开卡有礼")
+public class OpenCardGift extends BaseEntity implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ /**
+ * 主键
+ */
+ @ApiModelProperty("ID")
+ @TableId(value = "ID", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 连锁店id
+ */
+ private Integer chainStoreId;
+ /**
+ * 油站id
+ */
+ private Integer storeId;
+ /**
+ * 活动名称
+ */
+ private String name;
+ /**
+ * 活动时间类型：0永久有效；1自定义
+ */
+ private String activityTimeType;
+ /**
+ * 活动时间前
+ */
+ private Date activityTimeFront;
+ /**
+ * 活动时间后
+ */
+ private Date activityTimeAfter;
+ /**
+ * 通知内容
+ */
+ private String noticeContent;
+ /**
+ * 活动详情
+ */
+ private String activityDetails;
+ /**
+ * 活动奖品（多选）：赠送积分、赠送成长值、赠送优惠券
+ */
+ private String activityPrize;
+ /**
+ * 赠送积分数量
+ */
+ private Integer givePoints;
+ /**
+ * 赠送成长值
+ */
+ private Integer giveGrowthValue;
+ /**
+ * 赠送优惠信息
+ */
+ private String giveCoupon;
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+ /**
+ * 更新人
+ */
+ private String updateBy;
+
+}
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/mapper/OpenCardGiftMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/mapper/OpenCardGiftMapper.java
new file mode 100644
index 000000000..6d457c9e2
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/mapper/OpenCardGiftMapper.java
@@ -0,0 +1,7 @@
+package com.fuint.business.marketingActivity.openCardGift.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fuint.business.marketingActivity.openCardGift.entity.OpenCardGift;
+
+public interface OpenCardGiftMapper extends BaseMapper {
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/service/OpenCardGiftService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/service/OpenCardGiftService.java
new file mode 100644
index 000000000..24a627ddb
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/service/OpenCardGiftService.java
@@ -0,0 +1,50 @@
+package com.fuint.business.marketingActivity.openCardGift.service;
+
+import com.fuint.business.marketingActivity.openCardGift.entity.OpenCardGift;
+
+/**
+ * 营销中心-开卡有礼(OpenCardGift)表服务接口
+ *
+ * @author makejava
+ * @since 2024-08-27 15:41:20
+ */
+public interface OpenCardGiftService {
+ /**
+ * 根据店铺id查询开卡有礼配置信息
+ * @return
+ */
+ OpenCardGift queryByStoreId();
+
+ /**
+ * 通过ID查询单条数据
+ *
+ * @param id 主键
+ * @return 实例对象
+ */
+ OpenCardGift queryById(Integer id);
+
+ /**
+ * 新增数据
+ *
+ * @param openCardGift 实例对象
+ * @return 实例对象
+ */
+ int insert(OpenCardGift openCardGift);
+
+ /**
+ * 修改数据
+ *
+ * @param openCardGift 实例对象
+ * @return 实例对象
+ */
+ int update(OpenCardGift openCardGift);
+
+ /**
+ * 通过主键删除数据
+ *
+ * @param id 主键
+ * @return 是否成功
+ */
+ int deleteById(Integer id);
+
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/service/impl/OpenCardGiftServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/service/impl/OpenCardGiftServiceImpl.java
new file mode 100644
index 000000000..3b379071f
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/service/impl/OpenCardGiftServiceImpl.java
@@ -0,0 +1,74 @@
+package com.fuint.business.marketingActivity.openCardGift.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.business.marketingActivity.openCardGift.entity.OpenCardGift;
+import com.fuint.business.marketingActivity.openCardGift.mapper.OpenCardGiftMapper;
+import com.fuint.business.marketingActivity.openCardGift.service.OpenCardGiftService;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
+import org.springframework.stereotype.Service;
+
+/**
+ * 营销中心-开卡有礼(OpenCardGift)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-08-27 15:41:23
+ */
+@Service("openCardGiftService")
+public class OpenCardGiftServiceImpl extends ServiceImpl implements OpenCardGiftService {
+
+ @Override
+ public OpenCardGift queryByStoreId() {
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
+ return baseMapper.selectOne(queryWrapper);
+ }
+
+ /**
+ * 通过ID查询单条数据
+ * @param id 主键
+ * @return 实例对象
+ */
+ @Override
+ public OpenCardGift queryById(Integer id) {
+ return baseMapper.selectById(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param openCardGift 实例对象
+ * @return 实例对象
+ */
+ @Override
+ public int insert(OpenCardGift openCardGift) {
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ openCardGift.setChainStoreId(nowAccountInfo.getChainStoreId());
+ openCardGift.setStoreId(nowAccountInfo.getStoreId());
+ return baseMapper.insert(openCardGift);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param openCardGift 实例对象
+ * @return 实例对象
+ */
+ @Override
+ public int update(OpenCardGift openCardGift) {
+ return baseMapper.updateById(openCardGift);
+ }
+
+ /**
+ * 通过主键删除数据
+ *
+ * @param id 主键
+ * @return 是否成功
+ */
+ @Override
+ public int deleteById(Integer id) {
+ return baseMapper.deleteById(id);
+ }
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java
index 969ff8f44..eb125c568 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java
@@ -198,4 +198,14 @@ public class LJStaffController extends BaseController {
public ResponseObject queryStaffList(@PathVariable Integer storeId){
return getSuccessResult(mtStaffService.queryStaffs(storeId));
}
+
+ /**
+ * 根据机构id查询员工信息
+ * @param deptId
+ * @return
+ */
+ @GetMapping("/getStaffByDeptId/{deptId}")
+ public ResponseObject selectStaffByDeptId(@PathVariable Long deptId){
+ return getSuccessResult(mtStaffService.selectStaffByDeptId(deptId));
+ }
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java
index 82ff0b1ae..faa076216 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java
@@ -107,4 +107,11 @@ public interface ILJStaffService extends IService {
* @return
*/
LJStaff selectStaffByStoreId(int storeId);
+
+ /**
+ * 根据机构id查询员工信息
+ * @param deptId
+ * @return
+ */
+ LJStaff selectStaffByDeptId(Long deptId);
}
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 6d3841916..a26a00539 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
@@ -62,6 +62,7 @@ public class LJStaffServiceImpl extends ServiceImpl impl
/**
* 根据条件分页查询员工信息
+ *
* @param page
* @param staff
* @return
@@ -76,14 +77,14 @@ public class LJStaffServiceImpl extends ServiceImpl impl
staff.setStoreId(storeId);
IPage ljStaffIPage = baseMapper.selectLJStaffList(page, staff);
List records = ljStaffIPage.getRecords();
- if (CollectionUtils.isNotEmpty(records)){
+ if (CollectionUtils.isNotEmpty(records)) {
for (LJStaff record : records) {
LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(TagCodeRecord::getStaffId,record.getId());
+ queryWrapper.eq(TagCodeRecord::getStaffId, record.getId());
List list = tagCodeRecordService.list(queryWrapper);
- if (ObjectUtils.isNotEmpty(list)){
+ if (ObjectUtils.isNotEmpty(list)) {
record.setTagStatus("1");
- }else {
+ } else {
record.setTagStatus("0");
}
}
@@ -93,6 +94,7 @@ public class LJStaffServiceImpl extends ServiceImpl impl
/**
* 查询所有员工信息
+ *
* @return
*/
@Override
@@ -100,25 +102,25 @@ public class LJStaffServiceImpl extends ServiceImpl impl
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Integer storeId = nowAccountInfo.getStoreId();
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("store_id",storeId);
- queryWrapper.eq("status","qy");
- queryWrapper.eq("if_delete","0");
+ queryWrapper.eq("store_id", storeId);
+ queryWrapper.eq("status", "qy");
+ queryWrapper.eq("if_delete", "0");
List list = baseMapper.selectList(queryWrapper);
return list;
}
@Override
public List queryStaffLists(Integer storeId) {
- if (storeId==null){
+ if (storeId == null) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
storeId = nowAccountInfo.getStoreId();
}
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("store_id",storeId);
- queryWrapper.eq("status","qy");
+ queryWrapper.eq("store_id", storeId);
+ queryWrapper.eq("status", "qy");
/*queryWrapper.eq("role_id","15");*/
- queryWrapper.eq("if_delete","0");
- queryWrapper.eq("is_refuel","xs");
+ queryWrapper.eq("if_delete", "0");
+ queryWrapper.eq("is_refuel", "xs");
List list = baseMapper.selectList(queryWrapper);
return list;
}
@@ -126,17 +128,18 @@ public class LJStaffServiceImpl extends ServiceImpl impl
@Override
public List queryStaffLists1(Integer storeId) {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("store_id",storeId);
- queryWrapper.eq("status","qy");
- queryWrapper.eq("role_id","15");
- queryWrapper.eq("if_delete","0");
- queryWrapper.eq("is_refuel","xs");
+ queryWrapper.eq("store_id", storeId);
+ queryWrapper.eq("status", "qy");
+ queryWrapper.eq("role_id", "15");
+ queryWrapper.eq("if_delete", "0");
+ queryWrapper.eq("is_refuel", "xs");
List list = baseMapper.selectList(queryWrapper);
return list;
}
/**
* 根据id查询员工信息
+ *
* @param id
* @return
*/
@@ -151,19 +154,20 @@ public class LJStaffServiceImpl extends ServiceImpl impl
/**
* 根据手机号查询员工信息
+ *
* @param mobile
* @return
*/
@Override
- public LJStaff selectStaffByMobile(String mobile,Integer storeId) {
- if (ObjectUtil.isEmpty(storeId)){
+ public LJStaff selectStaffByMobile(String mobile, Integer storeId) {
+ if (ObjectUtil.isEmpty(storeId)) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
storeId = nowAccountInfo.getStoreId();
}
QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("mobile",mobile);
- queryWrapper.eq("store_id",storeId);
- queryWrapper.eq("if_delete","0");
+ queryWrapper.eq("mobile", mobile);
+ queryWrapper.eq("store_id", storeId);
+ queryWrapper.eq("if_delete", "0");
LJStaff staff = baseMapper.selectOne(queryWrapper);
return staff;
}
@@ -172,26 +176,28 @@ public class LJStaffServiceImpl extends ServiceImpl impl
@Override
public LJStaff selectStaffByMobile2(String mobile) {
QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("mobile",mobile);
- queryWrapper.eq("status","qy");
- queryWrapper.eq("if_delete","0");
+ queryWrapper.eq("mobile", mobile);
+ queryWrapper.eq("status", "qy");
+ queryWrapper.eq("if_delete", "0");
LJStaff staff = baseMapper.selectOne(queryWrapper);
return staff;
}
/**
* 根据id批量删除员工信息
+ *
* @param ids
*/
@Override
public void deleteStaffByIds(Integer[] ids) {
- for (int id : ids){
+ for (int id : ids) {
this.deleteStaffById(id);
}
}
/**
* 根据id删除员工信息
+ *
* @param id
*/
@Override
@@ -203,6 +209,7 @@ public class LJStaffServiceImpl extends ServiceImpl impl
/**
* 添加用户信息
+ *
* @param staff
* @return
*/
@@ -213,17 +220,17 @@ public class LJStaffServiceImpl extends ServiceImpl impl
if (ObjectUtil.isNotEmpty(staff.getStoreId())) {
storeId = staff.getStoreId();
}
- LJStaff staff2 = this.selectStaffByMobile(staff.getMobile(),storeId);
+ LJStaff staff2 = this.selectStaffByMobile(staff.getMobile(), storeId);
if (ObjectUtil.isNotEmpty(staff2)) return 0;
staff.setStoreId(storeId);
- if (StringUtils.isNotEmpty(staff.getRefundPassword())){
+ if (StringUtils.isNotEmpty(staff.getRefundPassword())) {
this.entryptPassword(staff);
}
int row = baseMapper.insert(staff);
- LJStaff staff1 = this.selectStaffByMobile(staff.getMobile(),storeId);
- if (ObjectUtil.isNotEmpty(staff1)){
+ LJStaff staff1 = this.selectStaffByMobile(staff.getMobile(), storeId);
+ if (ObjectUtil.isNotEmpty(staff1)) {
// 添加员工码
- staff1.setStaffCode("https://oilapi.youkerr.com/oilRefuel?storeId="+storeId+"&staffId="+staff1.getId());
+ staff1.setStaffCode("https://oilapi.youkerr.com/oilRefuel?storeId=" + storeId + "&staffId=" + staff1.getId());
this.updateStaff(staff1);
}
@@ -232,11 +239,11 @@ public class LJStaffServiceImpl extends ServiceImpl impl
TAccount account = new TAccount();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
String timestamp = dateFormat.format(new Date());
- String randomString = UUID.randomUUID().toString().replace("-","").substring(0,6);
- account.setAccountKey(timestamp+randomString);
- if (ObjectUtil.isNotEmpty(staff.getAccountName())){
+ String randomString = UUID.randomUUID().toString().replace("-", "").substring(0, 6);
+ account.setAccountKey(timestamp + randomString);
+ if (ObjectUtil.isNotEmpty(staff.getAccountName())) {
account.setAccountName(staff.getAccountName());
- }else {
+ } else {
account.setAccountName(staff.getMobile());
}
account.setAccountStatus(1);
@@ -249,27 +256,27 @@ public class LJStaffServiceImpl extends ServiceImpl impl
LJStore store = storeService.selectStoreByStoreId(storeId);
account.setDeptId(store.getContractDeptId());
- if (StringUtils.isNotEmpty(staff.getRefundPassword())){
+ if (StringUtils.isNotEmpty(staff.getRefundPassword())) {
account.setPassword(staff.getPassword());
- }else {
+ } else {
account.setPassword("123456");
}
- if (StringUtils.isNotEmpty(staff.getPassword())){
+ if (StringUtils.isNotEmpty(staff.getPassword())) {
account.setPassword(staff.getPassword());
- }else {
+ } else {
account.setPassword("123456");
}
TDuty tDuty = new TDuty();
tDuty.setDutyId(Integer.valueOf(staff1.getRoleId()));
- accountService.createAccountInfo(account,tDutyService.getDutyList(tDuty));
+ accountService.createAccountInfo(account, tDutyService.getDutyList(tDuty));
return row;
}
@Override
- public int addStaff(LJStaff staff,TAccount tAccount) {
+ public int addStaff(LJStaff staff, TAccount tAccount) {
int row = baseMapper.insert(staff);
- LJStaff staff1 = this.selectStaffByMobile(staff.getMobile(),null);
- if (ObjectUtil.isNotEmpty(staff1)){
+ LJStaff staff1 = this.selectStaffByMobile(staff.getMobile(), null);
+ if (ObjectUtil.isNotEmpty(staff1)) {
tAccount.setStaffId(staff1.getId());
accountService.updateAccount(tAccount);
}
@@ -278,23 +285,24 @@ public class LJStaffServiceImpl extends ServiceImpl impl
/**
* 修改用户信息
+ *
* @param staff
* @return
*/
@Override
public int updateStaff(LJStaff staff) {
int row = 0;
- LJStaff staff1 = this.selectStaffByMobile(staff.getMobile(),staff.getStoreId());
- if (ObjectUtil.isNotEmpty(staff1) && !staff1.getId().equals(staff.getId())){
+ LJStaff staff1 = this.selectStaffByMobile(staff.getMobile(), staff.getStoreId());
+ if (ObjectUtil.isNotEmpty(staff1) && !staff1.getId().equals(staff.getId())) {
row = 0;
return row;
}
- if (StringUtils.isEmpty(staff.getStaffCode())){
+ if (StringUtils.isEmpty(staff.getStaffCode())) {
// 添加员工码
- staff.setStaffCode("https://oilapi.youkerr.com/oilRefuel?storeId="+staff.getStoreId()+"&staffId="+staff.getId());
+ staff.setStaffCode("https://oilapi.youkerr.com/oilRefuel?storeId=" + staff.getStoreId() + "&staffId=" + staff.getId());
}
row = baseMapper.updateById(staff);
- if (StringUtils.isNotEmpty(staff.getPassword())){
+ if (StringUtils.isNotEmpty(staff.getPassword())) {
TAccount tAccount = accountService.selectAccountByStaffId(staff.getId());
if (ObjectUtil.isNotEmpty(tAccount)) {
if (StringUtils.isNotEmpty(staff.getPassword())) {
@@ -311,7 +319,7 @@ public class LJStaffServiceImpl extends ServiceImpl impl
e.printStackTrace();
}
}
- }else {
+ } else {
TAccount tAccount = accountService.selectAccountByStaffId(staff.getId());
if (ObjectUtil.isNotEmpty(tAccount)) {
if (tAccount.getAccountName().matches("\\d+")) {
@@ -350,19 +358,19 @@ public class LJStaffServiceImpl extends ServiceImpl impl
// }
String url = staff.getStaffCode();
String area = store.getName();
- String finalPath="/temp/qrCode/" + area + ".jpg";
+ String finalPath = "/temp/qrCode/" + area + ".jpg";
InputStream backgroundStream = this.getClass().getClassLoader().getResourceAsStream(backgroundImage);
InputStream logoStream = this.getClass().getClassLoader().getResourceAsStream(logoImage);
//背景图片路径 loge图片 二维码 输出地址
- qrCodeUtils.createLogoCodePicture(backgroundStream, logoStream, url, finalPath, staff.getId(),store.getId(),null);
+ qrCodeUtils.createLogoCodePicture(backgroundStream, logoStream, url, finalPath, staff.getId(), store.getId(), null);
File file1 = new File("/temp/qrCode/");
// 判断目录是否存在
if (!file1.exists()) {
file1.mkdir();
}
- File file =new File(finalPath);
- FileInputStream fileInputStream =new FileInputStream(file);
+ File file = new File(finalPath);
+ FileInputStream fileInputStream = new FileInputStream(file);
MultipartFile resFile = new MockMultipartFile("file", file.getName(), null, fileInputStream);
// 返回图片路径
String saveFile = backendFileController.saveFile(resFile);
@@ -379,16 +387,16 @@ public class LJStaffServiceImpl extends ServiceImpl impl
@Override
public int auditPrem(String auditPrem) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
- int row = baseMapper.auditPrem(nowAccountInfo.getStaffId(),auditPrem);
+ int row = baseMapper.auditPrem(nowAccountInfo.getStaffId(), auditPrem);
return row;
}
@Override
public List queryStaffs(int storeId) {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("store_id",storeId);
- queryWrapper.eq("status","qy");
- queryWrapper.eq("if_delete","0");
+ queryWrapper.eq("store_id", storeId);
+ queryWrapper.eq("status", "qy");
+ queryWrapper.eq("if_delete", "0");
List list = baseMapper.selectList(queryWrapper);
return list;
}
@@ -397,18 +405,27 @@ public class LJStaffServiceImpl extends ServiceImpl impl
public LJStaff selectStaffByStoreId(int storeId) {
-
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("store_id",storeId);
- queryWrapper.eq("status","qy");
- queryWrapper.eq("if_delete","0");
+ queryWrapper.eq("store_id", storeId);
+ queryWrapper.eq("status", "qy");
+ queryWrapper.eq("if_delete", "0");
//queryWrapper.eq("role_id","12");
queryWrapper.orderByAsc("create_time");
List list = baseMapper.selectList(queryWrapper);
LJStaff staff = null;
- if (list.size()>0){
+ if (list.size() > 0) {
staff = list.get(0);
}
return staff;
}
+
+ @Override
+ public LJStaff selectStaffByDeptId(Long deptId) {
+ LJStaff ljStaff = null;
+ LJStore ljStore = storeService.selectStoreByDeptId(deptId);
+ if (ObjectUtil.isNotEmpty(ljStore)) {
+ ljStaff = this.selectStaffByStoreId(ljStore.getId());
+ }
+ return ljStaff;
+ }
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/entity/MessageCost.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/entity/MessageCost.java
index 1aab6917a..17e57f114 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/entity/MessageCost.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/entity/MessageCost.java
@@ -37,6 +37,10 @@ public class MessageCost extends BaseEntity implements Serializable {
* 油站id
*/
private Integer storeId;
+ /**
+ * 机构id
+ */
+ private Integer deptId;
/**
* 联系人
*/
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/MessageCostService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/MessageCostService.java
index 5eaba28c6..f0236133a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/MessageCostService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/MessageCostService.java
@@ -27,6 +27,8 @@ public interface MessageCostService {
*/
MessageCost queryById(Integer id);
+ MessageCost selectByDeptId(Integer deptId);
+
/**
* 新增数据
*
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/impl/MessageCostServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/impl/MessageCostServiceImpl.java
index 05978bc35..e9c5dfd26 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/impl/MessageCostServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/impl/MessageCostServiceImpl.java
@@ -1,13 +1,19 @@
package com.fuint.business.setting.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.setting.entity.MessageCost;
import com.fuint.business.setting.mapper.MessageCostMapper;
import com.fuint.business.setting.service.MessageCostService;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
import org.springframework.stereotype.Service;
+import java.util.Objects;
+
/**
* 短信费用信息表(MessageCost)表服务实现类
@@ -34,6 +40,13 @@ public class MessageCostServiceImpl extends ServiceImpl();
+ queryWrapper.eq("dept_id",deptId);
+ return baseMapper.selectOne(queryWrapper);
+ }
+
/**
* 新增数据
*
@@ -42,6 +55,13 @@ public class MessageCostServiceImpl extends ServiceImpl
+