From 06fc225429c2684aae9d516762b06afd56232840 Mon Sep 17 00:00:00 2001
From: sw <17615834396@163.com>
Date: Wed, 13 Nov 2024 08:41:53 +0800
Subject: [PATCH] 11.13

---
 fuintAdmin_zt/src/views/setting/app/index.vue            | 1 +
 .../order/controller/AllOrderInfoController.java         | 1 -
 .../order/service/impl/HandoverRecordServiceImpl.java    | 9 +++++----
 .../com/fuint/business/sys/mapper/xml/SysAppMapper.xml   | 5 +++--
 .../business/sys/service/impl/SysBannerServiceImpl.java  | 2 ++
 .../src/main/resources/application.properties            | 4 ++--
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/fuintAdmin_zt/src/views/setting/app/index.vue b/fuintAdmin_zt/src/views/setting/app/index.vue
index fdef2387e..c280a829b 100644
--- a/fuintAdmin_zt/src/views/setting/app/index.vue
+++ b/fuintAdmin_zt/src/views/setting/app/index.vue
@@ -226,6 +226,7 @@ export default {
     },
     getList(){
       getAppListApi(this.queryParams).then(res=>{
+        console.log(2222222222)
         this.tableData = res.data.records;
         this.total = res.data.total
       })
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
index f06862263..8f34f9c3b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
@@ -519,7 +519,6 @@ public class AllOrderInfoController extends BaseController {
         this.allOrderInfoService.exportExcelBackOrderMsgsApi(response, allOrderInfoRes);
     }
 
-`
     /**
      * 交易对账
      * 交易明细分页查询
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java
index 05d78ce9d..c4f3aaa04 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java
@@ -1218,8 +1218,9 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
         handoverMap.put("baseInfo",baseInfo);
         // 获取订单汇总
         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);
         // 支付方式汇总
         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> oilOrderStatistics = handoverRecordMapper.oilOrderStatistics1(startTime, endTime, nowAccountInfo.getStoreId(), staffId);
         allStatistics.putAll(oilOrderStatistics);
-        allStatistics.put("operatingAmount", Double.valueOf(oilOrderStatistics.get("oilOrder").toString())- Double.valueOf(oilOrderStatistics.get("onAccount").toString()));
-        allStatistics.put("trueAmount", Double.valueOf(oilOrderStatistics.get("receiptsMoney").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",new BigDecimal(oilOrderStatistics.get("receiptsMoney").toString()).add(new BigDecimal(oilOrderStatistics.get("onAccount").toString())));
         return allStatistics;
     }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysAppMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysAppMapper.xml
index a2d249a4c..061f76f00 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysAppMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysAppMapper.xml
@@ -14,13 +14,14 @@
         <result property="appStatus" column="app_status" jdbcType="INTEGER"/>
         <result property="createTime" column="create_time" jdbcType="VARCHAR"/>
         <result property="createByName" column="create_by_name" jdbcType="VARCHAR"/>
+        <result property="orgId" column="org_id" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
     <select id="queryById" resultMap="SysAppMap">
         select
 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
         where id = #{id}
     </select>
@@ -29,7 +30,7 @@ legal_representative_id,legal_representative_contact,app_status,app_key,legal_re
     <select id="queryAllByLimit" resultMap="SysAppMap">
         select
 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
         <where>
             <if test="sysApp.id != null">
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysBannerServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysBannerServiceImpl.java
index 559f4619d..99ee47de1 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysBannerServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysBannerServiceImpl.java
@@ -93,8 +93,10 @@ public class SysBannerServiceImpl implements SysBannerService {
 
     @Override
     public SysBanner queryByName(String bannerName) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         HashMap<String, Object> objectObjectHashMap = new HashMap<>();
         objectObjectHashMap.put("banner_name",bannerName);
+        objectObjectHashMap.put("store_id",nowAccountInfo.getStoreId());
         List<SysBanner> sysBanners = sysBannerMapper.selectByMap(objectObjectHashMap);
 
         return sysBanners.size() > 0 ? sysBanners.get(0) : null;
diff --git a/fuintBackend/fuint-application/src/main/resources/application.properties b/fuintBackend/fuint-application/src/main/resources/application.properties
index 2639080eb..27f4e4d47 100644
--- a/fuintBackend/fuint-application/src/main/resources/application.properties
+++ b/fuintBackend/fuint-application/src/main/resources/application.properties
@@ -1,10 +1,10 @@
 # \u57FA\u672C\u914D\u7F6E
 server.port=8080
 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=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=/www/wwwroot/shenlanshuke/oilAdmin/