提交代码

hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java

@@ -329,13 +329,13 @@ public class HighOrderController {
                         childOrder.setGasPriceGun(priceModel.getPriceGun());
                         childOrder.setGasPriceVip(priceModel.getPriceGun());
                         childOrder.setGasPriceOfficial(new BigDecimal("0"));
-                        childOrder.setGasPricePlatform(priceModel.getPriceVip());
+                        childOrder.setGasPricePlatform(priceModel.getPriceGun());
                         childOrder.setGasOilLiters(priceModel.getOilLiters());
                         childOrder.setGasDiscount(new BigDecimal("0"));
                         childOrder.setExt1(childOrder.getGasPricePlatform().toString());
                         childOrder.setGasOilSubsidy(new BigDecimal("0"));
                         childOrder.setGasLitersPreferences(new BigDecimal("0"));
-                        childOrder.setGasPricePreferences(priceModel.getPriceVip());
+                        childOrder.setGasPricePreferences(priceModel.getPriceGun());
                     } else {
                         // 支付价格
                         childOrder.setGoodsActualPrice(priceModel.getPayPrice());

hai-schedule/src/main/java/com/hai/schedule/HighGasSchedule.java

@@ -156,6 +156,11 @@ public class HighGasSchedule {
         gasService.getJiaHaoYouAllStation();
     }
 
+    @Scheduled(cron = "0 1 0 * * ?")   //每日凌晨12点01分执行一次
+    public void getJinZhuAllStation() throws Exception {
+        gasService.getJinZhuAllStation();
+    }
+
    /* @Scheduled(cron = "0 30 7 * * ?")   //每日7点1分执行一次
     public void refreshPriceOfficial() throws Exception {
         gasOilPriceOfficialService.refreshPriceOfficial();

hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

@@ -343,7 +343,7 @@ public class HighOrderServiceImpl implements HighOrderService {
                         "抵扣积分订单：" + highOrder.getOrderNo() + "，使用积分:" + highOrder.getPayGold());
 
                 highOrder.setOrderStatus(OrderStatusEnum.type3.getType());
-                highOrder.setPayablePrice(highOrder.getPayPrice());
+                highOrder.setPayRealPrice(highOrder.getPayPrice());
                 highOrder.setPayTime(new Date());
 
                 for (HighChildOrder childOrder : highOrder.getHighChildOrderList()) {