提交代码

hai-bweb/src/main/java/com/bweb/controller/HighGasOilGunNoController.java

@@ -64,7 +64,7 @@ public class HighGasOilGunNoController {
             gasOilGunNo.setOilNoName(oilPrice.getOilNoName());
             gasOilGunNo.setOilType(oilPrice.getOilType());
             gasOilGunNo.setOilTypeName(oilPrice.getOilTypeName());
-            gasOilGunNo.setGunNo(body.getInteger("gunNo"));
+            gasOilGunNo.setGunNo(body.getString("gunNo"));
             gasOilGunNoService.editGunNo(gasOilGunNo);
 
             return ResponseMsgUtil.success("操作成功");

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

@@ -1 +1 @@
-package com.cweb.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.cweb.config.SysConst;
import com.hai.common.Base64Util;
import com.hai.common.exception.ErrorCode;
import com.hai.common.exception.ErrorHelp;
import com.hai.common.exception.SysCode;
import com.hai.common.pay.util.XmlUtil;
import com.hai.common.pay.util.sdk.WXPayConstants;
import com.hai.common.security.SessionObject;
import com.hai.common.security.UserCenter;
import com.hai.common.utils.*;
import com.hai.config.*;
import com.hai.dao.HighGasOrderPushMapper;
import com.hai.entity.*;
import com.hai.enum_type.MerchantStoreSourceType;
import com.hai.model.*;
import com.hai.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.ssl.SSLContexts;
import org.apache.http.util.EntityUtils;
import org.bouncycastle.util.encoders.UrlBase64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.util.IdGenerator;
import org.springframework.web.bind.annotation.*;
import sun.nio.cs.StreamEncoder;

import javax.annotation.Resource;
import javax.net.ssl.SSLContext;
import javax.servlet.http.HttpServletRequest;
import java.io.*;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.security.KeyStore;
import java.util.*;

/**
 * @Auther: 胡锐
 * @Description:
 * @Date: 2021/3/26 23:08
 */
@Controller
@RequestMapping(value = "/test")
@Api(value = "订单接口")
public class HighTestController {

    private static Logger log = LoggerFactory.getLogger(HighTestController.class);

    @Resource
    private PayloService payloService;

    @Resource
    private HighGasService gasService;

    @RequestMapping(value = "/getPayloAllStation", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "paylo油站")
    public ResponseData getPayloAllStation(HttpServletRequest request) {
        try {

            gasService.getPayloAllStation();

            return ResponseMsgUtil.success("");

        } catch (Exception e) {
            log.error("HighOrderController --> unionStagingPay() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

}
+package com.cweb.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.cweb.config.SysConst;
import com.hai.common.Base64Util;
import com.hai.common.exception.ErrorCode;
import com.hai.common.exception.ErrorHelp;
import com.hai.common.exception.SysCode;
import com.hai.common.pay.util.XmlUtil;
import com.hai.common.pay.util.sdk.WXPayConstants;
import com.hai.common.security.SessionObject;
import com.hai.common.security.UserCenter;
import com.hai.common.utils.*;
import com.hai.config.*;
import com.hai.dao.HighGasOrderPushMapper;
import com.hai.entity.*;
import com.hai.enum_type.MerchantStoreSourceType;
import com.hai.model.*;
import com.hai.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.ssl.SSLContexts;
import org.apache.http.util.EntityUtils;
import org.bouncycastle.util.encoders.UrlBase64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.util.IdGenerator;
import org.springframework.web.bind.annotation.*;
import sun.nio.cs.StreamEncoder;

import javax.annotation.Resource;
import javax.net.ssl.SSLContext;
import javax.servlet.http.HttpServletRequest;
import java.io.*;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.security.KeyStore;
import java.util.*;

/**
 * @Auther: 胡锐
 * @Description:
 * @Date: 2021/3/26 23:08
 */
@Controller
@RequestMapping(value = "/test")
@Api(value = "订单接口")
public class HighTestController {

    private static Logger log = LoggerFactory.getLogger(HighTestController.class);

    @Resource
    private PayloService payloService;

    @Resource
    private HighGasService gasService;

    @RequestMapping(value = "/ycShellPageQueryAllStation", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "订单退款")
    public ResponseData ycShellPageQueryAllStation() {
        try {
            return ResponseMsgUtil.success(payloService.ycShellPageQueryAllStation(1, 50));

        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/getPayloAllStation", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "paylo油站")
    public ResponseData getPayloAllStation(HttpServletRequest request) {
        try {

            gasService.getPayloAllStation();

            return ResponseMsgUtil.success("");

        } catch (Exception e) {
            log.error("HighOrderController --> unionStagingPay() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

}

hai-service/src/main/java/com/hai/config/PayloService.java

@@ -137,14 +137,14 @@ public class PayloService {
 
         // 请求接口
         JSONObject object = HttpsUtils.doPost(CommonSysConst.getSysConfig().getShellGroupUrl(), param);
-        reqLogService.insert(
+/*        reqLogService.insert(
                 TripartiteReqLogType.type2,
                 logSerialNo,
                 TripartiteReqLogReqType.type1,
                 CommonSysConst.getSysConfig().getShellGroupUrl(),
                 this.generateParam(param),
                 object.toString()
-        );
+        );*/
 
         if (object == null || !object.getString("status").equals("SUCCESS")) {
             throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, object == null?"请求失败":object.getString("message"));

hai-service/src/main/java/com/hai/dao/HighGasOilGunNoMapper.java

@@ -47,7 +47,7 @@ public interface HighGasOilGunNoMapper extends HighGasOilGunNoMapperExt {
         "values (#{gasOilPriceId,jdbcType=BIGINT}, #{storeId,jdbcType=BIGINT}, ",
         "#{oilNo,jdbcType=VARCHAR}, #{oilNoName,jdbcType=VARCHAR}, ",
         "#{oilType,jdbcType=INTEGER}, #{oilTypeName,jdbcType=VARCHAR}, ",
-        "#{gunNo,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
+        "#{gunNo,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
         "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
@@ -66,7 +66,7 @@ public interface HighGasOilGunNoMapper extends HighGasOilGunNoMapperExt {
         @Result(column="oil_no_name", property="oilNoName", jdbcType=JdbcType.VARCHAR),
         @Result(column="oil_type", property="oilType", jdbcType=JdbcType.INTEGER),
         @Result(column="oil_type_name", property="oilTypeName", jdbcType=JdbcType.VARCHAR),
-        @Result(column="gun_no", property="gunNo", jdbcType=JdbcType.INTEGER),
+        @Result(column="gun_no", property="gunNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@@ -90,7 +90,7 @@ public interface HighGasOilGunNoMapper extends HighGasOilGunNoMapperExt {
         @Result(column="oil_no_name", property="oilNoName", jdbcType=JdbcType.VARCHAR),
         @Result(column="oil_type", property="oilType", jdbcType=JdbcType.INTEGER),
         @Result(column="oil_type_name", property="oilTypeName", jdbcType=JdbcType.VARCHAR),
-        @Result(column="gun_no", property="gunNo", jdbcType=JdbcType.INTEGER),
+        @Result(column="gun_no", property="gunNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@@ -116,7 +116,7 @@ public interface HighGasOilGunNoMapper extends HighGasOilGunNoMapperExt {
           "oil_no_name = #{oilNoName,jdbcType=VARCHAR},",
           "oil_type = #{oilType,jdbcType=INTEGER},",
           "oil_type_name = #{oilTypeName,jdbcType=VARCHAR},",
-          "gun_no = #{gunNo,jdbcType=INTEGER},",
+          "gun_no = #{gunNo,jdbcType=VARCHAR},",
           "`status` = #{status,jdbcType=INTEGER},",
           "create_time = #{createTime,jdbcType=TIMESTAMP},",
           "ext_1 = #{ext1,jdbcType=VARCHAR},",

hai-service/src/main/java/com/hai/dao/HighGasOilGunNoSqlProvider.java

@@ -53,7 +53,7 @@ public class HighGasOilGunNoSqlProvider {
         }
         
         if (record.getGunNo() != null) {
-            sql.VALUES("gun_no", "#{gunNo,jdbcType=INTEGER}");
+            sql.VALUES("gun_no", "#{gunNo,jdbcType=VARCHAR}");
         }
         
         if (record.getStatus() != null) {
@@ -144,7 +144,7 @@ public class HighGasOilGunNoSqlProvider {
         }
         
         if (record.getGunNo() != null) {
-            sql.SET("gun_no = #{record.gunNo,jdbcType=INTEGER}");
+            sql.SET("gun_no = #{record.gunNo,jdbcType=VARCHAR}");
         }
         
         if (record.getStatus() != null) {
@@ -182,7 +182,7 @@ public class HighGasOilGunNoSqlProvider {
         sql.SET("oil_no_name = #{record.oilNoName,jdbcType=VARCHAR}");
         sql.SET("oil_type = #{record.oilType,jdbcType=INTEGER}");
         sql.SET("oil_type_name = #{record.oilTypeName,jdbcType=VARCHAR}");
-        sql.SET("gun_no = #{record.gunNo,jdbcType=INTEGER}");
+        sql.SET("gun_no = #{record.gunNo,jdbcType=VARCHAR}");
         sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
         sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
         sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
@@ -223,7 +223,7 @@ public class HighGasOilGunNoSqlProvider {
         }
         
         if (record.getGunNo() != null) {
-            sql.SET("gun_no = #{gunNo,jdbcType=INTEGER}");
+            sql.SET("gun_no = #{gunNo,jdbcType=VARCHAR}");
         }
         
         if (record.getStatus() != null) {

hai-service/src/main/java/com/hai/entity/HighGasOilGunNo.java

@@ -51,7 +51,7 @@ public class HighGasOilGunNo implements Serializable {
     /**
      * 枪号
      */
-    private Integer gunNo;
+    private String gunNo;
 
     /**
      * 状态 0：删除  1：正常
@@ -127,11 +127,11 @@ public class HighGasOilGunNo implements Serializable {
         this.oilTypeName = oilTypeName;
     }
 
-    public Integer getGunNo() {
+    public String getGunNo() {
         return gunNo;
     }
 
-    public void setGunNo(Integer gunNo) {
+    public void setGunNo(String gunNo) {
         this.gunNo = gunNo;
     }
 

hai-service/src/main/java/com/hai/entity/HighGasOilGunNoExample.java

@@ -585,52 +585,62 @@ public class HighGasOilGunNoExample {
             return (Criteria) this;
         }
 
-        public Criteria andGunNoEqualTo(Integer value) {
+        public Criteria andGunNoEqualTo(String value) {
             addCriterion("gun_no =", value, "gunNo");
             return (Criteria) this;
         }
 
-        public Criteria andGunNoNotEqualTo(Integer value) {
+        public Criteria andGunNoNotEqualTo(String value) {
             addCriterion("gun_no <>", value, "gunNo");
             return (Criteria) this;
         }
 
-        public Criteria andGunNoGreaterThan(Integer value) {
+        public Criteria andGunNoGreaterThan(String value) {
             addCriterion("gun_no >", value, "gunNo");
             return (Criteria) this;
         }
 
-        public Criteria andGunNoGreaterThanOrEqualTo(Integer value) {
+        public Criteria andGunNoGreaterThanOrEqualTo(String value) {
             addCriterion("gun_no >=", value, "gunNo");
             return (Criteria) this;
         }
 
-        public Criteria andGunNoLessThan(Integer value) {
+        public Criteria andGunNoLessThan(String value) {
             addCriterion("gun_no <", value, "gunNo");
             return (Criteria) this;
         }
 
-        public Criteria andGunNoLessThanOrEqualTo(Integer value) {
+        public Criteria andGunNoLessThanOrEqualTo(String value) {
             addCriterion("gun_no <=", value, "gunNo");
             return (Criteria) this;
         }
 
-        public Criteria andGunNoIn(List<Integer> values) {
+        public Criteria andGunNoLike(String value) {
+            addCriterion("gun_no like", value, "gunNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andGunNoNotLike(String value) {
+            addCriterion("gun_no not like", value, "gunNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andGunNoIn(List<String> values) {
             addCriterion("gun_no in", values, "gunNo");
             return (Criteria) this;
         }
 
-        public Criteria andGunNoNotIn(List<Integer> values) {
+        public Criteria andGunNoNotIn(List<String> values) {
             addCriterion("gun_no not in", values, "gunNo");
             return (Criteria) this;
         }
 
-        public Criteria andGunNoBetween(Integer value1, Integer value2) {
+        public Criteria andGunNoBetween(String value1, String value2) {
             addCriterion("gun_no between", value1, value2, "gunNo");
             return (Criteria) this;
         }
 
-        public Criteria andGunNoNotBetween(Integer value1, Integer value2) {
+        public Criteria andGunNoNotBetween(String value1, String value2) {
             addCriterion("gun_no not between", value1, value2, "gunNo");
             return (Criteria) this;
         }

hai-service/src/main/java/com/hai/service/HighGasOilGunNoService.java

@@ -28,7 +28,7 @@ public interface HighGasOilGunNoService {
      * @param gunNo
      * @return
      */
-    HighGasOilGunNo getDetailByStoreAndGunNo(Long storeId, Integer gunNo);
+    HighGasOilGunNo getDetailByStoreAndGunNo(Long storeId, String gunNo);
 
     /**
      * 查询抢号列表

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

@@ -33,7 +33,7 @@ public class HighGasOilGunNoServiceImpl implements HighGasOilGunNoService {
     }
 
     @Override
-    public HighGasOilGunNo getDetailByStoreAndGunNo(Long storeId, Integer gunNo) {
+    public HighGasOilGunNo getDetailByStoreAndGunNo(Long storeId, String gunNo) {
         HighGasOilGunNoExample example = new HighGasOilGunNoExample();
         example.createCriteria().andStoreIdEqualTo(storeId).andGunNoEqualTo(gunNo).andStatusEqualTo(1);
         List<HighGasOilGunNo> list = gasOilGunNoMapper.selectByExample(example);

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

@@ -122,7 +122,7 @@ public class HighGasServiceImpl implements HighGasService {
 
                             JSONArray oilGunNoList = oilPriceObject.getJSONArray("oilGunNoList");
                             for (Object o : oilGunNoList) {
-                                HighGasOilGunNo gasOilGunNo = gasOilGunNoService.getDetailByStoreAndGunNo(highGasOilPrice.getMerchantStoreId(), Integer.parseInt(o.toString()));
+                                HighGasOilGunNo gasOilGunNo = gasOilGunNoService.getDetailByStoreAndGunNo(highGasOilPrice.getMerchantStoreId(), o.toString());
                                 if (gasOilGunNo == null) {
                                     gasOilGunNo = new HighGasOilGunNo();
                                     gasOilGunNo.setGasOilPriceId(highGasOilPrice.getId());
@@ -131,7 +131,7 @@ public class HighGasServiceImpl implements HighGasService {
                                     gasOilGunNo.setOilNoName(highGasOilPrice.getOilNoName());
                                     gasOilGunNo.setOilType(highGasOilPrice.getOilType());
                                     gasOilGunNo.setOilTypeName(highGasOilPrice.getOilTypeName());
-                                    gasOilGunNo.setGunNo(Integer.parseInt(o.toString()));
+                                    gasOilGunNo.setGunNo(o.toString());
                                     gasOilGunNo.setStatus(1);
                                     gasOilGunNoService.editGunNo(gasOilGunNo);
                                 }
@@ -161,7 +161,7 @@ public class HighGasServiceImpl implements HighGasService {
 
                             JSONArray oilGunNoList = oilPriceObject.getJSONArray("oilGunNoList");
                             for (Object o : oilGunNoList) {
-                                HighGasOilGunNo gasOilGunNo = gasOilGunNoService.getDetailByStoreAndGunNo(highGasOilPrice.getMerchantStoreId(), Integer.parseInt(o.toString()));
+                                HighGasOilGunNo gasOilGunNo = gasOilGunNoService.getDetailByStoreAndGunNo(highGasOilPrice.getMerchantStoreId(), o.toString());
                                 if (gasOilGunNo == null) {
                                     gasOilGunNo = new HighGasOilGunNo();
                                     gasOilGunNo.setGasOilPriceId(highGasOilPrice.getId());
@@ -170,7 +170,7 @@ public class HighGasServiceImpl implements HighGasService {
                                     gasOilGunNo.setOilNoName(highGasOilPrice.getOilNoName());
                                     gasOilGunNo.setOilType(highGasOilPrice.getOilType());
                                     gasOilGunNo.setOilTypeName(highGasOilPrice.getOilTypeName());
-                                    gasOilGunNo.setGunNo(Integer.parseInt(o.toString()));
+                                    gasOilGunNo.setGunNo(o.toString());
                                     gasOilGunNo.setStatus(1);
                                     gasOilGunNoService.editGunNo(gasOilGunNo);
                                 }
@@ -237,7 +237,7 @@ public class HighGasServiceImpl implements HighGasService {
                             gasOilGunNo.setOilNoName(highGasOilPrice.getOilNoName());
                             gasOilGunNo.setOilType(highGasOilPrice.getOilType());
                             gasOilGunNo.setOilTypeName(highGasOilPrice.getOilTypeName());
-                            gasOilGunNo.setGunNo(Integer.parseInt(o.toString()));
+                            gasOilGunNo.setGunNo(o.toString());
                             gasOilGunNo.setStatus(1);
                             gasOilGunNoService.editGunNo(gasOilGunNo);
                         }
@@ -245,6 +245,13 @@ public class HighGasServiceImpl implements HighGasService {
                 }
             }
         }
+
+        // 正式环境测试油站，默认屏蔽
+        HighMerchantStore store = highMerchantStoreService.getMerStoreDetailByKey("1001");
+        if (store != null) {
+            store.setStatus(0);
+            highMerchantStoreService.updateMerchantStoreDetail(store);
+        }
     }
 
     @Override
@@ -316,7 +323,7 @@ public class HighGasServiceImpl implements HighGasService {
 
                             JSONArray oilGunNoList = oilPriceObject.getJSONArray("oilGunNoList");
                             for (Object o : oilGunNoList) {
-                                HighGasOilGunNo gasOilGunNo = gasOilGunNoService.getDetailByStoreAndGunNo(highGasOilPrice.getMerchantStoreId(), Integer.parseInt(o.toString()));
+                                HighGasOilGunNo gasOilGunNo = gasOilGunNoService.getDetailByStoreAndGunNo(highGasOilPrice.getMerchantStoreId(), o.toString());
                                 if (gasOilGunNo == null) {
                                     gasOilGunNo = new HighGasOilGunNo();
                                     gasOilGunNo.setGasOilPriceId(highGasOilPrice.getId());
@@ -325,7 +332,7 @@ public class HighGasServiceImpl implements HighGasService {
                                     gasOilGunNo.setOilNoName(highGasOilPrice.getOilNoName());
                                     gasOilGunNo.setOilType(highGasOilPrice.getOilType());
                                     gasOilGunNo.setOilTypeName(highGasOilPrice.getOilTypeName());
-                                    gasOilGunNo.setGunNo(Integer.parseInt(o.toString()));
+                                    gasOilGunNo.setGunNo(o.toString());
                                     gasOilGunNo.setStatus(1);
                                     gasOilGunNoService.editGunNo(gasOilGunNo);
                                 }
@@ -357,7 +364,7 @@ public class HighGasServiceImpl implements HighGasService {
 
                             JSONArray oilGunNoList = oilPriceObject.getJSONArray("oilGunNoList");
                             for (Object o : oilGunNoList) {
-                                HighGasOilGunNo gasOilGunNo = gasOilGunNoService.getDetailByStoreAndGunNo(highGasOilPrice.getMerchantStoreId(), Integer.parseInt(o.toString()));
+                                HighGasOilGunNo gasOilGunNo = gasOilGunNoService.getDetailByStoreAndGunNo(highGasOilPrice.getMerchantStoreId(), o.toString());
                                 if (gasOilGunNo == null) {
                                     gasOilGunNo = new HighGasOilGunNo();
                                     gasOilGunNo.setGasOilPriceId(highGasOilPrice.getId());
@@ -366,7 +373,7 @@ public class HighGasServiceImpl implements HighGasService {
                                     gasOilGunNo.setOilNoName(highGasOilPrice.getOilNoName());
                                     gasOilGunNo.setOilType(highGasOilPrice.getOilType());
                                     gasOilGunNo.setOilTypeName(highGasOilPrice.getOilTypeName());
-                                    gasOilGunNo.setGunNo(Integer.parseInt(o.toString()));
+                                    gasOilGunNo.setGunNo(o.toString());
                                     gasOilGunNo.setStatus(1);
                                     gasOilGunNoService.editGunNo(gasOilGunNo);
                                 }
@@ -435,7 +442,7 @@ public class HighGasServiceImpl implements HighGasService {
                             gasOilGunNo.setOilNoName(highGasOilPrice.getOilNoName());
                             gasOilGunNo.setOilType(highGasOilPrice.getOilType());
                             gasOilGunNo.setOilTypeName(highGasOilPrice.getOilTypeName());
-                            gasOilGunNo.setGunNo(Integer.parseInt(o.toString()));
+                            gasOilGunNo.setGunNo(o.toString());
                             gasOilGunNo.setStatus(1);
                             gasOilGunNoService.editGunNo(gasOilGunNo);
                         }
@@ -443,6 +450,14 @@ public class HighGasServiceImpl implements HighGasService {
                 }
             }
         }
+
+
+        // 正式环境测试油站，默认屏蔽
+        HighMerchantStore store = highMerchantStoreService.getMerStoreDetailByKey("8888");
+        if (store != null) {
+            store.setStatus(0);
+            highMerchantStoreService.updateMerchantStoreDetail(store);
+        }
     }
 
     @Override
@@ -511,7 +526,7 @@ public class HighGasServiceImpl implements HighGasService {
 
                                 JSONArray oilGunNoList = oilPriceObject.getJSONArray("guns");
                                 for (Object o : oilGunNoList) {
-                                    HighGasOilGunNo gasOilGunNo = gasOilGunNoService.getDetailByStoreAndGunNo(highGasOilPrice.getMerchantStoreId(), Integer.parseInt(o.toString()));
+                                    HighGasOilGunNo gasOilGunNo = gasOilGunNoService.getDetailByStoreAndGunNo(highGasOilPrice.getMerchantStoreId(), o.toString());
                                     if (gasOilGunNo == null) {
                                         gasOilGunNo = new HighGasOilGunNo();
                                         gasOilGunNo.setGasOilPriceId(highGasOilPrice.getId());
@@ -520,7 +535,7 @@ public class HighGasServiceImpl implements HighGasService {
                                         gasOilGunNo.setOilNoName(highGasOilPrice.getOilNoName());
                                         gasOilGunNo.setOilType(highGasOilPrice.getOilType());
                                         gasOilGunNo.setOilTypeName(highGasOilPrice.getOilTypeName());
-                                        gasOilGunNo.setGunNo(Integer.parseInt(o.toString()));
+                                        gasOilGunNo.setGunNo(o.toString());
                                         gasOilGunNo.setStatus(1);
                                         gasOilGunNoService.editGunNo(gasOilGunNo);
                                     }
@@ -536,7 +551,7 @@ public class HighGasServiceImpl implements HighGasService {
 
                                 JSONArray oilGunNoList = oilPriceObject.getJSONArray("guns");
                                 for (Object o : oilGunNoList) {
-                                    HighGasOilGunNo gasOilGunNo = gasOilGunNoService.getDetailByStoreAndGunNo(highGasOilPrice.getMerchantStoreId(), Integer.parseInt(o.toString()));
+                                    HighGasOilGunNo gasOilGunNo = gasOilGunNoService.getDetailByStoreAndGunNo(highGasOilPrice.getMerchantStoreId(), o.toString());
                                     if (gasOilGunNo == null) {
                                         gasOilGunNo = new HighGasOilGunNo();
                                         gasOilGunNo.setGasOilPriceId(highGasOilPrice.getId());
@@ -545,7 +560,7 @@ public class HighGasServiceImpl implements HighGasService {
                                         gasOilGunNo.setOilNoName(highGasOilPrice.getOilNoName());
                                         gasOilGunNo.setOilType(highGasOilPrice.getOilType());
                                         gasOilGunNo.setOilTypeName(highGasOilPrice.getOilTypeName());
-                                        gasOilGunNo.setGunNo(Integer.parseInt(o.toString()));
+                                        gasOilGunNo.setGunNo(o.toString());
                                         gasOilGunNo.setStatus(1);
                                         gasOilGunNoService.editGunNo(gasOilGunNo);
                                     }
@@ -610,7 +625,7 @@ public class HighGasServiceImpl implements HighGasService {
                             gasOilGunNo.setOilNoName(highGasOilPrice.getOilNoName());
                             gasOilGunNo.setOilType(highGasOilPrice.getOilType());
                             gasOilGunNo.setOilTypeName(highGasOilPrice.getOilTypeName());
-                            gasOilGunNo.setGunNo(Integer.parseInt(o.toString()));
+                            gasOilGunNo.setGunNo(o.toString());
                             gasOilGunNo.setStatus(1);
                             gasOilGunNoService.editGunNo(gasOilGunNo);
                         }