协商记录

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderRefundController.java

@@ -259,9 +259,11 @@ public class GicOrderRefundController {
         ServiceResponse<List<OrderRefundConsultDTO>> resp = orderRefundApiService.listRefundConsult(orderRefundId);
         List<OrderRefundConsultVO> list = new ArrayList<>() ;
         for(OrderRefundConsultDTO dto : resp.getResult()) {
+            String operInfo = dto.getOperInfo() ;
+            dto.setOperInfo(null);
             OrderRefundConsultVO vo = EntityUtil.changeEntityByJSON(OrderRefundConsultVO.class, dto) ;
-            if(StringUtils.isNotEmpty(dto.getOperInfo())) {
-                ConsultOperVO oper = JSONObject.parseObject(dto.getOperInfo(), ConsultOperVO.class) ;
+            if(StringUtils.isNotEmpty(operInfo)) {
+                ConsultOperVO oper = JSONObject.parseObject(operInfo, ConsultOperVO.class) ;
                 vo.setOperInfo(oper);
             }
             list.add(vo) ;
@@ -277,12 +279,14 @@ public class GicOrderRefundController {
                 .listExchangeConsult(orderExchangeId);
         List<OrderExchangeConsultVO> list = new ArrayList<>() ;
         for(OrderExchangeConsultDTO dto : resp.getResult()) {
-           OrderExchangeConsultVO vo = EntityUtil.changeEntityByJSON(OrderExchangeConsultVO.class, dto) ;
-           if(StringUtils.isNotEmpty(dto.getOperInfo())) {
-               ConsultOperVO oper = JSONObject.parseObject(dto.getOperInfo(), ConsultOperVO.class) ;
-               vo.setOperInfo(oper);
-           }
-           list.add(vo) ;
+            String operInfo = dto.getOperInfo() ;
+            dto.setOperInfo(null);
+            OrderExchangeConsultVO vo = EntityUtil.changeEntityByJSON(OrderExchangeConsultVO.class, dto) ;
+            if(StringUtils.isNotEmpty(operInfo)) {
+                ConsultOperVO oper = JSONObject.parseObject(operInfo, ConsultOperVO.class) ;
+                vo.setOperInfo(oper);
+            }
+            list.add(vo) ;
         }
         return RestResponse.successResult(list);
     }