update 查询日志列表

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java

@@ -194,6 +194,13 @@ public class PileBasicInfoController extends BaseController {
 			pileFeedList = pileMsgRecordService.getPileFeedList(dto);
 		} catch (Exception e) {
 			logger.error("查询充电桩通讯日志error", e);
+			pileFeedList = PageResponse.builder()
+					.list(Lists.newArrayList())
+					.pageNum(dto.getPageNum())
+					.pageSize(dto.getPageSize())
+					.total(0)
+					.pages(0)
+					.build();
 		}
 		return AjaxResult.success(pileFeedList);
 	}

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java

@@ -202,7 +202,7 @@ public class PileMsgRecordServiceImpl implements PileMsgRecordService {
 		OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
 
 		// 订单号
-		String orderCode = orderBasicInfo.getOrderCode();
+		String orderCode = orderBasicInfo != null ? orderBasicInfo.getOrderCode() : "无";
 
 		// 充电度数
 		String totalElectricity = jsonObject.getString("totalElectricity");
@@ -220,6 +220,7 @@ public class PileMsgRecordServiceImpl implements PileMsgRecordService {
 		String pileConnectorCode = jsonObject.getString("pileSn") + jsonObject.getString("connectorCode");
 
 		return "订单号:" + orderCode + ", " +
+				"交易流水号:" + transactionCode + ", " +
 				"枪口编号:" + pileConnectorCode + ", " +
 				"充电度数:" + totalElectricity + ", " +
 				"消费金额:" + consumptionAmount + ", " +

jsowell-ui/src/views/pile/basic/detail.vue

@@ -487,10 +487,10 @@ export default {
             this.feedListLoading = true;
             this.queryParams.pileSn = this.pileSn;
             getPileFeedList(this.queryParams).then((response) => {
+                this.feedListLoading = false;
                 console.log("查询充电桩通信日志", response);
                 this.feedList = response.data.list;
                 this.total = response.data.total;
-                this.feedListLoading = false;
             });
         },
     },