Merge remote-tracking branch 'origin/feature/201812-wangcz' into feature/201812-wangcz

src/main/java/com/uas/platform/b2c/common/account/controller/UserController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2c.common.account.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.uas.message.mail.service.MailService;
 import com.uas.message.sms.service.SmsService;
 import com.uas.platform.b2c.common.account.model.User;
@@ -10,6 +11,7 @@ import com.uas.platform.b2c.common.account.service.UserQuestionService;
 import com.uas.platform.b2c.common.account.service.UserService;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
+import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
@@ -93,16 +95,19 @@ public class UserController {
 
 	/**
 	 * 设置头像路径
-	 * @param imageUrl
+	 * @param jsonStr
 	 * @return
 	 */
 	@RequestMapping(value = "/setImageUrl", method = RequestMethod.POST)
-	public User setUserImageUrl(@RequestBody String imageUrl) {
+	public User setUserImageUrl(@RequestBody String jsonStr) {
 		User user = SystemSession.getUser();
 		if (user == null) {
 			throw new IllegalOperatorException("您当前的账号不存在，或未登录！不能设置图像。");
 		}
-		user.setImageUrl(imageUrl);
+		if (!StringUtils.isEmpty(jsonStr)) {
+			JSONObject jsonObject = FastjsonUtils.parseObject(jsonStr);
+			user.setImageUrl(jsonObject.getString("imageUrl"));
+		}
 		assert logger != null;
 		logger.log("用户信息", "设置头像路径，UU：" + user.getUserUU());
 		return userService.save(user);

src/main/java/com/uas/platform/b2c/common/account/model/Enterprise.java

@@ -192,7 +192,7 @@ public class Enterprise implements Serializable {
 	/**
 	 * 企业简介
 	 */
-	@Column(name = "en_description", length = 1000)
+	@Column(name = "en_description", length = 2500)
 	private String description;
 
 	public String getDescription() {

src/main/java/com/uas/platform/b2c/common/account/model/UserInfo.java

@@ -73,7 +73,7 @@ public class UserInfo {
 		this.lastLoginTime = user.getLastLoginTime();
 		this.secLevel = countSecLevel();
 		this.emailValidCode = user.getEmailValidCode();
-
+		this.imageUrl = user.getImageUrl();
 	}
 
 	private Short countSecLevel(){
@@ -139,6 +139,8 @@ public class UserInfo {
 
 	private Set<UserLoginTime> userLoginTimeSet;
 
+	private String imageUrl;
+
 	public Integer getEmailValidCode() {
 		return emailValidCode;
 	}
@@ -270,6 +272,13 @@ public class UserInfo {
 		this.sys = sys;
 	}
 
+	public String getImageUrl() {
+		return imageUrl;
+	}
+
+	public void setImageUrl(String imageUrl) {
+		this.imageUrl = imageUrl;
+	}
 }
 
 /**

src/main/java/com/uas/platform/b2c/common/account/service/impl/UserServiceImpl.java

@@ -356,6 +356,7 @@ public class UserServiceImpl implements UserService {
 			userOld.setUserEmail(user.getUserEmail());
 			userOld.setUserTel(user.getUserTel());
 			userOld.setUserName(user.getUserName());
+			userOld.setImageUrl(user.getImageUrl());
 			try {
 				postToAccountCenter(userOld);
 			} catch (Exception e) {

src/main/java/com/uas/platform/b2c/common/weixin/model/TemplateMessage.java

@@ -16,7 +16,7 @@ public class TemplateMessage {
     /**
      * 模板Id
      */
-    private String templateId;
+    private String template_id;
 
     /**
      * 模板跳转地址
@@ -36,12 +36,12 @@ public class TemplateMessage {
         this.touser = touser;
     }
 
-    public String getTemplateId() {
-        return templateId;
+    public String getTemplate_id() {
+        return template_id;
     }
 
-    public void setTemplateId(String templateId) {
-        this.templateId = templateId;
+    public void setTemplate_id(String template_id) {
+        this.template_id = template_id;
     }
 
     public String getUrl() {

src/main/java/com/uas/platform/b2c/common/weixin/service/impl/WeChatServiceImpl.java

@@ -84,7 +84,7 @@ public class WeChatServiceImpl implements WeChatService{
             String sendTemplateUrl = WeChatUtil.SEND_TEMPLATE_URL.replace("ACCESS_TOKEN", access_token);
             // 模板内容设置
             TemplateMessage templateMessage = new TemplateMessage();
-            templateMessage.setTemplateId(WeChatUtil.INQUIRY_TEMPLATE_ID);
+            templateMessage.setTemplate_id(WeChatUtil.INQUIRY_TEMPLATE_ID);
             TemplateDataDetail first = new TemplateDataDetail();
             TemplateDataDetail keyword1 = new TemplateDataDetail();
             TemplateDataDetail keyword2 = new TemplateDataDetail();
@@ -104,8 +104,8 @@ public class WeChatServiceImpl implements WeChatService{
                     data.put("keyword2", keyword2);
                     keyword3.setColor("#173177");
                     keyword3.setValue("点击查看详情");
-                    data.put("keyword2", keyword2);
-                    first.setValue("尊敬的用户，您有一条新的询价单");
+                    data.put("keyword3", keyword3);
+                    first.setValue("尊敬的用户，您所在的企业（" + messageModel.getName() + "）有一条新的询价单");
                     remark.setValue(messageModel.getContent());
                     data.put("first", first);
                     data.put("remark", remark);

src/main/java/com/uas/platform/b2c/prod/store/facade/impl/StoreInFacadeImpl.java

@@ -80,6 +80,7 @@ public class StoreInFacadeImpl implements StoreInFacade {
 		}
 		store.setQualifications(qualifications);
         if ("BASIC_INFO".equals(kind)) {
+        	String description = newStoreInfo.getEnterprise().getDescription();
             Enterprise enter = enterpriseDao.findByUu(store.getEnUU());
             enter.setEnAddress(store.getEnterprise().getEnAddress());
             enter.setEnTel(store.getEnterprise().getEnTel());
@@ -87,6 +88,7 @@ public class StoreInFacadeImpl implements StoreInFacade {
             enter.setEnPhone(store.getEnterprise().getEnPhone());
             enter.setEnWeixin(store.getEnterprise().getEnWeixin());
             enter.setEnQQ(store.getEnterprise().getEnQQ());
+            enter.setDescription(description);
             enterpriseDao.save(enter);
         }
         store = storeInDao.save(store);
@@ -122,6 +124,7 @@ public class StoreInFacadeImpl implements StoreInFacade {
             enterprise.setEnPhone(newEnterprise.getEnPhone());
             enterprise.setEnWeixin(newEnterprise.getEnWeixin());
             enterprise.setEnQQ(newEnterprise.getEnQQ());
+            enterprise.setDescription(newEnterprise.getDescription());
 			store.setEnterprise(enterprise);
 			return null;
 		}

src/main/java/com/uas/platform/b2c/prod/store/model/StoreIn.java

@@ -74,7 +74,7 @@ public class StoreIn implements Serializable {
 	private String bannerUrl;
 
 	/**
-	 * 简介
+	 * 主营产品
 	 */
 	@Column(name = "st_description", length = 1000)
 	private String description;