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

11.13

Browse Source
This commit is contained in:
sw 2024-11-13 08:41:53 +08:00
parent 4049003f3d
commit 06fc225429
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuintAdmin_zt/src/views/setting/app/index.vue
View File

@ -226,6 +226,7 @@ export default {
}, },
getList(){ getList(){
getAppListApi(this.queryParams).then(res=>{ getAppListApi(this.queryParams).then(res=>{
console.log(2222222222)
this.tableData = res.data.records; this.tableData = res.data.records;
this.total = res.data.total this.total = res.data.total
}) })

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

@ -519,7 +519,6 @@ public class AllOrderInfoController extends BaseController {
this.allOrderInfoService.exportExcelBackOrderMsgsApi(response, allOrderInfoRes); this.allOrderInfoService.exportExcelBackOrderMsgsApi(response, allOrderInfoRes);
} }
`
/** /**
* 交易对账 * 交易对账
* 交易明细分页查询 * 交易明细分页查询

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

@ -1218,8 +1218,9 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
handoverMap.put("baseInfo",baseInfo); handoverMap.put("baseInfo",baseInfo);
// 获取订单汇总 // 获取订单汇总
Map<String, Object> orderSummaryMap = orderSummary1(startTime, formattedEndTime, staffId); Map<String, Object> orderSummaryMap = orderSummary1(startTime, formattedEndTime, staffId);
orderSummaryMap.put("orderall",Double.valueOf(orderSummaryMap.get("oilOrder").toString())+Double.valueOf(orderSummaryMap.get("rechargeAll").toString()));
orderSummaryMap.put("orderalls",Double.valueOf(orderSummaryMap.get("receiptsMoney").toString())+Double.valueOf(orderSummaryMap.get("onAccount").toString())); orderSummaryMap.put("orderall",new BigDecimal(orderSummaryMap.get("oilOrder").toString()).add(new BigDecimal(orderSummaryMap.get("rechargeAll").toString())));
orderSummaryMap.put("orderalls",new BigDecimal(orderSummaryMap.get("receiptsMoney").toString()).add(new BigDecimal(orderSummaryMap.get("onAccount").toString())));
handoverMap.put("orderSummary",orderSummaryMap); handoverMap.put("orderSummary",orderSummaryMap);
// 支付方式汇总 // 支付方式汇总
List<Map<String, Object>> paymentAggregationMap = paymentAggregation1(startTime, formattedEndTime, staffId); List<Map<String, Object>> paymentAggregationMap = paymentAggregation1(startTime, formattedEndTime, staffId);
@ -1275,8 +1276,8 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
Map<String, Object> allStatistics = new HashMap<>(); Map<String, Object> allStatistics = new HashMap<>();
Map<String, Object> oilOrderStatistics = handoverRecordMapper.oilOrderStatistics1(startTime, endTime, nowAccountInfo.getStoreId(), staffId); Map<String, Object> oilOrderStatistics = handoverRecordMapper.oilOrderStatistics1(startTime, endTime, nowAccountInfo.getStoreId(), staffId);
allStatistics.putAll(oilOrderStatistics); allStatistics.putAll(oilOrderStatistics);
allStatistics.put("operatingAmount", Double.valueOf(oilOrderStatistics.get("oilOrder").toString())- Double.valueOf(oilOrderStatistics.get("onAccount").toString())); allStatistics.put("operatingAmount",new BigDecimal(oilOrderStatistics.get("oilOrder").toString()).add(new BigDecimal(oilOrderStatistics.get("onAccount").toString())));
allStatistics.put("trueAmount", Double.valueOf(oilOrderStatistics.get("receiptsMoney").toString())- Double.valueOf(oilOrderStatistics.get("onAccount").toString())); allStatistics.put("trueAmount",new BigDecimal(oilOrderStatistics.get("receiptsMoney").toString()).add(new BigDecimal(oilOrderStatistics.get("onAccount").toString())));
return allStatistics; return allStatistics;
} }

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysAppMapper.xml
View File

@ -14,13 +14,14 @@
<result property="appStatus" column="app_status" jdbcType="INTEGER"/> <result property="appStatus" column="app_status" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="VARCHAR"/> <result property="createTime" column="create_time" jdbcType="VARCHAR"/>
<result property="createByName" column="create_by_name" jdbcType="VARCHAR"/> <result property="createByName" column="create_by_name" jdbcType="VARCHAR"/>
<result property="orgId" column="org_id" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
<!--查询单个--> <!--查询单个-->
<select id="queryById" resultMap="SysAppMap"> <select id="queryById" resultMap="SysAppMap">
select select
id,org_name,unified_social_credit_code,app_id,legal_representative_name, id,org_name,unified_social_credit_code,app_id,legal_representative_name,
legal_representative_id,legal_representative_contact,app_status,app_key,legal_representative_wechat legal_representative_id,legal_representative_contact,app_status,app_key,legal_representative_wechat,org_id
from sys_app from sys_app
where id = #{id} where id = #{id}
</select> </select>
@ -29,7 +30,7 @@ legal_representative_id,legal_representative_contact,app_status,app_key,legal_re
<select id="queryAllByLimit" resultMap="SysAppMap"> <select id="queryAllByLimit" resultMap="SysAppMap">
select select
id,org_name,unified_social_credit_code,app_id,legal_representative_name, id,org_name,unified_social_credit_code,app_id,legal_representative_name,
legal_representative_id,legal_representative_contact,app_status,create_time,create_by_name,app_key,legal_representative_wechat legal_representative_id,legal_representative_contact,app_status,create_time,create_by_name,app_key,legal_representative_wechat,org_id
from sys_app from sys_app
<where> <where>
<if test="sysApp.id != null"> <if test="sysApp.id != null">

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysBannerServiceImpl.java
View File

@ -93,8 +93,10 @@ public class SysBannerServiceImpl implements SysBannerService {
@Override @Override
public SysBanner queryByName(String bannerName) { public SysBanner queryByName(String bannerName) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
HashMap<String, Object> objectObjectHashMap = new HashMap<>(); HashMap<String, Object> objectObjectHashMap = new HashMap<>();
objectObjectHashMap.put("banner_name",bannerName); objectObjectHashMap.put("banner_name",bannerName);
objectObjectHashMap.put("store_id",nowAccountInfo.getStoreId());
List<SysBanner> sysBanners = sysBannerMapper.selectByMap(objectObjectHashMap); List<SysBanner> sysBanners = sysBannerMapper.selectByMap(objectObjectHashMap);
return sysBanners.size() > 0 ? sysBanners.get(0) : null; return sysBanners.size() > 0 ? sysBanners.get(0) : null;

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

@ -1,10 +1,10 @@
# \u57FA\u672C\u914D\u7F6E # \u57FA\u672C\u914D\u7F6E
server.port=8080 server.port=8080
env.profile=dev env.profile=dev
#env.properties.path=C:/Users/qq244432/Desktop/project/oil-station/fuintBackend/configure/ env.properties.path=D:/work/sw/fuintBackend/configure/
#env.properties.path=F:/work/oilSystem/fuintBackend/configure/ #env.properties.path=F:/work/oilSystem/fuintBackend/configure/
#env.properties.path=D:/oil/new-oil/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=D:/work/oilSystem/fuintBackend/configure/ #env.properties.path=D:/work/oilSystem/fuintBackend/configure/
#env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/ #env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/