autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-08 20:10:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
admin-lmm
2023-07-07 16:10:26 +08:00
parent dd1d012a0b 28d5b681ad
commit 3f7da86fce
5 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java
View File

@@ -18,9 +18,6 @@ import com.jsowell.pile.domain.MemberPlateNumberRelation;
import com.jsowell.pile.domain.PileAuthCard; import com.jsowell.pile.domain.PileAuthCard;
import com.jsowell.pile.dto.GenerateOrderDTO; import com.jsowell.pile.dto.GenerateOrderDTO;
import com.jsowell.pile.service.*; 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.dto.WechatSendMsgDTO;
import com.jsowell.wxpay.service.WxAppletRemoteService; import com.jsowell.wxpay.service.WxAppletRemoteService;
import io.netty.channel.Channel; import io.netty.channel.Channel;
@@ -28,7 +25,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@@ -170,13 +166,13 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{
} }
} }
} catch (BusinessException e){ } catch (BusinessException e){
transactionCode = "00000000000000000000000000000000"; transactionCode = Constants.ILLEGAL_TRANSACTION_CODE;
accountBalanceByteArr = BytesUtil.checkLengthAndBehindAppendZero(accountBalanceByteArr, 8); accountBalanceByteArr = BytesUtil.checkLengthAndBehindAppendZero(accountBalanceByteArr, 8);
authenticationFlagByteArr = Constants.zeroByteArray; authenticationFlagByteArr = Constants.zeroByteArray;
log.error("刷卡启动充电鉴权 error:{}, {}", e.getCode(), e.getMessage()); log.error("刷卡启动充电鉴权 error:{}, {}", e.getCode(), e.getMessage());
}catch (Exception e){ }catch (Exception e){
transactionCode = "00000000000000000000000000000000"; transactionCode = Constants.ILLEGAL_TRANSACTION_CODE;
accountBalanceByteArr = BytesUtil.checkLengthAndBehindAppendZero(accountBalanceByteArr, 8); accountBalanceByteArr = BytesUtil.checkLengthAndBehindAppendZero(accountBalanceByteArr, 8);
authenticationFlagByteArr = Constants.zeroByteArray; authenticationFlagByteArr = Constants.zeroByteArray;
@@ -224,13 +220,13 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{
} }
} }
}catch (BusinessException e){ }catch (BusinessException e){
transactionCode = "00000000000000000000000000000000"; transactionCode = Constants.ILLEGAL_TRANSACTION_CODE;
accountBalanceByteArr = BytesUtil.checkLengthAndBehindAppendZero(accountBalanceByteArr, 8); accountBalanceByteArr = BytesUtil.checkLengthAndBehindAppendZero(accountBalanceByteArr, 8);
authenticationFlagByteArr = Constants.zeroByteArray; authenticationFlagByteArr = Constants.zeroByteArray;
log.error("VIN码启动充电鉴权 error:{}, {}", e.getCode(), e.getMessage()); log.error("VIN码启动充电鉴权 error:{}, {}", e.getCode(), e.getMessage());
}catch (Exception e) { }catch (Exception e) {
transactionCode = "00000000000000000000000000000000"; transactionCode = Constants.ILLEGAL_TRANSACTION_CODE;
accountBalanceByteArr = BytesUtil.checkLengthAndBehindAppendZero(accountBalanceByteArr, 8); accountBalanceByteArr = BytesUtil.checkLengthAndBehindAppendZero(accountBalanceByteArr, 8);
authenticationFlagByteArr = Constants.zeroByteArray; authenticationFlagByteArr = Constants.zeroByteArray;

4
jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java
View File

@@ -582,6 +582,10 @@ public class TransactionRecordsRequestHandler extends AbstractHandler {
return getResult(ykcDataProtocol, concatMsgBody); return getResult(ykcDataProtocol, concatMsgBody);
} }
/**
* 收到交易记录 处理订单
* @param data
*/
private void processOrder(TransactionRecordsData data) { private void processOrder(TransactionRecordsData data) {
String transactionCode = data.getTransactionCode(); String transactionCode = data.getTransactionCode();
// 根据交易流水号查询订单信息 // 根据交易流水号查询订单信息

33
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1,7 +1,6 @@
package com.jsowell.pile.service.impl; package com.jsowell.pile.service.impl;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
@@ -1868,22 +1867,22 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
refundParams.put("notify_url", ADAPAY_REFUND_CALLBACK_URL); refundParams.put("notify_url", ADAPAY_REFUND_CALLBACK_URL);
// 分账对象信息 // 分账对象信息
OrderBasicInfo orderBasicInfo = getOrderInfoByOrderCode(dto.getOrderCode()); // OrderBasicInfo orderBasicInfo = getOrderInfoByOrderCode(dto.getOrderCode());
if (orderBasicInfo != null) { // if (orderBasicInfo != null) {
String adapayMemberId = adapayMemberAccountService.selectAdapayMemberIdByStationId(orderBasicInfo.getStationId()); // String adapayMemberId = adapayMemberAccountService.selectAdapayMemberIdByStationId(orderBasicInfo.getStationId());
if (StringUtils.isNotBlank(adapayMemberId)) { // if (StringUtils.isNotBlank(adapayMemberId)) {
JSONObject jsonObject = new JSONObject(); // JSONObject jsonObject = new JSONObject();
jsonObject.put("member_id", adapayMemberId); // jsonObject.put("member_id", adapayMemberId);
jsonObject.put("amount", amount); // jsonObject.put("amount", amount);
jsonObject.put("fee_flag", Constants.Y); // jsonObject.put("fee_flag", Constants.Y);
//
// 分账对象信息列表，最多仅支持7个分账方，json 数组形式 // // 分账对象信息列表，最多仅支持7个分账方，json 数组形式
JSONArray jsonArray = new JSONArray(); // JSONArray jsonArray = new JSONArray();
jsonArray.add(jsonObject); // jsonArray.add(jsonObject);
// 分账对象信息 // // 分账对象信息
refundParams.put("div_members", jsonArray.toString()); // refundParams.put("div_members", jsonArray.toString());
} // }
} // }
try { try {
Map<String, Object> response = Refund.create(id, refundParams); Map<String, Object> response = Refund.create(id, refundParams);
logger.info("汇付支付创建退款对象:{}", JSON.toJSONString(response)); logger.info("汇付支付创建退款对象:{}", JSON.toJSONString(response));

2
jsowell-pile/src/main/java/com/jsowell/wxpay/utils/HttpUtils.java
View File

@@ -121,7 +121,7 @@ public class HttpUtils {
String jsonResult = EntityUtils.toString(httpEntity); String jsonResult = EntityUtils.toString(httpEntity);
return JSON.readValue(jsonResult, HashMap.class); return JSON.readValue(jsonResult, HashMap.class);
} else { } else {
log.error("微信支付错误信息:{}", EntityUtils.toString(httpEntity)); log.error("微信支付错误信息:{}, body:{}", EntityUtils.toString(httpEntity), body);
} }
} catch (Exception e) { } catch (Exception e) {
log.error("HttpUtils.doPostWexin error", e); log.error("HttpUtils.doPostWexin error", e);

2
jsowell-ui/src/views/order/order/orderDetail.vue
View File

@@ -194,7 +194,7 @@
<el-table-column prop="nickName" label="用户昵称" align="center"/> <el-table-column prop="nickName" label="用户昵称" align="center"/>
<el-table-column prop="mobileNumber" label="用户手机号" align="center"/> <el-table-column prop="mobileNumber" label="用户手机号" align="center"/>
<el-table-column prop="principalBalance" label="本金金额" align="center"/> <el-table-column prop="principalBalance" label="本金金额" align="center"/>
<el-table-column prop="giftBalance" label="赠送金额" align="center"/> <!-- <el-table-column prop="giftBalance" label="赠送金额" align="center"/>-->
<el-table-column prop="totalAccountAmount" label="总金额" align="center"/> <el-table-column prop="totalAccountAmount" label="总金额" align="center"/>
</el-table> </el-table>
<div class="marginTop"></div> <div class="marginTop"></div>