Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

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

@@ -158,10 +158,10 @@ public class HighGasSchedule {
 //        gasService.getPayloAllStation();
 //    }
 
-    @Scheduled(cron = "5 0 0 * * ?")   // 每日凌晨00:00:5执行一次
+//    @Scheduled(cron = "5 0 0 * * ?")   // 每日凌晨00:00:5执行一次
-    public void getDianAllStation() throws Exception {
+//    public void getDianAllStation() throws Exception {
-        gasService.getDianAllStation();
+//        gasService.getDianAllStation();
-    }
+//    }
 
 
 }

hai-service/src/main/java/com/hai/enum_type/MerchantStoreSourceType.java

@@ -13,7 +13,7 @@ public enum MerchantStoreSourceType {
     type4(4, "金猪加油", "金猪加油"),
     type5(5, "paylo", "四川壳牌"),
     type6(6, "点点网络", "团油"),
-    type7(7, "油卡站点", "自建站"),
+    type7(7, "卡优同城", "自建站"),
     ;
 
     private Integer number;

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

@@ -375,7 +375,6 @@ public class HighDiscountAgentCodeServiceImpl implements HighDiscountAgentCodeSe
                         discountAgentCode.setExt2(tradeId);
                         updateCode(discountAgentCode);
                     }
-
                 }
             } else {
                 // 加锁失败，重试

hai-service/src/main/resources/prod/commonConfig.properties

@@ -142,7 +142,7 @@ ScPetroAppid = 510000526745391907
 ScPetroAppKey = 5100006xmbmM2NBpm5HXT
 ScPetroAesKey = AueRgSEVwPg87ebYhbYvfxMM3XAkvimu
 #ScPetroUrl = http://43.136.176.177:8081/hd-api/out/
-#ScPetroAppid = 510000313181602615
+#ScPetroAppid = 5100003131816026151
 #ScPetroAppKey = 510000kA5kxtaDnx3V6HE
 #ScPetroAesKey = AptFsUgpgAij3evH7rm4ubTKu5viSx9U