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

no message

Browse Source
This commit is contained in:
wangh 2024-03-04 16:47:16 +08:00
parent 873cf444e8
commit a504720e4c
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -857,6 +857,8 @@ export default {
}, },
//新增节点 //新增节点
submitForms(formName) { submitForms(formName) {
console.log("timeFrame ",this.timeFrame)
console.log("this.ruleForm ",this.ruleForm)
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
console.log("timeFrame",this.timeFrame) console.log("timeFrame",this.timeFrame)
@ -923,6 +925,7 @@ export default {
this.cleanRuleForm() this.cleanRuleForm()
this.activeName = 'info' this.activeName = 'info'
this.pdinfo = 1 this.pdinfo = 1
this.timeFrame = []
this.addNode(data.id,data.label) this.addNode(data.id,data.label)
// console.log(this.pdinfo) // console.log(this.pdinfo)

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
View File

@ -277,8 +277,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
@Autowired @Autowired
private RedisLock redisLock; private RedisLock redisLock;
@Autowired
private StaffCommissionService staffCommissionService;
private static String beforeLitres = new String("0"); private static String beforeLitres = new String("0");
/** /**
* 查询支付状态 修改相关关联表 * 查询支付状态 修改相关关联表

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
View File

@ -434,7 +434,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
private static AllOrderInfo getAllOrderInfo(CardValueRecordDTO cardValueRecordDTO) { private static AllOrderInfo getAllOrderInfo(CardValueRecordDTO cardValueRecordDTO) {
AllOrderInfo allOrderInfo = new AllOrderInfo(); AllOrderInfo allOrderInfo = new AllOrderInfo();
allOrderInfo.setOrderNo(cardValueRecordDTO.getPaymentNo()); allOrderInfo.setOrderNo(cardValueRecordDTO.getPaymentNo());
allOrderInfo.setType("2"); allOrderInfo.setType("3");
allOrderInfo.setStoreId(cardValueRecordDTO.getStoreId()); allOrderInfo.setStoreId(cardValueRecordDTO.getStoreId());
allOrderInfo.setGoodsMoney(cardValueRecordDTO.getGiftBalance()); allOrderInfo.setGoodsMoney(cardValueRecordDTO.getGiftBalance());
allOrderInfo.setPayMoney(cardValueRecordDTO.getRealyPayBills()); allOrderInfo.setPayMoney(cardValueRecordDTO.getRealyPayBills());

17
fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
View File

@ -288,6 +288,9 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
staff.setRoleId(roleId); staff.setRoleId(roleId);
staff.setMobile(param.get("mobile").toString()); staff.setMobile(param.get("mobile").toString());
// if ("3".equals(deptType)) {
//
// }
// 查询手机号是否存在 // 查询手机号是否存在
LambdaQueryWrapper<LJStaff> lambdaQueryWrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<LJStaff> lambdaQueryWrapper = Wrappers.lambdaQuery();
// 查询手机号是否存在 // 查询手机号是否存在
@ -300,20 +303,24 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
} }
ljStaffMapper.insert(staff); ljStaffMapper.insert(staff);
// 添加员工码信息 // 添加员工码信息
QueryWrapper queryWrapper = new QueryWrapper<>(); QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("mobile",param.get("mobile").toString()); queryWrapper.eq("mobile",param.get("mobile").toString());
queryWrapper.eq("store_id",mtStore.getId()); queryWrapper.eq("store_id",mtStore.getId());
queryWrapper.eq("if_delete","0"); queryWrapper.eq("if_delete","0");
staff = ljStaffMapper.selectOne(queryWrapper); staff = ljStaffMapper.selectOne(queryWrapper);
staff.setStaffCode("https://www.tuofeng.cc/oilRefuel?storeId="+storeId+"&staffId="+staff.getId()); if (ObjectUtil.isNotEmpty(staff)) {
ljStaffMapper.updateById(staff); staff.setStaffCode("https://www.tuofeng.cc/oilRefuel?storeId="+storeId+"&staffId="+staff.getId());
ljStaffMapper.updateById(staff);
// LJStaff staff1 = ljStaffMapper.selectById(staff.getId()); // LJStaff staff1 = ljStaffMapper.selectById(staff.getId());
if (ObjectUtil.isNotEmpty(staff.getId())){ if (ObjectUtil.isNotEmpty(staff.getId())){
editTAccount.setStaffId(staff.getId()); editTAccount.setStaffId(staff.getId());
updateAccount(editTAccount); updateAccount(editTAccount);
}
} }
return true; return true;
} }