增加总记录数

eccs-biz/src/main/java/com/emato/biz/mapper/mall/InventoryDataMapper.java

@@ -15,4 +15,6 @@ public interface InventoryDataMapper {
     Integer queryOneInventory(InventoryDataVo inventoryDataVo);
 
     void updateInventory(InventoryDataVo inventoryDataVo);
+
+    Integer getInventoryTotal();
 }

eccs-biz/src/main/java/com/emato/biz/mapper/mall/MallMngChangeMapper.java

@@ -70,5 +70,7 @@ public interface MallMngChangeMapper
 
     int pushSalesDetaiDate(NewSystemFormatEntiy newSystemFormatEntiy);
 
-    String getTotalRecord(Map<String, Object> weChatMapMsg);
+    Integer getTotalRecord(Map<String, Object> weChatMapMsg);
+
+
 }

eccs-biz/src/main/java/com/emato/biz/service/impl/SalesDetaiServicelImpl.java

@@ -67,7 +67,7 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
             if(timestamp.equals("")||merchId.equals("")){
                 return Result.error("900000051","参数错误");
             }
-            if(!strSign.equals(checkType(weChatMapSalesMsg.get("data").toString(),timestamp,str))){
+            if(!strSign.trim().equals(checkType(weChatMapSalesMsg.get("data").toString(),timestamp,str))){
                 return Result.error("900000052","签名错误");
             }
             Map<String, Object> weSalesMsg =  JSONObject.toJavaObject(JSON.parseObject(weChatMapSalesMsg.get("data").toString()), Map.class);
@@ -88,12 +88,13 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
             if(diff<=24){
                 pullQueryData(weChatMapSalesMsg);
                 List<NewSystemFormatEntiy> list = mallMngChangeMapper.getSalesDetaiData(weSalesMsg);
+                Integer total = mallMngChangeMapper.getTotalRecord(weSalesMsg);
                 //desList = DesUtils.encode(JSON.toJSONString(list));
                 if(list.size()==0){
                     return Result.error("900000054","该条件下无数据");
                 }else{
                     Map<String,Object> map = new HashMap<>();
-                    map.put("total",list.size());
+                    map.put("total",total);
                     map.put("rows",list);
                     return Result.success(map);
                 }
@@ -163,7 +164,7 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
             if(timestamp.equals("")||merchId.equals("")){
                 return Result.error("900000001","参数错误");
             }
-            if(!strSign.equals(checkType(weChatMapMsg.get("data").toString(),timestamp,str))){
+            if(!strSign.trim().equals(checkType(weChatMapMsg.get("data").toString(),timestamp,str))){
                 return Result.error("900000002","签名错误");
             }
             Map<String, Object> weDtilMsg =  JSONObject.toJavaObject(JSON.parseObject(weChatMapMsg.get("data").toString()), Map.class);
@@ -179,11 +180,12 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
             //数据查询
             pullQueryData(weChatMapMsg);
             List<InventoryDataPushVo> list = inventoryDataMapper.getInventoryData(weChatMapMsg);
+            Integer total = inventoryDataMapper.getInventoryTotal();
             if(list.size()==0){
                 return Result.error("900000004","该条件下无数据");
             }else{
                 Map<String,Object> map = new HashMap<>();
-                map.put("total",list.size());
+                map.put("total",total);
                 map.put("rows",list);
                 return Result.success(map);
             }

eccs-biz/src/main/resources/mapper/biz/mall/InventoryDataMapper.xml

@@ -20,6 +20,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
+    <select id="getInventoryTotal" resultType="java.lang.Integer">
+        SELECT
+        count(*)
+        FROM
+        o_inventory_data
+    </select>
+
 
     <insert id="inserInventory" parameterType="com.emato.biz.domain.mall.InventoryDataVo" >
         insert into o_inventory_data

eccs-biz/src/main/resources/mapper/biz/mall/MallMngChangeMapper.xml

@@ -203,9 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--    外部接口查询订单信息-->
     <select id="getSalesDetaiData"  parameterType="java.util.Map" resultType="com.emato.biz.domain.mall.PushSystemOdOderVo">
         SELECT
---         merch_sn as merchSn,
         merch_sn_name as merchSnName,
---         third_merch_sn as thirdMerchSn,
         third_merch_sn_name as thirdMerchSnName,
         receipt_no as receiptNo,
         store_name as storeName,
@@ -259,9 +257,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
-    <select id="getTotalRecord"  parameterType="java.util.Map" resultType="java.lang.String">
+    <select id="getTotalRecord"  parameterType="java.util.Map" resultType="java.lang.Integer">
         SELECT
-        count(*) as totalRecord
+        count(*)
         FROM
         mall_sales_detail_data
         WHERE
@@ -271,15 +269,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="endTime != null and endTime != ''">
             AND time_stamp &lt;= STR_TO_DATE(#{endTime}, '%Y-%m-%d %H:%i:%s')
         </if>
-        <if test="orderStatus !=null and orderStatus !=''">
-            AND order_status = #{orderStatus}
-        </if>
-        <if test="orderNo !=null and orderNo !=''">
-            AND receipt_no = #{orderNo}
-        </if>
-        <if test="offset != null and limit != null">
-            limit #{offset}, #{limit}
-        </if>
     </select>
 
     <!--    记录外部调用接口入参-->