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

9.9

Browse Source
This commit is contained in:
cun-nan 2024-09-09 14:39:58 +08:00
parent fdf638a72f
commit 113c2734ca
6 changed files with 54 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fuintAdmin/src/router/index.js
View File

@ -106,12 +106,12 @@ export const constantRoutes = [
name: 'resource_oilstore',
meta: { title: '系统首页', icon: 'dashboard', affix: true }
},
{
path: '/shopowner',
component: () => import('@/views/shopowner'),
name: 'shopowner',
meta: { title: '系统新首页', icon: 'dashboard', affix: true }
},
// {
// path: '/shopowner',
// component: () => import('@/views/shopowner'),
// name: 'shopowner',
// meta: { title: '系统新首页', icon: 'dashboard', affix: true }
// },
{
path: '/account',
component: Layout,

52
fuintAdmin/src/views/shopowner.vue
View File

@ -73,37 +73,30 @@
<div class="k-box">
<div class="d-s" style="font-size: 12px;color: #999999;">
<div class="sian"></div>
<div>活跃油站数</div>
<div>油品销售金额（元）/交易笔数</div>
</div>
<div class="num-size">{{ storeAmount.storeTotal || 0 }}</div>
<div class="num-size">{{ storeAmount.storeTotal || 0 }}/{{ storeAmount.refundTotal || 0 }}</div>
</div>
<div class="k-box">
<div class="d-s" style="font-size: 12px;color: #999999;">
<div class="sian"></div>
<div>交易金额(万元)/交易笔数</div>
<div>会员充值金额（元）/充值笔数</div>
</div>
<div class="num-size">{{ storeAmount.tradeAmount || 0 }}/{{ storeAmount.tradeTotal || 0 }}</div>
</div>
<div class="k-box">
<div class="d-s" style="font-size: 12px;color: #999999;">
<div class="sian"></div>
<div>退款金额(元)/退款笔数</div>
<div>便利店销售金额（元）/交易笔数</div>
</div>
<div class="num-size">{{ storeAmount.refundAmount || 0 }}/{{ storeAmount.refundTotal || 0 }}</div>
</div>
<div class="k-box">
<div class="d-s" style="font-size: 12px;color: #999999;">
<div class="sian"></div>
<div>笔均单价(元)</div>
<div>积分商城销售金额（元）/兑换笔数</div>
</div>
<div class="num-size">{{ storeAmount.averagePrice || 0 }}</div>
</div>
<div class="k-box">
<div class="d-s" style="font-size: 12px;color: #999999;">
<div class="sian"></div>
<div>日均交易额(万元)/日均交易笔数</div>
</div>
<div class="num-size">{{ storeAmount.dayTradeAmount || 0 }}/{{ storeAmount.dayTradeTotal || 0 }}</div>
<div class="num-size">{{ storeAmount.averagePrice || 0 }}/{{ storeAmount.refundTotal || 0 }}</div>
</div>
</div>
<div class="hui-hang"></div>
@ -149,12 +142,12 @@
<div style="width: 25%">油品销售金额（元)</div>
<div>总销售额（元）</div>
</div>
<div class="hang-box" v-for="(item,index) in 5" :key="index">
<div class="hang-box" v-for="(item,index) in employeList" :key="index">
<div style="width: 10%">{{index +1}}</div>
<div>员工姓名</div>
<div style="width: 25%">9999</div>
<div style="width: 25%">6666</div>
<div>198888</div>
<div>{{ item.realName }}</div>
<div style="width: 25%">{{item.cardSum}}</div>
<div style="width: 25%">{{item.oilSum}}</div>
<div>{{item.totalSum}}</div>
</div>
</div>
</div>
@ -188,6 +181,7 @@ import {selectChildByDeptId} from "@/api/system/Site/site";
import {parseTime} from "@/utils/fuint";
import {getBannerListApi} from "@/api/sys/banner";
import {getNotificationlogList} from "@/api/sys/sysNotificationlog";
import {employeeSalesApi} from "@/api/indexStatistics";
export default {
props:["accountId"],
@ -230,7 +224,8 @@ export default {
bannerList:{},
storeList:[],
hardwareList:[],
noticeList:[]
noticeList:[],
employeList:[],
}
},
created() {
@ -250,11 +245,28 @@ export default {
this.getStoreList()
this.getHardwareList()
this.getNoticeList()
this.getEmployeList()
},
mounted() {
// this.initChart()
},
methods:{
// 获取员工排行信息
getEmployeList() {
this.employeLoading = true
employeeSalesApi().then(res=>{
if(res.code == 200) {
if (res.data.length >=10) {
this.employeList = res.data.slice(0, 10);
} else {
this.employeList = res.data
}
this.employeLoading = false
}
})
},
getNoticeList(){
getNotificationlogList({pageNo: 1, pageSize: 4,sentTo:this.accountId}).then(res => {
this.noticeList = res.data.records
@ -918,7 +930,7 @@ export default {
}
.k-box{
width: 215px;
width: 220px;
height: 68px;
background: #FFFFFF;
border-radius: 8px;

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

@ -771,10 +771,10 @@
</foreach>
</if>
<if test="oilOrderVo.params.beginTime != null and oilOrderVo.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(pay_time,'%y%m%d') &gt;= date_format(#{oilOrderVo.params.beginTime},'%y%m%d')
and date_format(oo.pay_time,'%y%m%d') &gt;= date_format(#{oilOrderVo.params.beginTime},'%y%m%d')
</if>
<if test="oilOrderVo.params.endTime != null and oilOrderVo.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(pay_time,'%y%m%d') &lt;= date_format(#{oilOrderVo.params.endTime},'%y%m%d')
and date_format(oo.pay_time,'%y%m%d') &lt;= date_format(#{oilOrderVo.params.endTime},'%y%m%d')
</if>
</where>
GROUP BY oo.oils

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/entity/ReceiptPrinting.java
View File

@ -152,5 +152,10 @@ public class ReceiptPrinting extends BaseEntity implements Serializable {
*/
private String updateBy;
/**
* 店铺名称（加油站名称）
*/
@TableField(exist = false)
private String storeName;
}

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/impl/ReceiptPrintingServiceImpl.java
View File

@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.setting.entity.ReceiptPrinting;
import com.fuint.business.setting.mapper.ReceiptPrintingMapper;
import com.fuint.business.setting.service.ReceiptPrintingService;
import com.fuint.business.storeInformation.entity.LJStore;
import com.fuint.business.storeInformation.service.ILJStoreService;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -25,6 +28,8 @@ public class ReceiptPrintingServiceImpl extends ServiceImpl<ReceiptPrintingMappe
@Resource
private ReceiptPrintingMapper receiptPrintingMapper;
@Autowired
private ILJStoreService storeService;
@Override
@ -67,6 +72,7 @@ public class ReceiptPrintingServiceImpl extends ServiceImpl<ReceiptPrintingMappe
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
receiptPrinting.setStoreId(nowAccountInfo.getStoreId());
LJStore ljStore = storeService.selectStoreById();
List<ReceiptPrinting> receiptPrintings = receiptPrintingMapper.queryReceiptPrintingList(receiptPrinting);
@ -84,6 +90,7 @@ public class ReceiptPrintingServiceImpl extends ServiceImpl<ReceiptPrintingMappe
if (ObjectUtil.isNotEmpty(printing.getBottomSet())) {
printing.setBottomSets(getList(printing.getBottomSet()));
}
printing.setStoreName(ljStore.getName());
return printing;
}
return null;

4
fuintBackend/fuint-application/src/main/resources/application.properties
View File

@ -1,10 +1,10 @@
# \u57FA\u672C\u914D\u7F6E
server.port=8080
env.profile=dev
#env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
env.properties.path=D:/workspaces/oil-stations/fuintBackend/configure/
#env.properties.path=F:/work/oilSystem/fuintBackend/configure/
#env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
env.properties.path=D:/code/bulidmap/oil-station/fuintBackend/configure/
#env.properties.path=D:/code/bulidmap/oil-station/fuintBackend/configure/
#env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
# \u6570\u636E\u5E93\u914D\u7F6E