|
|
@ -86,13 +86,13 @@ public class ShellGroupService { |
|
|
|
param.put("stationCode", stationCode); |
|
|
|
param.put("stationCode", stationCode); |
|
|
|
param.put("orderType", "OIL"); |
|
|
|
param.put("orderType", "OIL"); |
|
|
|
param.put("finishTime", DateUtil.date2String(finishTime, "yyyy-MM-dd HH:mm:ss")); |
|
|
|
param.put("finishTime", DateUtil.date2String(finishTime, "yyyy-MM-dd HH:mm:ss")); |
|
|
|
param.put("channelFavourAmount", channelFavourAmount); |
|
|
|
// param.put("channelFavourAmount", channelFavourAmount);
|
|
|
|
|
|
|
|
|
|
|
|
Map<String, Object> tradeOilOrder = new HashMap<>(); |
|
|
|
Map<String, Object> tradeOilOrder = new HashMap<>(); |
|
|
|
tradeOilOrder.put("amount", oilPrice); |
|
|
|
tradeOilOrder.put("amount", oilPrice); |
|
|
|
tradeOilOrder.put("code", oilCode); |
|
|
|
tradeOilOrder.put("code", oilCode); |
|
|
|
tradeOilOrder.put("oilGun", oilGun); |
|
|
|
tradeOilOrder.put("oilGun", oilGun); |
|
|
|
tradeOilOrder.put("channelSettlementAmount", settlementAmount); |
|
|
|
tradeOilOrder.put("channelSettlementAmount", oilPrice); |
|
|
|
param.put("tradeOilOrder", JSONObject.toJSONString(tradeOilOrder)); |
|
|
|
param.put("tradeOilOrder", JSONObject.toJSONString(tradeOilOrder)); |
|
|
|
return request(orderNo.replace("HF",""), "gas_sync_payment_notify", param); |
|
|
|
return request(orderNo.replace("HF",""), "gas_sync_payment_notify", param); |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|