From d2ee731b6a64fa002bceddebf0cc59c78b6c17ce Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 10:12:31 +0800
Subject: [PATCH] 邀请成功消息提醒
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 285 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 180 insertions(+), 105 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
index 2446abf..00dcf6c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -11,16 +11,19 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
+import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
import com.yeshi.fanli.entity.common.JumpDetailV2;
+import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.order.CommonOrder;
-import com.yeshi.fanli.entity.order.HongBaoOrder;
import com.yeshi.fanli.entity.system.SystemCoupon;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.exception.user.UserSystemCouponException;
@@ -28,12 +31,19 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemCouponService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
+import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
+import com.yeshi.fanli.service.inter.order.OrderService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.order.CommonOrderVO;
import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;
@@ -67,11 +77,27 @@
@Resource
private HongBaoOrderService hongBaoOrderService;
+
+ @Resource
+ private OrderHongBaoMapService orderHongBaoMapService;
+
+ @Resource
+ private OrderService orderService;
+
+ @Resource
+ private UserMoneyDetailService userMoneyDetailService;
+
+ @Resource
+ private UserInfoService userInfoService;
+
+ @Resource
+ private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
+
// 鍒稿け鏁堝浘鐗�
- public final static String PIC_INVALID= "http://192.168.1.200/icon/mian_invalid.png";
-
-
+ public final static String PIC_INVALID = "http://192.168.1.200/icon/mian_invalid.png";
@Override
public int insertSelective(UserSystemCoupon record) {
@@ -99,6 +125,11 @@
}
@Override
+ public List<UserSystemCoupon> getUserCouponBySource(Long uid, String source) {
+ return userSystemCouponMapper.getUserCouponBySource(uid, source);
+ }
+
+ @Override
public long countUserCouponList(Long uid) {
return userSystemCouponMapper.countUserCouponList(uid);
}
@@ -117,7 +148,7 @@
}
// 鏁版嵁缁勭粐
- listDataFactory(listVO);
+ listDataFactory(listVO, uid);
return listVO;
}
@@ -127,7 +158,7 @@
*
* @param listVO
*/
- public void listDataFactory(List<UserSystemCouponVO> listVO) {
+ public void listDataFactory(List<UserSystemCouponVO> listVO, Long uid) throws Exception{
for (UserSystemCouponVO userCouponVO : listVO) {
@@ -147,30 +178,38 @@
userCouponVO.setCouponPicture(systemCoupon.getPicture());
userCouponVO.setCouponEffect(systemCoupon.getEffect());
userCouponVO.setCouponRule(systemCoupon.getRule());
-
- // 浣跨敤涓姸鎬� 鏀瑰彉涓哄凡浣跨敤
- Integer state = userCouponVO.getState();
- if (UserSystemCoupon.STATE_IN_USE == state) {
- state = UserSystemCoupon.STATE_END_USE;
- userCouponVO.setState(state);
- }
-
-
- // 鎸夐挳璺宠浆
+ // 浣跨敤鐘舵��
+ Integer state = userCouponVO.getState();
+
+ // 鎸夐挳璺宠浆
Map<String, Object> jumpBtn = null;
+
Integer stateActivated = userCouponVO.getStateActivated();
+
if (stateActivated == null || stateActivated == 0) {
// 鏄剧ず瑙勫垯
userCouponVO.setCouponRule(systemCoupon.getRemark());
- systemCoupon.setEffect("寰呮縺娲�");
-
- // 鐘舵�佹湭婵�娲�
- userCouponVO.setState(0);
+ userCouponVO.setCouponEffect("寰呮縺娲�");
+
+ // 鐘舵�佹湭婵�娲� -涓旀湭琚娇鐢�
+ if (UserSystemCoupon.STATE_CAN_USE == state) {
+ userCouponVO.setState(0);
+ }
jumpBtn = new HashMap<String, Object>();
Map<String, Object> jumpLink = new HashMap<String, Object>();
- jumpLink.put("url", configService.get("invite_activation_url"));
+
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra != null && userInfoExtra.getInviteCode() != null
+ && userInfoExtra.getInviteCode().trim().length() > 0) {
+
+ jumpLink.put("url", configService.get("invite_activation_success_url" +"?alert=ture"));
+ } else {
+
+ jumpLink.put("url", configService.get("invite_activation_url"));
+ }
+
jumpBtn.put("params", jumpLink);
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));
@@ -184,25 +223,35 @@
CouponTypeEnum type = systemCoupon.getType();
if (CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type) {
// 鍏嶅崟鍒搞�� 绂忓埄鍏嶅崟鍒�
- jumpLink.put("url", configService.get("invite_activation_url"));
+
+ // 鍏嶅崟鍟嗗搧鍒楄〃
+ jumpLink.put("url", configService.get("free_goods_list"));
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("web"));
} else if (CouponTypeEnum.rebatePercentCoupon == type) {
- // 杩斿埄濂栧姳鍒�
- jumpLink.put("url", configService.get("invite_activation_url"));
-
+ // 杩斿埄濂栧姳鍒�- 璺宠浆鑷宠鍗曞埌璐︾晫闈�
+ jumpLink.put("state", 2);
+
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
- jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));
+ // 璺宠浆璁㈠崟鍒楄〃
+ jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("orderList"));
}
- } else if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) {
- userCouponVO.setCouponPicture(PIC_INVALID);
+
+ } else if (UserSystemCoupon.STATE_IN_USE == state) {
+ // 浣跨敤涓�
+ userCouponVO.setInUseExplain(configService.get("free_coupon_using-help"));
}
-
}
+
+ // 鍒稿け鏁堝浘鐗囨浛鎹�
+ if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) {
+ userCouponVO.setCouponPicture(PIC_INVALID);
+ }
+
userCouponVO.setJumpBtn(jumpBtn);
String couponTerm = "鏈夋晥鏈燂細";
@@ -217,7 +266,8 @@
if (UserSystemCoupon.STATE_CAN_USE == state) {
int differentDays = 0;
if (endTime != null && startTime != null) {
- differentDays = DateUtil.differentDaysByMillisecond(new Date(), endTime) + 1;
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ differentDays = DateUtil.daysBetween(sdf.format(new Date()), sdf.format(endTime)) + 1;
if (differentDays < 0) {
differentDays = 0;
}
@@ -241,9 +291,8 @@
listCouponId.add(systemCoupon.getId());
}
- List<UserSystemCouponVO> listVO = userSystemCouponMapper.getEnableListByCouponId(uid, activated,
- listCouponId);
-
+ List<UserSystemCouponVO> listVO = userSystemCouponMapper.getEnableListByCouponId(uid, activated, listCouponId);
+
if (listVO == null || listVO.size() == 0) {
return null;
}
@@ -268,7 +317,7 @@
userCouponVO.setCouponName(systemCoupon.getName());
userCouponVO.setCouponEffect(systemCoupon.getEffect());
userCouponVO.setCouponRule(systemCoupon.getRule());
-
+
Integer stateActivated = userCouponVO.getStateActivated();
if (stateActivated == null || stateActivated == 0) {
userCouponVO.setCouponPicture(PIC_INVALID); // 鏈縺娲�
@@ -284,8 +333,9 @@
if (endTime != null && startTime != null) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
couponTerm = couponTerm + sdf.format(startTime) + "-" + sdf.format(endTime);
-
- differentDays = DateUtil.differentDaysByMillisecond(new Date(), endTime) + 1;
+
+ SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+ differentDays = DateUtil.daysBetween(sdf2.format(new Date()), sdf2.format(endTime)) + 1;
if (differentDays < 0) {
differentDays = 0;
}
@@ -374,14 +424,19 @@
if (!uid.equals(couponUid)) {
throw new UserSystemCouponException(1, "浼犻�掑弬鏁颁笉鍖归厤");
}
-
+
SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
-
+
SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
if (baseCoupon == null || baseCoupon.getId() == null) {
throw new UserSystemCouponException(1, "鏈壘鍒板埜鍩烘湰淇℃伅");
}
+ if (baseCoupon.getType() != CouponTypeEnum.freeCoupon
+ && baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤");
+ }
+
Date date = new Date();
// 鏇存柊鍒镐娇鐢�
userSystemCoupon.setState(UserSystemCoupon.STATE_IN_USE); // 姝ｅ湪鍖归厤
@@ -401,6 +456,7 @@
userSystemCouponRecordService.insertSelective(couponRecord);
}
+ @Transactional
@Override
public void useOrderCoupon(Long uid, Long id, String orderNo) throws UserSystemCouponException, Exception {
@@ -423,6 +479,11 @@
}
}
+ if (systemCoupon.getType() != CouponTypeEnum.rebatePercentCoupon) {
+ throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤");
+ }
+
+
if (orderNo == null || orderNo.trim().length() == 0) {
throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪");
}
@@ -433,7 +494,6 @@
throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
}
- Long commonOrderId = orderVO.getId();
BigDecimal hongBao = orderVO.getHongBao();
// 绾㈠寘鐘舵��
@@ -443,6 +503,10 @@
// 鏉′欢: A:蹇呴』鏄繑鍒╄鍗� 銆丅:蹇呴』宸茬粡澶勪簬宸插埌璐︾姸鎬�
if (HongBaoV2.TYPE_ZIGOU == hongBaoType && HongBaoV2.STATE_YILINGQU == hongBaoState || hongBao != null) {
+
+ Order order = orderService.findOrderByOrderIdAndType(orderNo, Order.ORDER_TYPE_TAOBAO);
+ if (order == null)
+ return;
/* 濂栭噾璁＄畻 浠ュ強鐩稿叧绾㈠寘淇℃伅澶勭悊 */
@@ -460,15 +524,22 @@
hongBaoV2.setCreateTime(new Date());
hongBaoV2.setUpdateTime(new Date());
hongBaoV2.setUserInfo(new UserInfo(uid));
+ hongBaoV2.setPreGetTime(new Date());
+ hongBaoV2.setGetTime(new Date());
hongBaoV2Service.insertSelective(hongBaoV2);
- // 2銆佽鍗曞叧鑱旂孩鍖呰〃
- HongBaoOrder hongBaoOrder = new HongBaoOrder();
- hongBaoOrder.setHongBaoV2(hongBaoV2);
- hongBaoOrder.setCommonOrder(new CommonOrder(commonOrderId));
- hongBaoOrderService.insertSelective(hongBaoOrder);
+ // 2.鎻掑叆鍏宠仈
+ orderHongBaoMapService.addOrderHongBaoMap(hongBaoV2, order);
- // TODO 绾㈠寘鐩稿叧淇℃伅鎻掑叆浠ュ強閫氱煡
+ // 3.鎻掑叆璧勯噾鏄庣粏,鐢ㄦ埛浣欓
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(orderNo, money,
+ new UserInfo(uid));
+ userMoneyDetailService.addUserMoneyDetail(userMoneyDetail);
+ userInfoService.addMoney(new UserInfo(uid), money);
+
+ // 鎻掑叆璧勯噾閫氱煡
+ userMoneyMsgNotificationService.orderReward(uid, orderNo, money,
+ userInfoService.selectByPKey(uid).getMyHongBao());
/* 鐢ㄦ埛鍒镐俊鎭姸鎬佸強璁板綍澶勭悊 */
@@ -492,7 +563,6 @@
}
-
@Override
public UserSystemCouponRecordVO getRewardCouponRecord(String orderNo) throws UserSystemCouponException, Exception {
@@ -527,21 +597,26 @@
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝ｇ‘");
}
- List<CommonOrderVO> list = commonOrderService.getCouponHongbaoByOrderNo(userSystemCoupon.getUid(),
- HongBaoV2.STATE_YILINGQU, orderNo);
-
- if (list == null || list.size() == 0) {
+ Long uid = userSystemCoupon.getUid();
+
+ CommonOrderVO commonOrderVO= commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(),
+ orderNo, CommonOrder.STATE_JS);
+
+ if (commonOrderVO == null) {
throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
}
+
+ // 鑾峰彇濂栧姳閲戦
+ Map<String, BigDecimal> map = orderHongBaoMapService.getCouponHongbaoByOrderNo(orderNo, uid);
UserSystemCouponRecordVO userRecordVO = new UserSystemCouponRecordVO();
userRecordVO.setCouponMoneyState("宸插埌璐�");
- userRecordVO.setCommonOrder(list.get(0));
- userRecordVO.setCouponName("濂栧姳閲�: 楼" + list.get(0).getCouponMoney().setScale(2, BigDecimal.ROUND_DOWN));
+ userRecordVO.setCommonOrder(commonOrderVO);
+ userRecordVO.setCouponName("濂栧姳閲�: 楼" + map.get("couponMoney").setScale(2, BigDecimal.ROUND_DOWN));
// 姣斾緥
BigDecimal percent = baseCoupon.getPercent();
- BigDecimal hongBao = list.get(0).getHongBao().setScale(2, BigDecimal.ROUND_DOWN);
+ BigDecimal hongBao = map.get("totalMoney").setScale(2, BigDecimal.ROUND_DOWN);
userRecordVO.setCouponEffect("杩斿埄楼" + hongBao + "宸茶繑" + percent + "%");
// 璺宠浆绂忓埄涓績
@@ -563,7 +638,6 @@
return userRecordVO;
}
-
@Override
public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo) throws UserSystemCouponException, Exception {
@@ -597,20 +671,19 @@
if (orderVO == null) {
throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
}
-
+
UserSystemCouponRecordVO userRecordVO = new UserSystemCouponRecordVO();
userRecordVO.setCommonOrder(orderVO);
-
+
ClientTextStyleVO fanMoney = new ClientTextStyleVO();
- fanMoney.setContent("杩斿埄: 楼" + orderVO.getHongBao().setScale(2, BigDecimal.ROUND_DOWN));
+ fanMoney.setContent("杩斿埄: 楼" + orderVO.getHongBao().setScale(2, BigDecimal.ROUND_DOWN));
fanMoney.setColor("#000000"); // 榛樿榛戣壊
userRecordVO.setFanMoney(fanMoney);
-
+
ClientTextStyleVO payMoney = new ClientTextStyleVO();
- payMoney.setContent("瀹炰粯娆�:楼"+ orderVO.getPayment().setScale(2, BigDecimal.ROUND_DOWN));
+ payMoney.setContent("瀹炰粯娆�:楼" + orderVO.getPayment().setScale(2, BigDecimal.ROUND_DOWN));
payMoney.setColor("#000000"); // 榛樿榛戣壊
-
-
+
String progressMsg = "";
String progressColor = "";
// 璺宠浆濂栧姳鍒歌鍒�
@@ -618,62 +691,62 @@
// 杩涘害锛� 1 鐏拌壊 2 绾㈣壊 3 缁胯壊
String progressState1 = "3";
- String progressState2 = "1";
+ String progressState2 = "1";
String progressState3 = "1";
String progressState4 = "1";
-
+
String goodsState = "鍟嗗搧鏀惰揣";
// 鏂囧瓧鐘舵��
String text2Color = "#999999";
String text3Color = "#999999";
String text4Color = "#999999";
-
+
// 搴曢儴澶囨敞
String rewardCouponRemark = "";
// 鐘舵�佽烦杞�
JumpDetailV2 jumpDetail = null;
- // 杩涘害鐘舵�� 1绛夊緟 2 澶辫触 3鎴愬姛
+ // 杩涘害鐘舵�� 1绛夊緟 2 澶辫触 3鎴愬姛
int progressState = 1;
-
+
Integer stateRecord = record.getState();
if (UserSystemCouponRecord.STATE_FAIL_RULE == stateRecord) {
// 瑙勫垯涓嶅尮閰�
progressState = 2;
-
+
progressColor = "#E41212";
- progressMsg = "鎶辨瓑涓嶇鍚堝厤鍗曡鍒欙紝鍏嶅崟澶辫触" ;
-
- progressState1 = "2"; //涓嶅尮閰�
-
+ progressMsg = "鎶辨瓑涓嶇鍚堝厤鍗曡鍒欙紝鍏嶅崟澶辫触";
+
+ progressState1 = "2"; // 涓嶅尮閰�
+
payMoney.setColor("#E41212");
-
+
userRecordVO.setCouponMoneyState("宸查��鍥�");
userRecordVO.setCouponName(baseCoupon.getName());
-
+
jumpDetail = jumpDetailV2Service.getByTypeCache("welfareCore");
-
+
rewardCouponRemark = configService.get("free_coupon_back_remark");
-
+
} else if (UserSystemCouponRecord.STATE_FAIL_DRAWBACK == stateRecord) {
// 閫�娆�
progressState = 2;
-
+
progressColor = "#E41212";
progressMsg = "鍟嗗搧宸查��娆撅紝鍏嶅崟澶辫触";
-
+
text2Color = "#E41212";
goodsState = "鍟嗗搧宸查��娆�";
-
+
progressState2 = "2";
-
+
userRecordVO.setCouponMoneyState("宸查��鍥�");
userRecordVO.setCouponName(baseCoupon.getName());
-
+
jumpDetail = jumpDetailV2Service.getByTypeCache("welfareCore");
-
+
rewardCouponRemark = configService.get("free_coupon_back_remark");
-
- } else if (UserSystemCouponRecord.STATE_FREE_ON == stateRecord) {
+
+ } else if (UserSystemCouponRecord.STATE_FREE_ON == stateRecord) {
// 鍏嶅崟涓�
if (CommonOrder.STATE_JS == orderVO.getState()) {
progressColor = "#ECA01B";
@@ -684,65 +757,65 @@
progressColor = "#ECA01B";
progressMsg = "鍏嶅崟鍙戣捣锛岀瓑寰呮敹璐�";
}
-
+
rewardCouponRemark = configService.get("free_coupon_remark");
-
- } else if (UserSystemCouponRecord.STATE_SUCCESS == stateRecord) {
+
+ } else if (UserSystemCouponRecord.STATE_SUCCESS == stateRecord) {
// 鍏嶅崟鎴愬姛
progressState = 3;
-
+
progressColor = "#3EBF13";
progressMsg = "鍏嶅崟鎴愬姛锛屽厤鍗曢噾宸茶浆鍏ヤ綑棰�";
-
+
progressState2 = "3";
progressState3 = "3";
progressState4 = "3";
-
+
text2Color = "#000000";
text3Color = "#000000";
text4Color = "#000000";
-
+
userRecordVO.setCouponMoneyState("宸插埌璐�");
userRecordVO.setCouponName("杩斿埄: 楼" + orderVO.getHongBao().setScale(2, BigDecimal.ROUND_DOWN));
-
+
jumpDetail = jumpDetailV2Service.getByTypeCache("capitalDetails");
-
+
rewardCouponRemark = configService.get("free_coupon_remark");
}
userRecordVO.setProgressState(progressState);
userRecordVO.setPayMoney(payMoney);
-
+
// 鏄剧ず鎻愮ず杈冨ぇ瀛�
ClientTextStyleVO progressMsgStyle = new ClientTextStyleVO();
- progressMsgStyle.setContent(progressMsg);
+ progressMsgStyle.setContent(progressMsg);
progressMsgStyle.setColor(progressColor);
userRecordVO.setProgressMsg(progressMsgStyle);
-
- /* --- 杩涘害鐐� ---- */
+
+ /* --- 杩涘害鐐� ---- */
Map<String, Object> map1 = new HashMap<String, Object>();
map1.put("state", progressState1);
-
+
Map<String, Object> map2 = new HashMap<String, Object>();
map2.put("state", progressState2);
ClientTextStyleVO style2 = new ClientTextStyleVO();
- style2.setContent(goodsState);
+ style2.setContent(goodsState);
style2.setColor(text2Color);
map2.put("text", style2);
-
+
Map<String, Object> map3 = new HashMap<String, Object>();
map3.put("state", progressState3);
ClientTextStyleVO style3 = new ClientTextStyleVO();
- style3.setContent("杩斿埄鍒拌处");
+ style3.setContent("杩斿埄鍒拌处");
style3.setColor(text3Color);
map3.put("text", style3);
-
+
Map<String, Object> map4 = new HashMap<String, Object>();
map4.put("state", progressState4);
ClientTextStyleVO style4 = new ClientTextStyleVO();
- style4.setContent("鍏嶅崟鎴愬姛");
+ style4.setContent("鍏嶅崟鎴愬姛");
style4.setColor(text4Color);
map4.put("text", style4);
-
+
// 鍦嗙偣棰滆壊
List<Object> progressList = new ArrayList<Object>();
progressList.add(map1);
@@ -750,7 +823,7 @@
progressList.add(map3);
progressList.add(map4);
userRecordVO.setProgressList(progressList);
-
+
if (jumpDetail != null) {
Map<String, Object> jumpState = new HashMap<String, Object>();
jumpState.put("jumpDetail", jumpDetail);
@@ -762,8 +835,10 @@
if (rewardCouponRemark != null && rewardCouponRemark.trim().length() > 0) {
userRecordVO.setRemark(JSONObject.fromObject(rewardCouponRemark));
}
-
+
return userRecordVO;
}
+
+
}
--
Gitblit v1.8.0