dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新10.10

Browse Source
This commit is contained in:
许允枞 2024-10-10 16:36:42 +08:00
parent c19bd7b33f
commit 8edd6408c1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
View File

@ -189,8 +189,11 @@ public class FyPayServiceImpl implements FyPayService {
Map<String, String> reqMap = Utils.xmlStr2Map(rspXml); Map<String, String> reqMap = Utils.xmlStr2Map(rspXml);
String str = reqMap.get("sign"); String str = reqMap.get("sign");
if (Utils.verifySign(reqMap, str)) { if (Utils.verifySign(reqMap, str)) {
//油品订单
OilOrder oilOrder = oilOrderService.selectOilOrderByOrderNo(orderNo); OilOrder oilOrder = oilOrderService.selectOilOrderByOrderNo(orderNo);
//商品订单
LJOrder goodsOrder = goodsOrderService.selectGoodsOrder(orderNo); LJOrder goodsOrder = goodsOrderService.selectGoodsOrder(orderNo);
//收银台订单
CashierOrder cashierOrder = cashierOrderService.selectCashierOrder(orderNo); CashierOrder cashierOrder = cashierOrderService.selectCashierOrder(orderNo);
String transactionType = null; String transactionType = null;
String oilGunId = null; String oilGunId = null;
@ -208,6 +211,7 @@ public class FyPayServiceImpl implements FyPayService {
if ("IOS".equals(type)) { if ("IOS".equals(type)) {
transactionType = "3"; transactionType = "3";
} }
//查询商户配置
MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(storeId1,transactionType,oilGunId); MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(storeId1,transactionType,oilGunId);
List<ReturnRecord> returnRecords = returnRecordService.selectReturnRecordByOrderNo(orderNo); List<ReturnRecord> returnRecords = returnRecordService.selectReturnRecordByOrderNo(orderNo);
Date date = new Date(); Date date = new Date();