From e7435f02fcbe040e32dfd21c308957eb2de2837d Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期一, 13 四月 2020 14:18:34 +0800 Subject: [PATCH] 订单详情 --- fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java index b8074d4..6df0264 100644 --- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java +++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java @@ -11,15 +11,11 @@ import com.google.gson.Gson; import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail; import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum; -import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum; import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory; import com.yeshi.fanli.entity.bus.user.Extract; -import com.yeshi.fanli.entity.bus.user.ExtractWeiXinRecord; import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.util.Constant; -import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.TimeUtil; -import com.yeshi.fanli.util.account.UserUtil; import com.yeshi.fanli.vo.msg.ClientTextStyleVO; import com.yeshi.fanli.vo.msg.CommonMsgItemVO; import com.yeshi.fanli.vo.msg.CommonMsgItemVOFactory; @@ -48,7 +44,7 @@ List<ClientTextStyleVO> contentList = new ArrayList<>(); contentList.add(new ClientTextStyleVO("楼" + extract.getMoney().setScale(2), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT)); if (!StringUtil.isNullOrEmpty(alipayNo)) { - contentList.add(new ClientTextStyleVO(String.format("&鏀粯瀹濊鍗曞彿锛� %s", "*" + alipayNo.substring(alipayNo.length() - 10)), ClientTextStyleVO.COLOR_CONTENT)); + contentList.add(new ClientTextStyleVO(String.format("&鏀粯瀹濊鍗曞彿: %s", "*" + alipayNo.substring(alipayNo.length() - 10)), ClientTextStyleVO.COLOR_CONTENT)); } listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", ClientTextStyleVO.COLOR_TITLE),contentList)); @@ -201,7 +197,7 @@ sourceName += "-杩斿埄璁㈠崟"; typeEnum = MsgTypeMoneyTypeEnum.fanli; } else if (Constant.TYPE_SHAER == type) { - fanliName = "鍒嗕韩濂栭噾锛�"; + fanliName = "鍒嗕韩濂栭噾:"; sourceName += "-鍒嗕韩璁㈠崟"; typeEnum = MsgTypeMoneyTypeEnum.share; } @@ -217,8 +213,8 @@ new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true)); List<ClientTextStyleVO> contentList = new ArrayList<>(); - contentList.add(new ClientTextStyleVO("涓嬪崟鏃堕棿锛�" + TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT)); - contentList.add(new ClientTextStyleVO("-鍟嗗搧鏁伴噺锛氬叡", ClientTextStyleVO.COLOR_CONTENT)); + contentList.add(new ClientTextStyleVO("涓嬪崟鏃堕棿:" + TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT)); + contentList.add(new ClientTextStyleVO("-鍟嗗搧鏁伴噺:鍏�", ClientTextStyleVO.COLOR_CONTENT)); contentList.add(new ClientTextStyleVO(goodsCount + "", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT)); contentList.add(new ClientTextStyleVO("浠跺晢鍝�", ClientTextStyleVO.COLOR_CONTENT)); listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("璁㈠崟鐩稿叧", ClientTextStyleVO.COLOR_TITLE), contentList)); @@ -285,8 +281,8 @@ new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true)); List<ClientTextStyleVO> contentList = new ArrayList<>(); - contentList.add(new ClientTextStyleVO("涓嬪崟鏃堕棿锛�" + TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT)); - contentList.add(new ClientTextStyleVO("-鍟嗗搧鏁伴噺锛氬叡", ClientTextStyleVO.COLOR_CONTENT)); + contentList.add(new ClientTextStyleVO("涓嬪崟鏃堕棿:" + TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT)); + contentList.add(new ClientTextStyleVO("-鍟嗗搧鏁伴噺:鍏�", ClientTextStyleVO.COLOR_CONTENT)); contentList.add(new ClientTextStyleVO(goodsCount + "", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT)); contentList.add(new ClientTextStyleVO("浠跺晢鍝�", ClientTextStyleVO.COLOR_CONTENT)); listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("璁㈠崟鐩稿叧", ClientTextStyleVO.COLOR_TITLE), contentList)); -- Gitblit v1.8.0