提交代码

2 months ago · 639b38f89b
parent 45ffb3ba18
commit 639b38f89b
2 changed files with 3 additions and 3 deletions
--- a/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
--- a/hai-service/src/main/java/com/hai/config/ShellGroupService.java
+++ b/hai-service/src/main/java/com/hai/config/ShellGroupService.java
@ -86,13 +86,13 @@ public class ShellGroupService {
            param.put("stationCode", stationCode);
            param.put("orderType", "OIL");
            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<>();
            tradeOilOrder.put("amount", oilPrice);
            tradeOilOrder.put("code", oilCode);
            tradeOilOrder.put("oilGun", oilGun);
-            tradeOilOrder.put("channelSettlementAmount", settlementAmount);
+            tradeOilOrder.put("channelSettlementAmount", oilPrice);
            param.put("tradeOilOrder", JSONObject.toJSONString(tradeOilOrder));
            return request(orderNo.replace("HF",""), "gas_sync_payment_notify", param);
        } catch (Exception e) {