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

9.10

Browse Source
This commit is contained in:
cun-nan 2024-09-10 10:22:50 +08:00
parent 02c2a664a1
commit f46bb8a9b2
4 changed files with 384 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fuintAdmin/src/api/allOrder.js
View File

@ -146,6 +146,7 @@ export function exportExcelDayApi(data) {
});
}
// 油站首页核心数据
export function getTotalAmount() {
return request({
url: 'business/allOrderInfo/getTotalAmount',
@ -153,3 +154,12 @@ export function getTotalAmount() {
});
}
// 油站首页数据展示
export function getDataBoard(query) {
return request({
url: 'business/allOrderInfo/getDataBoard',
method: 'get',
params:query
});
}

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

@ -182,7 +182,7 @@ import {parseTime} from "@/utils/fuint";
import {getBannerListApi} from "@/api/sys/banner";
import {getNotificationlogList} from "@/api/sys/sysNotificationlog";
import {employeeSalesApi} from "@/api/indexStatistics";
import {getTotalAmount} from "@/api/allOrder";
import {getDataBoard, getTotalAmount} from "@/api/allOrder";
export default {
props:["accountId"],
@ -323,7 +323,7 @@ export default {
})
},
getStoreAmount(){
storeAmountIndex(this.addDateRange(this.queryParams,this.value1)).then(res => {
getDataBoard(this.addDateRange(this.queryParams,this.value1)).then(res => {
this.storeAmount = res.data
this.initChart()
})

13
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
View File

@ -287,8 +287,21 @@ public class AllOrderInfoController extends BaseController {
return getSuccessResult(allOrderInfoService.getHandoverByOrderNo(allOrderInfo));
}
/**
* 油站首页 核心数据
* @return
*/
@GetMapping("getTotalAmount")
public ResponseObject getTotalAmount(){
return getSuccessResult(allOrderInfoService.getTotalAmount());
}
/**
* 油站首页 数据展示
* @return
*/
@GetMapping("getDataBoard")
public ResponseObject getDataBoard(@RequestParam Map<String, String> map){
return getSuccessResult(allOrderInfoService.getDataBoard(map));
}
}

52
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
View File

@ -84,6 +84,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
@Resource
AllOrderInfoMapper allOrderInfoMapper;
@Override
public IPage<AllOrderInfoVo> getPageList(Page page, AllOrderInfo allOrderInfo) {
IPage<AllOrderInfoVo> pageList = allOrderInfoMapper.getPageList(page, allOrderInfo);
@ -94,6 +95,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
OilOrderService oilOrderService;
@Resource
OilNameService oilNameService;
@Override
public IPage<AllOrderInfoVo> getPageListByPos(Page page, AllOrderInfo allOrderInfo) {
AccountInfo accountInfoByToken = TokenUtil.getNowAccountInfo();
@ -119,8 +121,6 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
}
public String sumPayMoney(AllOrderInfo allOrderInfo) {
String sumPayMoney = allOrderInfoMapper.sumPayMoney(allOrderInfo);
@ -185,6 +185,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
}
return fenxiByDaili;
}
// getFenxiByDailiBydata
@Override
public Map<String, Object> getFenxiByDailiTypeBydata(AllOrderInfo allOrderInfo) {
@ -204,6 +205,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
return fenxiByDailiTypeBydata;
}
@Override
public Map<String, Object> getFenxiByDailiBydata(AllOrderInfo allOrderInfo) {
if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) {
@ -228,6 +230,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
@Resource
OrderGoodsMapper orderGoodsMapper;
public Map<String, Object> getHandoverByOrderNo(AllOrderInfo allOrderInfo) {
// 金额详情
AllOrderInfoVo runningWaterByData = allOrderInfoMapper.getHandoverByOrderNo(allOrderInfo);
@ -330,6 +333,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
}
return fenxiByDaili;
}
@Override
public int updateAllOrderInfo(AllOrderInfo allOrderInfo) {
merchantConfigService.updateMeChAmountByStoreId(allOrderInfo.getStoreId(), allOrderInfo.getPayMoney());
@ -518,6 +522,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
DecimalFormat decimalFormat = new DecimalFormat("0.00");
return decimalFormat.format(value);
}
// 处理商户号
private Map<String, String> getMerchantConfig(AllOrderInfo allOrderInfo) {
Map<String, String> map = new HashMap<>();
@ -624,6 +629,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
}
}
// 处理商品
private void disposeGoods(LJOrder ljOrder, String refundOrderNo) {
// 处理订单状态
@ -734,9 +740,6 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
}
IPage<AllOrderInfoVo> pageList = allOrderInfoMapper.getTradingPage(page, allOrderInfo);
for (AllOrderInfoVo record : pageList.getRecords()) {
MtStore mtStore = storeService.queryStoreById3(record.getStoreId());
@ -793,7 +796,6 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
}
@Override
public void tradingExportExcel(HttpServletResponse response, AllOrderInfoDto order) {
@ -852,6 +854,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
ISysDeptService iSysDeptService;
@Resource
SysDeptMapper sysDeptMapper;
@Override
public IPage<SysDeptVo> runningWaterByInstituion(Page page, AllOrderInfoDto allOrderInfo) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
@ -1058,7 +1061,6 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
}
// 数据查询
IPage<AllOrderInfoVo> runningWaterByDay = allOrderInfoMapper.getRunningWaterByDay(page, allOrderInfo);
@ -1108,7 +1110,6 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
}
// 数据查询
AllOrderInfoVo runningWaterByDay = allOrderInfoMapper.getRunningWaterByDayData(allOrderInfo);
@ -1239,10 +1240,6 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
}
@Override
public AllOrderInfoVo getIndexData4Pos() {
AllOrderInfoDto allOrderInfoDto = new AllOrderInfoDto();
@ -1622,14 +1619,39 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
public Map<String, Object> getDataBoard(Map<String, String> map) {
Map<String, Object> map1 = new HashMap<>();
// 油品销售金额
Double oilAmount = 0.0;
// 油品交易笔数
Integer oilNum = 0;
// 会员充值金额
Double userRechargeAmount = 0.0;
// 会员充值笔数
Integer userRechargeNum = 0;
// 便利店销售金额
// 交易笔数
Double minimartAmount = 0.0;
// 便利店交易笔数
Integer minimartNum = 0;
// 积分商城销售金额
// 兑换笔数
Double pointMallAmount = 0.0;
// 积分商城兑换笔数
Integer pointMallNum = 0;
// 非油品交易占比
Integer noOilNum = 0;
AllOrderInfo allOrderInfo = new AllOrderInfo();
allOrderInfo.setType("1");
Map<String, Object> sumAndNum = getSumAndNum(allOrderInfo, map);
oilAmount = Double.valueOf(sumAndNum.get("payMoney").toString());
oilNum = Integer.valueOf(sumAndNum.get("allNum").toString());
map1.put("oilAmount", oilAmount);
map1.put("oilNum", oilNum);
map1.put("userRechargeAmount", userRechargeAmount);
map1.put("userRechargeNum", userRechargeNum);
map1.put("minimartAmount", minimartAmount);
map1.put("minimartNum", minimartNum);
map1.put("pointMallAmount", pointMallAmount);
map1.put("pointMallNum", pointMallNum);
map1.put("noOilNum", noOilNum);
return map1;
}
@ -1643,12 +1665,14 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
// 计算两个日期之间的天数差
return endDate.toEpochDay() - beginDate.toEpochDay() + 1;
}
private long dayCount2(LocalDate createDate) {
// 获取当前日期
LocalDate currentDate = LocalDate.now();
// 计算两个日期之间的天数差
return ChronoUnit.DAYS.between(createDate, currentDate);
}
private void calculatedMean(SysDeptVo sysDept, long day) {
// 创建 DecimalFormat 对象，指定保留两位小数的格式
DecimalFormat df = new DecimalFormat("0.00");