合并代码解决冲突

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -104,10 +104,6 @@ public class OrderAdapter {
     public static final String numberCharWithoutZero = "12345";
 
     private static FastDateFormat yyyyMMddHHmmss = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
-    public final static String TAKECODEKEY = "takecode";
-    public static final String REDIS_KEY_SEP = ":";
-    public static final String numberChar = "0123456789";
-    public static final String numberCharWithoutZero = "12345";
 
     private static String SPMCHID = "1237482502";
 //    private static String SPWXAPPID = "wx8244c7c48c7d45de";
@@ -145,9 +141,6 @@ public class OrderAdapter {
     private static Gson gson = new Gson();
 
     @Autowired
-    private RedisTemplate redisTemplate;
-
-    @Autowired
     private RedisCache redisCache;
 
     /**