Browse Source

老用户感恩回馈活动

wangxiaoming 6 years ago
parent
commit
fa259dcb96

+ 6 - 0
watero-wechat-service/src/main/java/com/iamberry/wechat/service/ImberryConfig.java

@@ -26,6 +26,10 @@ public class ImberryConfig {
 	public static String INTER_SMS_RENT_TYPE3_TEXT="";
 	/**   发送验证码      */
 	public static String PROBATION_VERIFICATION_CODE="";
+	/**   先打电话然后发短信      */
+	public static String PROBATION_THANKGIVING_PHONE_BEFORE="";
+	/**   不打电话直接发短信      */
+	public static String PROBATION_THANKGIVING_NO_PHONE="";
 	/**		云片key	*/
 	public static String INTER_SMS_KEY=""; 
 	/**		发送给收货人的试用进度提醒	7天		*/
@@ -62,6 +66,8 @@ public class ImberryConfig {
 			PROBATION_SUCCESS_THIRD_TEXT = pro.getProperty("PROBATION_SUCCESS_THIRD_TEXT");
 			LEASE_ORDER_SUCCESS_TEXT = pro.getProperty("LEASE_ORDER_SUCCESS_TEXT");
 			PROBATION_VERIFICATION_CODE = pro.getProperty("PROBATION_VERIFICATION_CODE");
+			PROBATION_THANKGIVING_PHONE_BEFORE = pro.getProperty("PROBATION_THANKGIVING_PHONE_BEFORE");
+			PROBATION_THANKGIVING_NO_PHONE = pro.getProperty("PROBATION_THANKGIVING_NO_PHONE");
 
 		} catch (Exception e) {
 			e.printStackTrace();

+ 7 - 1
watero-wechat-service/src/main/java/com/iamberry/wechat/service/MessageManager.java

@@ -26,7 +26,13 @@ public class MessageManager {
 		article.setDescription(imageTextInfo.getDigest());//图文消息描述
 		article.setPicUrl(picUrl);//图片URL
 		article.setUrl(clickUrl);//点击图文消息跳转链接
-	
+
+		System.out.println("===========================");
+		System.out.println(picUrl);
+		System.out.println(NameUtils.getConfig("IMAGE_URL"));
+		System.out.println(imageTextInfo.getImageUrl());
+		System.out.println("===========================");
+
 		if(imageTextInfo.getClickOutUrl() != null && !"".equals(imageTextInfo.getClickOutUrl())){
 			article.setUrl(imageTextInfo.getClickOutUrl()+ "?openid=" + requestMap.get("FromUserName")); //如果外链不为空则为外链
 		}

File diff suppressed because it is too large
+ 6 - 0
watero-wechat-web/src/main/resources/iamberry-app-service-config.properties


+ 2 - 0
watero-wechat-web/src/main/resources/platform.properties

@@ -193,3 +193,5 @@ SUCCESSINFO=SUCCESS
 RESERVE_PAY_CALLBACK=http//test.iamberry.com/watero/callback/reserver_back
 reserve_pay_money=1
 DO_MAIN=test.iamberry.com
+
+IMAGE_URL=https://w.iamberry.com