修改

YijiaRestful/src/main/java/com/platform/yijia/controller/AppUserInfoController.java

@@ -100,6 +100,7 @@ public class AppUserInfoController {
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
+        logger.info("JS-SDK使用权限签名算法前台传来参数: "+"油站ID："+stationId+"; noncestr: " +noncestr+"; timestamp: " +timestamp + "; url: "+url);
         Map<String, String> m = stationService.getStationAppIdAndAppSecret(stationId);
         String gzhAppId ="";
         String gzhAppSecret ="";

YijiaRestful/src/main/resources/mapper/PayOrderMapper.xml

@@ -115,14 +115,14 @@
   </sql>
   <sql id="Base_Column_List_oilName">
         SELECT
-            T1.oil_name                           AS oilName,
+            T1.dict_label                         AS oilName,
             COUNT(T2.order_no)                    AS orderSum,
             SUM(IFNULL(T2.order_liters,0))        AS orderLitersSum,
             SUM(IFNULL(T2.receivable_amt,0))      AS receivableAmtSum,
             SUM(IFNULL(T2.discount_amt,0))        AS discountAmtSum,
             SUM(IFNULL(T2.amt,0))                 AS amtSum
-        FROM         sys_oil_type                 AS T1
-        LEFT JOIN    pay_order                    AS T2   ON T1.oil_name = T2.oil_name
+        FROM         sys_dict_data                AS T1
+        LEFT JOIN    pay_order                    AS T2   ON T1.dict_label = T2.oil_name
           <if test="stationId !=null">
               AND T2.station_id= #{stationId}
           </if>
@@ -135,19 +135,21 @@
           <if test="endTime !=null">
               AND T2.pay_date &lt; #{endTime}
           </if>
-        GROUP BY T1.oil_name
+        WHERE
+            T1.dict_type ="oil_name"
+        GROUP BY T1.dict_label
         ORDER BY amtSum DESC
   </sql>
   <sql id="Base_Column_List_payType">
         SELECT
-            T1.remark                             AS payType,
+            T1.dict_label                         AS payType,
             COUNT(T2.order_no)                    AS orderSum,
             SUM(IFNULL(T2.order_liters,0))        AS orderLitersSum,
             SUM(IFNULL(T2.receivable_amt,0))      AS receivableAmtSum,
             SUM(IFNULL(T2.discount_amt,0))        AS discountAmtSum,
             SUM(IFNULL(T2.amt,0))                 AS amtSum
-        FROM         sys_pay_type                 AS T1
-        LEFT JOIN    pay_order                    AS T2   ON T1.pay_type_name = T2.pay_type
+        FROM         sys_dict_data                AS T1
+        LEFT JOIN    pay_order                    AS T2   ON T1.dict_value = T2.pay_type
           <if test="stationId !=null">
               AND T2.station_id= #{stationId}
           </if>
@@ -160,7 +162,9 @@
           <if test="endTime !=null">
               AND T2.pay_date &lt; #{endTime}
           </if>
-        GROUP BY T1.remark
+        WHERE
+            T1.dict_type ="pay_type"
+        GROUP BY T1.dict_label
         ORDER BY amtSum DESC
   </sql>
   <sql id="Base_Column_List_NoGroupBy">

YijiaRestful/src/main/resources/mapper/StationInfoMapper.xml

@@ -489,7 +489,7 @@
     FROM
         sys_dept
     <where>
-      <if test="stationId !='' and stationId != null" >
+      <if test="stationId != null" >
         dept_id = #{stationId}
       </if>
     </where>