From 1cd193934afe8d95f8e22ab8ad3601cc396fb8bd Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 7 Jul 2023 15:34:27 +0800 Subject: [PATCH 1/4] update --- .../TransactionRecordsRequestHandler.java | 4 +++ .../impl/OrderBasicInfoServiceImpl.java | 33 +++++++++---------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java index d25d3439b..30cadc4aa 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java @@ -582,6 +582,10 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { return getResult(ykcDataProtocol, concatMsgBody); } + /** + * 收到交易记录 处理订单 + * @param data + */ private void processOrder(TransactionRecordsData data) { String transactionCode = data.getTransactionCode(); // 根据交易流水号查询订单信息 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index bff689a09..0151de0a9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1,7 +1,6 @@ package com.jsowell.pile.service.impl; import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.fasterxml.jackson.core.JsonProcessingException; import com.github.pagehelper.PageHelper; @@ -1868,22 +1867,22 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { refundParams.put("notify_url", ADAPAY_REFUND_CALLBACK_URL); // 分账对象信息 - OrderBasicInfo orderBasicInfo = getOrderInfoByOrderCode(dto.getOrderCode()); - if (orderBasicInfo != null) { - String adapayMemberId = adapayMemberAccountService.selectAdapayMemberIdByStationId(orderBasicInfo.getStationId()); - if (StringUtils.isNotBlank(adapayMemberId)) { - JSONObject jsonObject = new JSONObject(); - jsonObject.put("member_id", adapayMemberId); - jsonObject.put("amount", amount); - jsonObject.put("fee_flag", Constants.Y); - - // 分账对象信息列表，最多仅支持7个分账方，json 数组形式 - JSONArray jsonArray = new JSONArray(); - jsonArray.add(jsonObject); - // 分账对象信息 - refundParams.put("div_members", jsonArray.toString()); - } - } + // OrderBasicInfo orderBasicInfo = getOrderInfoByOrderCode(dto.getOrderCode()); + // if (orderBasicInfo != null) { + // String adapayMemberId = adapayMemberAccountService.selectAdapayMemberIdByStationId(orderBasicInfo.getStationId()); + // if (StringUtils.isNotBlank(adapayMemberId)) { + // JSONObject jsonObject = new JSONObject(); + // jsonObject.put("member_id", adapayMemberId); + // jsonObject.put("amount", amount); + // jsonObject.put("fee_flag", Constants.Y); + // + // // 分账对象信息列表，最多仅支持7个分账方，json 数组形式 + // JSONArray jsonArray = new JSONArray(); + // jsonArray.add(jsonObject); + // // 分账对象信息 + // refundParams.put("div_members", jsonArray.toString()); + // } + // } try { Map response = Refund.create(id, refundParams); logger.info("汇付支付创建退款对象:{}", JSON.toJSONString(response)); From 26c8149f4149d0a2c982be0be541eefa301b49df Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 7 Jul 2023 15:38:25 +0800 Subject: [PATCH 2/4] update --- jsowell-ui/src/views/order/order/orderDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue index 74a094aac..fc37b43c9 100644 --- a/jsowell-ui/src/views/order/order/orderDetail.vue +++ b/jsowell-ui/src/views/order/order/orderDetail.vue @@ -194,7 +194,7 @@ - +
From 39407121375b044a047b287e6309d3fc16c80af7 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 7 Jul 2023 15:41:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/wxpay/utils/HttpUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/wxpay/utils/HttpUtils.java b/jsowell-pile/src/main/java/com/jsowell/wxpay/utils/HttpUtils.java index d9c0535aa..8c468a83c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/wxpay/utils/HttpUtils.java +++ b/jsowell-pile/src/main/java/com/jsowell/wxpay/utils/HttpUtils.java @@ -121,7 +121,7 @@ public class HttpUtils { String jsonResult = EntityUtils.toString(httpEntity); return JSON.readValue(jsonResult, HashMap.class); } else { - log.error("微信支付错误信息:{}", EntityUtils.toString(httpEntity)); + log.error("微信支付错误信息:{}, body:{}", EntityUtils.toString(httpEntity), body); } } catch (Exception e) { log.error("HttpUtils.doPostWexin error", e); From 28d5b681adaa51d94bbf18c3692c635f78b51a6d Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 7 Jul 2023 15:55:44 +0800 Subject: [PATCH 4/4] update --- .../handler/ConfirmStartChargingRequestHandler.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java index 29df41a74..d684de61a 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java @@ -18,9 +18,6 @@ import com.jsowell.pile.domain.MemberPlateNumberRelation; import com.jsowell.pile.domain.PileAuthCard; import com.jsowell.pile.dto.GenerateOrderDTO; import com.jsowell.pile.service.*; -import com.jsowell.pile.vo.CarVinInfoVO; -import com.jsowell.pile.vo.uniapp.MemberVO; -import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; import com.jsowell.wxpay.dto.WechatSendMsgDTO; import com.jsowell.wxpay.service.WxAppletRemoteService; import io.netty.channel.Channel; @@ -28,7 +25,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.List; import java.util.Map; /** @@ -170,13 +166,13 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ } } } catch (BusinessException e){ - transactionCode = "00000000000000000000000000000000"; + transactionCode = Constants.ILLEGAL_TRANSACTION_CODE; accountBalanceByteArr = BytesUtil.checkLengthAndBehindAppendZero(accountBalanceByteArr, 8); authenticationFlagByteArr = Constants.zeroByteArray; log.error("刷卡启动充电鉴权 error:{}, {}", e.getCode(), e.getMessage()); }catch (Exception e){ - transactionCode = "00000000000000000000000000000000"; + transactionCode = Constants.ILLEGAL_TRANSACTION_CODE; accountBalanceByteArr = BytesUtil.checkLengthAndBehindAppendZero(accountBalanceByteArr, 8); authenticationFlagByteArr = Constants.zeroByteArray; @@ -224,13 +220,13 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ } } }catch (BusinessException e){ - transactionCode = "00000000000000000000000000000000"; + transactionCode = Constants.ILLEGAL_TRANSACTION_CODE; accountBalanceByteArr = BytesUtil.checkLengthAndBehindAppendZero(accountBalanceByteArr, 8); authenticationFlagByteArr = Constants.zeroByteArray; log.error("VIN码启动充电鉴权 error:{}, {}", e.getCode(), e.getMessage()); }catch (Exception e) { - transactionCode = "00000000000000000000000000000000"; + transactionCode = Constants.ILLEGAL_TRANSACTION_CODE; accountBalanceByteArr = BytesUtil.checkLengthAndBehindAppendZero(accountBalanceByteArr, 8); authenticationFlagByteArr = Constants.zeroByteArray;