java110 лет назад: 2
Родитель
Сommit
3deb86757a

+ 1 - 1
java110-db/src/main/resources/mapper/fee/FeeReceiptServiceDaoImplMapper.xml

@@ -93,7 +93,7 @@
         <if test="qendTime !=null and qendTime != ''">
             and t.create_time &lt;= #{qendTime}
         </if>
-        order by t.create_time desc
+        order by t.create_time desc,t.receipt_code desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

+ 10 - 1
service-api/src/main/java/com/java110/api/controller/app/smartWeter/NotifySmartMeterController.java

@@ -1,5 +1,6 @@
 package com.java110.api.controller.app.smartWeter;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.core.base.controller.BaseController;
 import com.java110.core.log.LoggerFactory;
 import com.java110.dto.meter.NotifyMeterWaterOrderDto;
@@ -33,6 +34,13 @@ public class NotifySmartMeterController extends BaseController{
             HttpServletRequest request) {
         String appId = "992020051967020024";
 
+        JSONObject paramIn = new JSONObject();
+        for (String key : request.getParameterMap().keySet()) {
+            paramIn.put(key, request.getParameter(key));
+            logger.debug("拓强回调报文form" + key + ":: " + request.getParameter(key));
+        }
+        logger.debug("拓强回调报文" + paramIn.toJSONString());
+
         //todo 为啥写的这么挫 因为拓强的电表 回调路径太长 他会失败
         switch (implBean) {
             case "a":
@@ -50,7 +58,8 @@ public class NotifySmartMeterController extends BaseController{
             default:
         }
 
-        return notifySmartWeterV1InnerServiceSMOImpl.notifySmartMater(new NotifyMeterWaterOrderDto(appId, postInfo, implBean));
+
+        return notifySmartWeterV1InnerServiceSMOImpl.notifySmartMater(new NotifyMeterWaterOrderDto(appId, paramIn.toJSONString(), implBean));
 
     }