From f32cc15f60bf3b5c47267ee256a0deb3bdd01eec Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 23 四月 2020 14:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java
index d365e90..a9aaeba 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java
@@ -8,7 +8,6 @@
import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;
import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail.MsgTypeAccountTypeEnum;
import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.msg.CommonMsgItemVO;
@@ -201,25 +200,21 @@
* @return
*/
public static MsgAccountDetail vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1,
- Long targetNum2, Integer type, String beizu) {
+ Long targetNum2) {
if (uid == null || originalName == null || upName == null)
return null;
List<CommonMsgItemVO> listMsg = new ArrayList<>();
List<ClientTextStyleVO> contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("鎭枩浣狅紒鏈夋晥", ClientTextStyleVO.COLOR_CONTENT));
- if (type == null) {
+ if (targetNum2 == null) {
contentList.add(new ClientTextStyleVO("鐩存帴绮変笣宸茶揪", ClientTextStyleVO.COLOR_CONTENT));
contentList.add(new ClientTextStyleVO(targetNum1+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
contentList.add(new ClientTextStyleVO("浜猴紝鏈夋晥闂存帴绮変笣宸茶揪", ClientTextStyleVO.COLOR_CONTENT));
contentList.add(new ClientTextStyleVO(targetNum2+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
contentList.add(new ClientTextStyleVO("浜�", ClientTextStyleVO.COLOR_CONTENT));
- } else if (type == Constant.TYPE_REBATE) {
- contentList.add(new ClientTextStyleVO("杩斿埄璁㈠崟宸茶揪", ClientTextStyleVO.COLOR_CONTENT));
- contentList.add(new ClientTextStyleVO(targetNum1+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
- contentList.add(new ClientTextStyleVO("绗�", ClientTextStyleVO.COLOR_CONTENT));
- } else if (type == Constant.TYPE_SHAER) {
- contentList.add(new ClientTextStyleVO("鍒嗕韩璁㈠崟宸茶揪", ClientTextStyleVO.COLOR_CONTENT));
+ } else {
+ contentList.add(new ClientTextStyleVO("杩斿埄+鍒嗕韩璁㈠崟宸茶揪", ClientTextStyleVO.COLOR_CONTENT));
contentList.add(new ClientTextStyleVO(targetNum1+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
contentList.add(new ClientTextStyleVO("绗�", ClientTextStyleVO.COLOR_CONTENT));
}
@@ -239,10 +234,9 @@
new ClientTextStyleVO("浠庢敹鍒版湰娑堟伅璧凤紝浣犲皢鑾峰緱璇ヨ处鎴风瓑绾у搴旂殑鍏ㄩ儴鏉冪泭", ClientTextStyleVO.COLOR_CONTENT)));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),
- new ClientTextStyleVO(StringUtil.isNullOrEmpty(beizu)?"鏃�":beizu, ClientTextStyleVO.COLOR_CONTENT)));
+ new ClientTextStyleVO("鏃�", ClientTextStyleVO.COLOR_CONTENT)));
MsgAccountDetail detail = new MsgAccountDetail();
- detail.setBeiZhu(beizu);
detail.setTitle("绛夌骇鎴愰暱");
detail.setType(MsgTypeAccountTypeEnum.vipPgrade);
detail.setUser(new UserInfo(uid));
--
Gitblit v1.8.0