From 788deca1b4a24f8a24e49c24f7d89975a1d74bbe Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 03 十一月 2019 23:31:25 +0800
Subject: [PATCH] 商城订单退款处理

---
 fanli/src/main/java/com/yeshi/fanli/util/Constant.java |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
index 2105715..25c3e07 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -101,6 +101,8 @@
 	public static final int SOURCE_TYPE_WPH = 4;
 	// 鏉ユ簮-鑻忓畞
 	public static final int SOURCE_TYPE_SUNING = 5;
+	// 鏉ユ簮-楗夸簡涔�
+	public static final int SOURCE_TYPE_ELME = 6;
 
 	// 鑷喘-杩斿埄
 	public static final int TYPE_REBATE = 1;
@@ -113,6 +115,12 @@
 	public static final int TOKEN_DAYS = 1;
 	// 璧犻�佹湁鏁堟湡-澶�
 	public static final int GIVE_DAYS = 1;
+	
+	
+	// 寰俊鑷姩鎻愮幇閲戦
+	public static final int AUTO_EXTRACT_MONEY = 1;
+	// 寰俊鑷姩鎻愮幇鏈�浣庝綑棰�
+	public static final int AUTO_EXTRACT_MIN_SURPLUS = 2;
 
 	public static WXGZConfig wxGZConfig;
 
@@ -248,6 +256,8 @@
 			return "鍞搧浼�";
 		case SOURCE_TYPE_SUNING:
 			return "鑻忓畞";
+		case SOURCE_TYPE_ELME:
+			return "楗夸簡涔�";
 		default:// 鍏朵粬绫诲瀷
 			return "";
 		}
@@ -263,19 +273,17 @@
 	}
 
 	public static String getAppName(String platform, String version) {
-		if (VersionUtil.greaterThan_2_0(platform, version))
-			return Constant.systemCommonConfig.getProjectChineseName();
-		else
-			return "杩斿埄鍒�";
+		// if (VersionUtil.greaterThan_2_0(platform, version))
+		return Constant.systemCommonConfig.getProjectChineseName();
+		// else
+		// return "杩斿埄鍒�";
 	}
 
 	public static WXAccountInfoDTO getWXAccount(String platform, String version) {
-//		if (VersionUtil.greaterThan_2_0(platform, version)) {
-//			return new WXAccountInfoDTO("wxa99686bb65a9f466", "57390718ddedaa1591f6876cdcf96f43", "wx879fb78463222cd5",
-//					"2ad8ec333a9f96b13c5c5c1c2b13cd67");
-//		} else {
-			return new WXAccountInfoDTO("wx43617e2ed82c5b28", "f8a65908fb4681bdd181de70f6ab9a3b", "wx5c0d167c6e3ad726",
-					"0c79d5869bb0f2d7c13e43f9a18f440d");
-//		}
+		// return new WXAccountInfoDTO("wx43617e2ed82c5b28",
+		// "f8a65908fb4681bdd181de70f6ab9a3b", "wx5c0d167c6e3ad726",
+		// "0c79d5869bb0f2d7c13e43f9a18f440d");
+		return new WXAccountInfoDTO("wxa99686bb65a9f466", "57390718ddedaa1591f6876cdcf96f43", "wx5c0d167c6e3ad726",
+				"0c79d5869bb0f2d7c13e43f9a18f440d");
 	}
 }

--
Gitblit v1.8.0