From a504720e4c8d332476a2b5e9e4e7de8757fba0d3 Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Mon, 4 Mar 2024 16:47:16 +0800
Subject: [PATCH] no message

---
 fuintAdmin_zt/src/views/Site/index.vue          |  3 +++
 .../service/impl/CardFuelRecordServiceImpl.java |  3 +--
 .../impl/CardValueRecordServiceImpl.java        |  2 +-
 .../common/service/impl/AccountServiceImpl.java | 17 ++++++++++++-----
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 12491d018..9e3b281f6 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -857,6 +857,8 @@ export default {
       },
       //新增节点
       submitForms(formName) {
+        console.log("timeFrame ",this.timeFrame)
+        console.log("this.ruleForm ",this.ruleForm)
         this.$refs[formName].validate((valid) => {
           if (valid) {
               console.log("timeFrame",this.timeFrame)
@@ -923,6 +925,7 @@ export default {
         this.cleanRuleForm()
         this.activeName = 'info'
         this.pdinfo = 1
+        this.timeFrame = []
 
         this.addNode(data.id,data.label)
         // console.log(this.pdinfo)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
index 25a54776f..f7ac145f6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
@@ -277,8 +277,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
     @Autowired
     private RedisLock redisLock;
 
-    @Autowired
-    private StaffCommissionService staffCommissionService;
+
     private static String beforeLitres = new String("0");
     /**
      * 查询支付状态 修改相关关联表
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
index 33a4110a0..289ffe872 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
@@ -434,7 +434,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
     private static AllOrderInfo getAllOrderInfo(CardValueRecordDTO cardValueRecordDTO) {
         AllOrderInfo allOrderInfo = new AllOrderInfo();
         allOrderInfo.setOrderNo(cardValueRecordDTO.getPaymentNo());
-        allOrderInfo.setType("2");
+        allOrderInfo.setType("3");
         allOrderInfo.setStoreId(cardValueRecordDTO.getStoreId());
         allOrderInfo.setGoodsMoney(cardValueRecordDTO.getGiftBalance());
         allOrderInfo.setPayMoney(cardValueRecordDTO.getRealyPayBills());
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 bccd9507a..b392c78e6 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
@@ -288,6 +288,9 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
         staff.setRoleId(roleId);
         staff.setMobile(param.get("mobile").toString());
 
+//        if ("3".equals(deptType)) {
+//
+//        }
         // 查询手机号是否存在
         LambdaQueryWrapper<LJStaff> lambdaQueryWrapper = Wrappers.lambdaQuery();
         // 查询手机号是否存在
@@ -300,20 +303,24 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
         }
         ljStaffMapper.insert(staff);
 //        添加员工码信息
+
         QueryWrapper queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("mobile",param.get("mobile").toString());
         queryWrapper.eq("store_id",mtStore.getId());
         queryWrapper.eq("if_delete","0");
         staff = ljStaffMapper.selectOne(queryWrapper);
-        staff.setStaffCode("https://www.tuofeng.cc/oilRefuel?storeId="+storeId+"&staffId="+staff.getId());
-        ljStaffMapper.updateById(staff);
+        if (ObjectUtil.isNotEmpty(staff)) {
+            staff.setStaffCode("https://www.tuofeng.cc/oilRefuel?storeId="+storeId+"&staffId="+staff.getId());
+            ljStaffMapper.updateById(staff);
 
 //        LJStaff staff1 = ljStaffMapper.selectById(staff.getId());
-        if (ObjectUtil.isNotEmpty(staff.getId())){
-            editTAccount.setStaffId(staff.getId());
-            updateAccount(editTAccount);
+            if (ObjectUtil.isNotEmpty(staff.getId())){
+                editTAccount.setStaffId(staff.getId());
+                updateAccount(editTAccount);
+            }
         }
 
+
         return true;
     }