From 6cdf792381125fbfadebdd106c03bc0bfb89b5cb Mon Sep 17 00:00:00 2001 From: zz Date: Thu, 18 Nov 2021 21:30:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E7=94=A8=E7=BB=93=E7=AE=97=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E5=88=99=E4=B8=8D=E5=9B=9E=E5=A4=8D=E6=A1=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/pp/logic/OrderDataLogic.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java index c58801ee..3dcb98c4 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java @@ -3,6 +3,7 @@ package com.xhpc.pp.logic; import cn.hutool.core.date.DateUtil; import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.api.PileOrderService; +import com.xhpc.common.core.domain.R; import com.xhpc.common.data.redis.CacheOrderData; import com.xhpc.common.data.up.OrderData; import com.xhpc.pp.tx.ServiceParameter; @@ -67,8 +68,11 @@ public class OrderDataLogic implements ServiceLogic { String resultStr = "6815".concat(req.get("seqhex").toString()).concat("0040").concat(orderNo).concat(ServiceResult.HEX_00); resultStr = resultStr.concat(CRCCalculator.calcCrc(resultStr)); - pileOrderService.pileEndOrder(orderNo); - return new ServiceResult(HexUtils.toBytes(resultStr), ServiceResult.OK); + final R r = pileOrderService.pileEndOrder(orderNo); + if (r.getCode() == 200) + return new ServiceResult(HexUtils.toBytes(resultStr), ServiceResult.OK); + else + return new ServiceResult(ServiceResult.FAIL); } private CacheOrderData translate(OrderData orderData) throws InvocationTargetException, IllegalAccessException, InstantiationException {