From 27d358dc6b5f6cb3f8cb5d87c81e69502f1dc057 Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Tue, 23 Jul 2024 15:13:12 +0800 Subject: [PATCH] no message --- .../yunyingfenxi/tab/vip.vue | 8 +++---- .../src/views/system/notify/page/mode.vue | 17 ++++++------- .../order/mapper/xml/OilOrderMapper.xml | 18 +++++++++++++- .../userManager/entity/UserBalance.java | 2 +- .../mapper/xml/UserBalanceMapper.xml | 1 + .../service/impl/UserBalanceServiceImpl.java | 24 +++++++++++++++++++ .../userManager/vo/UserBalanceVo.java | 8 ++++++- 7 files changed, 63 insertions(+), 15 deletions(-) diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue index a505dc240..74e76dbe0 100644 --- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue +++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue @@ -14,10 +14,10 @@ - - - - + + 搜索 + 重置 + diff --git a/fuintAdmin_zt/src/views/system/notify/page/mode.vue b/fuintAdmin_zt/src/views/system/notify/page/mode.vue index 80403b777..bf69db82a 100644 --- a/fuintAdmin_zt/src/views/system/notify/page/mode.vue +++ b/fuintAdmin_zt/src/views/system/notify/page/mode.vue @@ -45,7 +45,7 @@ 新增小程序配置 + >新增通知模板 @@ -125,15 +125,15 @@ - - - - - - - + + + + + + + @@ -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) { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml index c4bd663d6..26f918c3f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml +++ b/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 + + + oo.store_id in + + #{item} + + + group by store_id \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java index db73c26f3..12828df3b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java +++ b/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 listByZt(Page page, UserBalanceVo user) { + if (ObjectUtil.isEmpty(user.getDeptId())) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + user.setDeptId(nowAccountInfo.getDeptId()); + } + + List strings = sysDeptMapper.selectChildByDeptIdR(user.getDeptId()); + List longs = mtStoreMapper.queryStoresByDeptIdsR(strings); + user.setStoreIds(longs); IPage 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 getDataByZt(UserBalanceVo user) { + if (ObjectUtil.isEmpty(user.getDeptId())) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + user.setDeptId(nowAccountInfo.getDeptId()); + } + + List strings = sysDeptMapper.selectChildByDeptIdR(user.getDeptId()); + List longs = mtStoreMapper.queryStoresByDeptIdsR(strings); + user.setStoreIds(longs); + Map dataByZt = userBalanceMapper.getDataByZt(user); Map leiJiInfo = allOrderInfoMapper.getShuJuVipInfo(user); dataByZt.put("tongjMoney",leiJiInfo.get("tongjMoney")); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/UserBalanceVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/UserBalanceVo.java index 85d410c0e..00a18e567 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/UserBalanceVo.java +++ b/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 storeIds; + @TableField(exist = false) + private Long deptId; }