From 251a533b9c12e7d423b31473721a59580cab5b58 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 25 七月 2020 13:07:13 +0800
Subject: [PATCH] 将商品服务剥离出主项目
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java
index 0f1ecd6..bd0fa38 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java
@@ -17,6 +17,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpSession;
+import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -49,14 +52,13 @@
import com.yeshi.fanli.entity.goods.RecommendUserGoods;
import com.yeshi.fanli.entity.push.DeviceActive;
import com.yeshi.fanli.entity.push.PushGoods;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.exception.goods.CommonGoodsException;
import com.yeshi.fanli.exception.goods.RecommendUserGoodsException;
import com.yeshi.fanli.exception.msg.UserSystemMsgException;
import com.yeshi.fanli.exception.user.UserCustomSettingsException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
-import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.goods.RecommendUserGoodsService;
import com.yeshi.fanli.service.inter.homemodule.SpecialService;
@@ -79,7 +81,7 @@
import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
@@ -99,8 +101,7 @@
@RequestMapping("api/v1/user/msg")
public class UserMsgController {
- @Resource
- private BusinessSystemService businessSystemService;
+
@Resource
private MsgOrderDetailService msgOrderDetailService;
@@ -160,6 +161,9 @@
@Resource
private UserInfoExtraService userInfoExtraService;
+
+ @Resource
+ private ConfigService configService;
// 娑堟伅鐨勭被鍨�
final static String MSG_TYPE_ORDER = "order";
@@ -605,10 +609,11 @@
// 鍒涘缓鏃堕棿鍦�28鍙峰悗鐨勬墠鏈夋柊浜烘杩�
if ((time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd") || uid == null)) {
UserHomeMsgVO vo = new UserHomeMsgVO();
- vo.setContent(String.format("鎭枩浣狅紝鎴愪负%s鐨勭敤鎴穃n鐙浼樻儬鍒稿府浣犵渷閽憋紱\n鍙備笌濂栭噾娲诲姩甯綘璧氶挶锛沑n璁�%s鎴愪负浣犵殑鐪侀挶鍔╂墜鍚э紒",
- Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion()),
- Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion())));
- vo.setTitle("鏂颁汉娆㈣繋");
+ vo.setContent(configService.getValue(ConfigKeyEnum.welcomeMsg, acceptData.getSystem()));
+ if (acceptData.getSystem() == SystemEnum.blks)
+ vo.setTitle("鏂颁汉娆㈣繋");
+ else
+ vo.setTitle("娆㈣繋鏂颁汉");
vo.setCreateTime(getTimeDesc(now, new Date(time)));
vo.setType(UserHomeMsgVO.TYPE_WELCOME);
volist.add(vo);
@@ -726,7 +731,8 @@
}
// 浜哄伐瀹㈡湇
- commonMsgList.add(getKeFuMsg(acceptData));
+ if (acceptData.getSystem() == SystemEnum.blks)
+ commonMsgList.add(getKeFuMsg(acceptData));
// 鎺ㄨ崘璁板綍
DeviceActive deviceActive = deviceActiveService.getDeviceByDeviceAndPlatform(acceptData.getDevice(),
@@ -854,11 +860,12 @@
// 鍒涘缓鏃堕棿鍦�28鍙峰悗鐨勬墠鏈夋柊浜烘杩�
if ((time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd") || uid == null)) {
Map<String, Object> map = new HashMap<String, Object>();
- map.put("title", "鏂颁汉娆㈣繋");
+ if (acceptData.getSystem() == SystemEnum.blks)
+ map.put("title", "鏂颁汉娆㈣繋");
+ else
+ map.put("title", "娆㈣繋鏂颁汉");
map.put("content",
- String.format("鎭枩浣狅紝鎴愪负%s鐨勭敤鎴穃n鐙浼樻儬鍒稿府浣犵渷閽憋紱\n鍙備笌濂栭噾娲诲姩甯綘璧氶挶锛沑n璁�%s鎴愪负浣犵殑鐪侀挶鍔╂墜鍚э紒",
- Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion()),
- Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion())));
+ configService.getValue(ConfigKeyEnum.welcomeMsg, acceptData.getSystem()));
map.put("createTime", new Date(time));
UserMsgCenter msgCenternre = new UserMsgCenter();
msgCenternre.setWelcomeMsg(map);
--
Gitblit v1.8.0