no message

fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue

@@ -14,10 +14,10 @@
           </el-select>
         </el-form-item>
 
-<!--        <el-form-item class="" style="float: right;">-->
+        <el-form-item class="" style="float: right;">
-<!--          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>-->
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-<!--          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>-->
+          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-<!--        </el-form-item>-->
+        </el-form-item>
       </el-form>
 
 <!--    </el-card>-->

fuintAdmin_zt/src/views/system/notify/page/mode.vue

@@ -45,7 +45,7 @@
           <el-button
             type="primary"
             @click="handleAdd"
-          >新增小程序配置</el-button>
+          >新增通知模板</el-button>
         </el-form-item>
       </el-form>
     </el-card>
@@ -125,15 +125,15 @@
             <el-select v-model="condition.field" placeholder="请选择条件" style="width: 150px;margin-right: 10px">
               <el-option label="系统到期日期" value="系统到期日期"></el-option>
               <el-option label="剩余交易量" value="剩余交易量"></el-option>
-              <el-option label="系统服务有效期" value="系统服务有效期"></el-option>
+              <el-option label="系统服务费统计" value="系统服务费统计"></el-option>
-              <!-- 添加其他选项 -->
-            </el-select>
-            <el-select v-if="condition.field == '系统到期日期'" v-model="condition.operator" placeholder="请选择" style="width: 100px;margin-right: 10px">
-              <el-option label="当日日期" value="当日日期"></el-option>
-              <el-option label="大于" value="大于"></el-option>
-              <el-option label="小于" value="小于"></el-option>
               <!-- 添加其他选项 -->
             </el-select>
+<!--            <el-select v-if="condition.field == '系统到期日期'" v-model="condition.operator" placeholder="请选择" style="width: 100px;margin-right: 10px">-->
+<!--              <el-option label="当日日期" value="当日日期"></el-option>-->
+<!--              <el-option label="大于" value="大于"></el-option>-->
+<!--              <el-option label="小于" value="小于"></el-option>-->
+<!--              &lt;!&ndash; 添加其他选项 &ndash;&gt;-->
+<!--            </el-select>-->
             <el-input v-model="condition.value" placeholder="请输入数值" style="width: 150px;margin-right: 10px">
               <template slot="append">{{ condition.field === '剩余交易量' || condition.field === '系统服务有效期' ? '万元' : '天' }}</template>
             </el-input>
@@ -225,6 +225,7 @@ export default {
     submitDeviceInfo() {
       // 在这里调用接口提交设备信息数据
       console.log('提交设备信息数据:', this.deviceInfo);
+      this.deviceInfo.conditions = JSON.stringify(this.deviceInfo.conditions)
       if (this.deviceInfo.id) {
         updateAppApi(this.deviceInfo).then(res=>{
           if(res.code === 200) {

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml

@@ -717,6 +717,14 @@
             COUNT(CASE WHEN oils = 2 THEN 1 END) AS count0
 
         from oil_order
+        <where>
+            <if test="storeIds != null">
+                oo.store_id in
+                <foreach collection="storeIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
         group by store_id
     </select>
     <select id="selectOilOrderFenXiDataByZtDz" resultType="java.util.Map">
@@ -728,7 +736,15 @@
             SUM(CASE WHEN oils = 10 THEN pay_amount ELSE 0 END) AS amount98,
             SUM(CASE WHEN oils = 2 THEN pay_amount ELSE 0 END) AS amount0
 
-        from oil_order;
+        from oil_order
+        <where>
+            <if test="storeIds != null">
+                oo.store_id in
+                <foreach collection="storeIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
 
     </select>
     <select id="selectOilsCount" resultType="com.fuint.business.order.vo.OilOrderVo">

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/UserBalance.java

@@ -17,7 +17,7 @@ import java.io.Serializable;
 @Data
 @TableName("mt_user_balance")
 @ApiModel(value = "UserBalance对象", description = "用户余额表")
-public class UserBalance extends BaseEntity implements Serializable {
+public class    UserBalance extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
     /**

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/UserBalanceMapper.xml

@@ -52,6 +52,7 @@
             sum(mub.card_balance) balanceSum
         from mt_user_balance mub
                  left join mt_user mu on mub.mt_user_id = mu.id
+
     </select>
 
 </mapper>

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
 import com.fuint.business.marketingActivity.cardValue.mapper.CardValueRecordMapper;
 import com.fuint.business.order.mapper.AllOrderInfoMapper;
+import com.fuint.business.store.mapper.MtStoreMapper;
 import com.fuint.business.storeInformation.entity.LJStore;
 import com.fuint.business.storeInformation.service.ILJStoreService;
 import com.fuint.business.userManager.entity.LJUserGrade;
@@ -24,6 +25,7 @@ import com.fuint.business.userManager.vo.UserBalanceVo;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.RedisLock;
 import com.fuint.common.util.TokenUtil;
+import com.fuint.system.dept.mapper.SysDeptMapper;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -56,8 +58,21 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
     CardValueRecordMapper cardValueRecordMapper;
     @Resource
     AllOrderInfoMapper allOrderInfoMapper;
+    @Resource
+    SysDeptMapper sysDeptMapper;
+    @Resource
+    MtStoreMapper mtStoreMapper;
+
     @Override
     public IPage<UserBalanceVo> listByZt(Page page, UserBalanceVo user) {
+        if (ObjectUtil.isEmpty(user.getDeptId())) {
+            AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+            user.setDeptId(nowAccountInfo.getDeptId());
+        }
+
+        List<Long> strings = sysDeptMapper.selectChildByDeptIdR(user.getDeptId());
+        List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
+        user.setStoreIds(longs);
         IPage<UserBalanceVo> userBalanceVoIPage = userBalanceMapper.listByZt(page, user);
         for (UserBalanceVo record : userBalanceVoIPage.getRecords()) {
             LJStore ljStore = storeService.selectStoreByIdUni(record.getStoreId());
@@ -94,6 +109,15 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
     }
 
     public Map<String,Object> getDataByZt(UserBalanceVo user) {
+        if (ObjectUtil.isEmpty(user.getDeptId())) {
+            AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+            user.setDeptId(nowAccountInfo.getDeptId());
+        }
+
+        List<Long> strings = sysDeptMapper.selectChildByDeptIdR(user.getDeptId());
+        List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
+        user.setStoreIds(longs);
+
         Map<String, Object> dataByZt = userBalanceMapper.getDataByZt(user);
         Map<String, Object> leiJiInfo = allOrderInfoMapper.getShuJuVipInfo(user);
         dataByZt.put("tongjMoney",leiJiInfo.get("tongjMoney"));

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/UserBalanceVo.java

@@ -1,8 +1,11 @@
 package com.fuint.business.userManager.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fuint.business.userManager.entity.UserBalance;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class UserBalanceVo extends UserBalance {
     /**
@@ -39,6 +42,9 @@ public class UserBalanceVo extends UserBalance {
     public String leijiNum;
     public String leijiMoneyRef;
     public String leijiNumRef;
-
+    @TableField(exist = false)
+    private List<Long> storeIds;
+    @TableField(exist = false)
+    private Long deptId;
 
 }