From cf49fe7440cc77300091239cf78d0b4916b3f1e0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 十月 2019 16:45:55 +0800
Subject: [PATCH] 增加饿了么订单

---
 fanli/src/main/java/com/yeshi/fanli/util/Constant.java |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 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 73c4d60..0d150fc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -7,7 +7,7 @@
 
 import org.yeshi.utils.annotation.MapUtil;
 
-import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
 import com.yeshi.fanli.entity.config.AlipayConfig;
 import com.yeshi.fanli.entity.config.ConstantConfig;
 import com.yeshi.fanli.entity.config.SMSConfig;
@@ -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;
@@ -248,6 +250,8 @@
 			return "鍞搧浼�";
 		case SOURCE_TYPE_SUNING:
 			return "鑻忓畞";
+		case SOURCE_TYPE_ELME:
+			return "楗夸簡涔�";
 		default:// 鍏朵粬绫诲瀷
 			return "";
 		}
@@ -263,9 +267,17 @@
 	}
 
 	public static String getAppName(String platform, String version) {
-		if (VersionUtil.greaterThan_2_0(platform, version))
-			return Constant.systemCommonConfig.getProjectName();
-		else
-			return "杩斿埄鍒�";
+		// if (VersionUtil.greaterThan_2_0(platform, version))
+		return Constant.systemCommonConfig.getProjectChineseName();
+		// else
+		// return "杩斿埄鍒�";
+	}
+
+	public static WXAccountInfoDTO getWXAccount(String platform, String version) {
+		// return new WXAccountInfoDTO("wx43617e2ed82c5b28",
+		// "f8a65908fb4681bdd181de70f6ab9a3b", "wx5c0d167c6e3ad726",
+		// "0c79d5869bb0f2d7c13e43f9a18f440d");
+		return new WXAccountInfoDTO("wxa99686bb65a9f466", "57390718ddedaa1591f6876cdcf96f43", "wx5c0d167c6e3ad726",
+				"0c79d5869bb0f2d7c13e43f9a18f440d");
 	}
 }

--
Gitblit v1.8.0