From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 633 +++++++++++++++++++++++++++++---------------------------
1 files changed, 329 insertions(+), 304 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 8520dd0..5e9a369 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -17,16 +17,22 @@
import org.yeshi.utils.entity.DateInfo;
import org.yeshi.utils.taobao.TbImgUtil;
+import com.aliyun.openservices.ons.api.Message;
+import com.aliyun.openservices.ons.api.Producer;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderTradeIdMapMapper;
+import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderGoodsMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
+import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;
+import com.yeshi.fanli.dto.mq.order.body.OrderConfirmMQMsg;
import com.yeshi.fanli.dto.order.CommonOrderAddResultDTO;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.jd.JDOrder;
@@ -38,9 +44,11 @@
import com.yeshi.fanli.entity.order.HongBaoOrder;
import com.yeshi.fanli.entity.order.InviteOrderSubsidy;
import com.yeshi.fanli.entity.pdd.PDDOrder;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
+import com.yeshi.fanli.entity.taobao.TaoBaoOrderGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
@@ -58,7 +66,9 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
+import com.yeshi.fanli.service.manger.user.UserLevelManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
@@ -70,12 +80,15 @@
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.jd.JDUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
-import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
+import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
+import com.yeshi.fanli.util.rocketmq.MQTopicName;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.util.user.UserLevelUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.order.CommonOrderGoodsVO;
import com.yeshi.fanli.vo.order.CommonOrderVO;
+import com.yeshi.fanli.vo.order.HongBaoCountVO;
import com.yeshi.fanli.vo.order.OrderCountVO;
import com.yeshi.fanli.vo.order.WeiQuanInfo;
@@ -128,6 +141,18 @@
@Resource
private UserInfoService userInfoService;
+
+ @Resource
+ private UserInviteService userInviteService;
+
+ @Resource
+ private UserLevelManager userLevelManager;
+
+ @Resource
+ private TaoBaoOrderGoodsMapper taoBaoOrderGoodsMapper;
+
+ @Resource(name = "producer")
+ private Producer orderProducer;
// 濂栧姳璁㈠崟鍥剧墖
public final static String PIC_REWARD = "http://img.flqapp.com/resource/order/order_state_reward.png";
@@ -193,6 +218,7 @@
List<Integer> listSource) throws CommonOrderException, Exception {
int pageSize = Constant.PAGE_SIZE;
+
List<CommonOrderVO> listOrder = commonOrderMapper.listUserOrder((page - 1) * pageSize, pageSize, uid, state,
type, orderState, orderNo, startTime, endTime, dateType, listSource);
@@ -210,7 +236,11 @@
}
// 鏁版嵁鍔犲伐閲嶆柊缁勭粐
- orderVOFactory(acceptData, listOrder, listGoods, uid);
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ orderVOFactory21(acceptData, listOrder, listGoods, uid);
+ } else {
+ orderVOFactory(acceptData, listOrder, listGoods, uid);
+ }
return listOrder;
}
@@ -290,13 +320,14 @@
Date august = TimeUtil.parse("2019-08-01");
// 褰撳墠鐢ㄦ埛鏄惁VIP
- boolean vip = userVIPInfoService.isVIP(uid);
+ boolean vip = userInviteService.verifyVIP(uid);
+
// 鏄惁瀛樺湪濂栧姳鍒�
boolean hasRewardCoupon = userSystemCouponService.getValidRebateCoupon(uid);
-
for (CommonOrderVO order : listOrder) {
String orderNo = order.getOrderNo();
Integer sourceType = order.getSourceType();
+ Integer hongBaoType = order.getHongBaoType();
// 鍟嗗搧淇℃伅缁勫悎
for (CommonOrderVO commonOrder : listGoods) {
@@ -327,7 +358,6 @@
}
commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
- Integer hongBaoType = order.getHongBaoType();
// 閭�璇疯鍗曚俊鎭繚鎶�
if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
|| HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
@@ -356,10 +386,8 @@
}
Date thirdCreateTime = order.getThirdCreateTime();
- if (thirdCreateTime != null) {
- order.setDownTime("涓嬪崟鏃堕棿锛�" + format.format(thirdCreateTime));
- order.setObtainTime(thirdCreateTime.getTime());
- }
+ order.setDownTime("涓嬪崟鏃堕棿锛�" + format.format(thirdCreateTime));
+ order.setObtainTime(thirdCreateTime.getTime());
Date settleTime = order.getSettleTime();
if (settleTime != null) {
@@ -446,7 +474,6 @@
// 璁㈠崟鏍囪瘑
List<String> signList = new ArrayList<String>();
/* 璁㈠崟杩斿埄绫诲瀷 杞崲 */
- Integer hongBaoType = order.getHongBaoType();
if (HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) {
// 鑷喘
hongbaoInfo = "杩斿埄";
@@ -564,22 +591,22 @@
if (HongBaoV2.TYPE_ZIGOU == hongBaoType) {
// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
if (sourceType == null) {
- couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, vip, acceptData);
+ couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, vip, acceptData,
+ hongBao);
} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, vip,
- acceptData);
+ couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, vip, acceptData,
+ hongBao);
} else if (sourceType == Constant.SOURCE_TYPE_JD) {
- couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, vip,
- acceptData);
+ couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, vip, acceptData,
+ hongBao);
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, uid, vip,
- acceptData);
+ acceptData, hongBao);
}
}
- // 鍒嗕韩銆侀個璇� 闅愯棌璁㈠崟鍙�
- if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_YAOQING == hongBaoType
- || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType
+ // 閭�璇� 闅愯棌璁㈠崟鍙�
+ if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType
|| HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo()));
}
@@ -596,7 +623,8 @@
* @param signList
*/
private void couponFactory(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState, Integer hongBaoType,
- List<UserSystemCouponRecord> list, Long uid, boolean vip, AcceptData acceptData) throws Exception {
+ List<UserSystemCouponRecord> list, Long uid, boolean vip, AcceptData acceptData, BigDecimal hongBao)
+ throws Exception {
// 鏄惁鍏嶅崟鍟嗗搧
boolean freeOrder = false;
@@ -692,6 +720,11 @@
jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
rewardMap.put("jump", jump);
order.setRewardDetail(rewardMap);
+ }
+
+ // 浣跨敤濂栧姳鍒� 閲戦棰濋檺鍒�
+ if (hongBao.compareTo(Constant.REWARD_COUPON_LIMIT_MONEY) > 0) {
+ return;
}
// 鏄惁鍙娇鐢ㄥ鍔卞埜
@@ -848,7 +881,8 @@
return commonOrderMapper.countUserOrderToApp(uid, type, startTime, endTime, day, source, state, stateOrder);
}
- private BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid) {
+ @Override
+ public BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid) {
BigDecimal weiQuanMoney = new BigDecimal(0);
if (listWQ != null && listWQ.size() > 0) {
for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) {
@@ -902,11 +936,26 @@
wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO;
for (TaoBaoOrder taoBaoOrder : taoBaoOrders) {
- CommonOrder newCommonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);
+ CommonOrder newCommonOrder = CommonOrderFactory.create(taoBaoOrder);
CommonOrderGoods cog = new CommonOrderGoods();
- cog.setGoodsId(taoBaoOrder.getAuctionId() + "");
- cog.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
- newCommonOrder.setCommonOrderGoods(cog);
+
+ if ("楗夸簡涔�".equalsIgnoreCase(taoBaoOrder.getOrderType())) {
+ cog.setGoodsId(taoBaoOrder.getTradeId() + "");
+ cog.setGoodsType(Constant.SOURCE_TYPE_ELME);
+ TaoBaoOrderGoods goods = taoBaoOrderGoodsMapper.selectByTradeId(taoBaoOrder.getTradeId());
+ if (goods == null) {
+ cog.setPicture("http://img.flqapp.com/resource/goods/elme_picture_demo.png");
+ cog.setTitle(taoBaoOrder.getTitle());
+ } else {
+ cog.setPicture(goods.getImg());
+ cog.setTitle(goods.getTitle());
+ }
+ newCommonOrder.setCommonOrderGoods(cog);
+ } else {
+ cog.setGoodsId(taoBaoOrder.getAuctionId() + "");
+ cog.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
+ newCommonOrder.setCommonOrderGoods(cog);
+ }
newCommonOrder.setStateWholeOrder(wholeOrderState);
// 璁㈠崟鍟嗗搧鎻掑叆
List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper.listByGoodsIdAndGoodsType(cog.getGoodsId(),
@@ -914,22 +963,25 @@
if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
{
TaoBaoGoodsBrief taoBaoGoods = null;
- try {
- taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());
- LogManager.getLogger(LogType.taobaoGoods).info(String.format("璁㈠崟鍟嗗搧鍒嗙被:%s#%s#%s",
- taoBaoGoods.getAuctionId(), taoBaoGoods.getRootCategoryName(), taoBaoGoods.getLeafName()));
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- LogHelper.errorDetailInfo(e, "AUCTIONID:" + taoBaoOrder.getAuctionId(), "");
+ if (cog.getGoodsType() != Constant.SOURCE_TYPE_ELME) {
try {
- taoBaoGoods = TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());
- // 璁板綍鍟嗗搧鍒嗙被
+ taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());
+ LogManager.getLogger(LogType.taobaoGoods)
+ .info(String.format("璁㈠崟鍟嗗搧鍒嗙被:%s#%s#%s", taoBaoGoods.getAuctionId(),
+ taoBaoGoods.getRootCategoryName(), taoBaoGoods.getLeafName()));
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ LogHelper.errorDetailInfo(e, "AUCTIONID:" + taoBaoOrder.getAuctionId(), "");
+ try {
+ taoBaoGoods = TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());
+ // 璁板綍鍟嗗搧鍒嗙被
- } catch (Exception e1) {
- CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(
- taoBaoOrder.getAuctionId(), Constant.SOURCE_TYPE_TAOBAO);
- if (commonGoods != null)
- taoBaoGoods = TaoBaoUtil.convert(commonGoods);
+ } catch (Exception e1) {
+ CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(
+ taoBaoOrder.getAuctionId(), Constant.SOURCE_TYPE_TAOBAO);
+ if (commonGoods != null)
+ taoBaoGoods = TaoBaoUtil.convert(commonGoods);
+ }
}
}
if (taoBaoGoods != null) {
@@ -942,6 +994,7 @@
newCommonOrder.setUserInfo(new UserInfo(uid));
commonOrderList.add(addCommonOrder(newCommonOrder));
}
+ addConfirmMQMsg(commonOrderList);
return commonOrderList;
}
@@ -992,7 +1045,53 @@
newCommonOrder.setUserInfo(new UserInfo(uid));
commonOrderList.add(addCommonOrder(newCommonOrder));
}
+ addConfirmMQMsg(commonOrderList);
return commonOrderList;
+ }
+
+ private void addConfirmMQMsg(List<CommonOrderAddResultDTO> resultList) {
+
+ // 璁㈠崟鏄惁鏂板鎴栬�呮洿鏂拌繃
+ boolean isAddOrUpdate = false;
+ for (CommonOrderAddResultDTO dto : resultList)
+ if (dto.getType() == CommonOrderAddResultDTO.TYPE_ADD
+ || dto.getType() == CommonOrderAddResultDTO.TYPE_UPDATE) {
+ isAddOrUpdate = true;
+ break;
+ }
+ boolean hasSettleOrder = false;
+ // 鏌ヨ鏄惁鏈夌粨绠楃殑璁㈠崟
+ if (isAddOrUpdate) {
+ for (CommonOrderAddResultDTO dto : resultList) {
+ if (dto.getCommonOrder().getSettleTime() != null && dto.getCommonOrder().getSettlement() != null) {
+ hasSettleOrder = true;
+ break;
+ }
+ }
+ }
+ // 鏈夌粨绠楃殑璁㈠崟
+ if (hasSettleOrder) {
+ if (!Constant.IS_TEST) {
+ // 缁熻缁撶畻閲戦
+ BigDecimal settlement = new BigDecimal("0");
+ CommonOrder firstOrder = null;
+ for (CommonOrderAddResultDTO dto : resultList)
+ if (dto.getCommonOrder().getSettlement() != null) {
+ settlement = settlement.add(dto.getCommonOrder().getSettlement());
+ if (firstOrder == null)
+ firstOrder = dto.getCommonOrder();
+ }
+ if (firstOrder != null) {
+ Date placeDate = firstOrder.getThirdCreateTime();
+ OrderConfirmMQMsg mqMsg = new OrderConfirmMQMsg(firstOrder.getOrderNo(), firstOrder.getSourceType(),
+ settlement, firstOrder.getUserInfo().getId(), placeDate, new Date());
+ Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderConfirm,
+ mqMsg);
+ orderProducer.send(msg);
+ }
+ }
+ }
+
}
@Transactional(rollbackFor = Exception.class)
@@ -1057,6 +1156,7 @@
newCommonOrder.setUserInfo(new UserInfo(uid));
commonOrderList.add(addCommonOrder(newCommonOrder));
}
+ addConfirmMQMsg(commonOrderList);
return commonOrderList;
}
@@ -1105,10 +1205,11 @@
if (oldCommonOrder == null)// 鏂板
{
commonOrder.setCreateTime(new Date());
+ UserLevelEnum userLevel = userLevelManager.getUserLevel(commonOrder.getUserInfo().getId(),
+ commonOrder.getThirdCreateTime());
// 鏌ヨ鏄惁涓簐ip
- boolean isVIP = userVIPInfoService.isVIP(commonOrder.getUserInfo().getId());
- if (isVIP)
- commonOrder.setUrank(100);// VIP璁㈠崟
+ if (userLevel != null)
+ commonOrder.setUrank(userLevel.getOrderRank());// VIP璁㈠崟
else {
UserInfo user = userInfoService.selectAvailableByPrimaryKey(commonOrder.getUserInfo().getId());
if (user != null)
@@ -1240,7 +1341,7 @@
@Override
public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
Integer type, Integer orderState, String startTime, String endTime, Integer source, List<Long> listShopId,
- List<Long> listGoodsId, Date minTime, BigDecimal money,BigDecimal payment) throws CommonOrderException {
+ List<Long> listGoodsId, Date minTime, BigDecimal money, BigDecimal payment) throws CommonOrderException {
List<CommonOrderVO> list = null;
@@ -1249,7 +1350,7 @@
startTime, endTime, source, payment);
} else {
list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState, startTime, endTime,
- source, listShopId, listGoodsId, minTime, money,payment);
+ source, listShopId, listGoodsId, minTime, money, payment);
}
if (list == null) {
@@ -1436,7 +1537,7 @@
@Override
public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
String startTime, String endTime, Integer source, List<Long> listShopId, List<Long> listGoodsId,
- Date minTime, BigDecimal money,BigDecimal payment) throws CommonOrderException {
+ Date minTime, BigDecimal money, BigDecimal payment) throws CommonOrderException {
if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗�
return commonOrderMapper.countQueryWithNoChild(keyType, key, state, type, orderState, startTime, endTime,
source, payment);
@@ -1673,7 +1774,13 @@
}
@Override
- public List<CommonOrderVO> searchOrderByUid(int page, int size, Long uid, List<ESOrder> list) throws Exception {
+ public List<CommonOrder> getMinSettleTimeAndUid() {
+ return commonOrderMapper.getMinSettleTimeAndUid();
+ }
+
+ @Override
+ public List<CommonOrderVO> searchOrderByUid(AcceptData acceptData, int page, int size, Long uid, List<ESOrder> list)
+ throws Exception {
List<CommonOrderVO> listVO = commonOrderMapper.searchOrderByUid((page - 1) * size, size, uid, list);
// 璁㈠崟淇℃伅涓虹┖
@@ -1690,9 +1797,56 @@
}
// 鏁版嵁鍔犲伐閲嶆柊缁勭粐
- orderVOFactoryNew(listVO, listGoods, uid);
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ orderVOFactory21(acceptData, listVO, listGoods, uid);
+ } else {
+ orderVOFactory(acceptData, listVO, listGoods, uid);
+ }
return listVO;
+ }
+
+ @Override
+ public Date getThirdCreateTime(String orderId, int sourceType) {
+ List<CommonOrder> list = listBySourceTypeAndOrderId(sourceType, orderId);
+ if (list == null || list.size() == 0)
+ return null;
+ return list.get(0).getThirdCreateTime();
+ }
+
+ @Override
+ public List<CommonOrderVO> getOrderList(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
+ Integer orderState, String orderNo, String startTime, String endTime, Integer dateType,
+ List<Integer> listSource, boolean notBackSuVip) throws CommonOrderException, Exception {
+
+ int pageSize = Constant.PAGE_SIZE;
+
+ List<CommonOrderVO> listOrder = commonOrderMapper.getOrderList((page - 1) * pageSize, pageSize, uid, state,
+ type, orderState, orderNo, startTime, endTime, dateType, listSource,notBackSuVip);
+
+ // 璁㈠崟淇℃伅涓虹┖
+ if (listOrder == null || listOrder.size() == 0) {
+ listOrder = new ArrayList<CommonOrderVO>();
+ return listOrder;
+ }
+
+ // 鍟嗗搧淇℃伅
+ List<CommonOrderVO> listGoods = commonOrderMapper.listOrderGoodsInfo(listOrder);
+ if (listGoods == null || listGoods.size() == 0) {
+ return listOrder;
+ }
+
+ // 鏁版嵁鍔犲伐閲嶆柊缁勭粐
+ orderVOFactory21(acceptData, listOrder, listGoods, uid);
+
+ return listOrder;
+ }
+
+ @Override
+ public long countOrderList(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
+ String startTime, String endTime, Integer dateType, List<Integer> listSource, boolean notBackSuVip) throws CommonOrderException {
+ return commonOrderMapper.countOrderList(uid, state, type, orderState, orderNo, startTime, endTime, dateType,
+ listSource, notBackSuVip);
}
/**
@@ -1703,21 +1857,34 @@
* @param listGoods
* @param uid
*/
- private void orderVOFactoryNew(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid)
- throws Exception {
+ private void orderVOFactory21(AcceptData acceptData, List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods,
+ Long uid) throws Exception {
List<String> listTB = new ArrayList<String>();
List<String> listJD = new ArrayList<String>();
List<String> listPDD = new ArrayList<String>();
- for (CommonOrderVO commonOrderVO : listOrder) {
- Integer sourceType = commonOrderVO.getSourceType();
+ for (CommonOrderVO order : listOrder) {
+ if (order.getHongBaoType() == HongBaoV2.TYPE_YIJI || order.getHongBaoType() == HongBaoV2.TYPE_ERJI
+ || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_YIJI
+ || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI) {
+ Integer urank = order.getUrank();
+ if (urank != null) {
+ UserLevelEnum levelEnum = UserLevelUtil.getByOrderRank(urank);
+ if (levelEnum != null) {
+ levelEnum = UserLevelUtil.getShowLevel(levelEnum);
+ order.setOrderDesc("璁㈠崟鏉ユ簮锛�" + levelEnum.getName());
+ }
+ }
+ }
+
+ Integer sourceType = order.getSourceType();
if (sourceType == null) {
continue;
} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- listTB.add(commonOrderVO.getOrderNo());
+ listTB.add(order.getOrderNo());
} else if (sourceType == Constant.SOURCE_TYPE_JD) {
- listJD.add(commonOrderVO.getOrderNo());
+ listJD.add(order.getOrderNo());
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
- listPDD.add(commonOrderVO.getOrderNo());
+ listPDD.add(order.getOrderNo());
}
}
@@ -1736,47 +1903,13 @@
listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);
}
- // 闇�瑕佹煡璇㈡槸鍚︿负VIP鐨勭敤鎴稩D,鍙湁閭�璇疯鍗曟墠闇�瑕佹煡璇�
- List<Long> needSelectVIPUidList = new ArrayList<>();
-
- for (CommonOrderVO order : listOrder) {
- if (order.getHongBaoType() == HongBaoV2.TYPE_YIJI || order.getHongBaoType() == HongBaoV2.TYPE_ERJI
- || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI
- || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI)
- needSelectVIPUidList.add(Long.parseLong(order.getUserId()));
- }
- Map<Long, Boolean> vipUserMap = userVIPInfoService.listByUids(needSelectVIPUidList);
-
- // 璁剧疆鏄惁涓簐ip璁㈠崟
- for (CommonOrderVO order : listOrder) {
- if (order.getHongBaoType() == HongBaoV2.TYPE_YIJI || order.getHongBaoType() == HongBaoV2.TYPE_ERJI
- || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI
- || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI) {
- if (vipUserMap.get(Long.parseLong(order.getUserId())) != null
- && vipUserMap.get(Long.parseLong(order.getUserId())) == true)
- order.setVipOrder(true);
- else
- order.setVipOrder(false);
- } else
- order.setVipOrder(false);
-
- if (order.isVipOrder())
- order.setVipOrderDesc("璁㈠崟鏉ユ簮锛氱敱瓒呯骇浼氬憳鐨勭矇涓濅骇鐢�");
- }
-
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");
- // 2019.8.1寮�濮嬭繑鍥炵淮鏉冧俊鎭�
- Date august = TimeUtil.parse("2019-08-01");
-
- // 褰撳墠鐢ㄦ埛鏄惁VIP
- boolean vip = userVIPInfoService.isVIP(uid);
// 鏄惁瀛樺湪濂栧姳鍒�
- boolean hasRewardCoupon = userSystemCouponService.getValidRebateCoupon(uid);
-
for (CommonOrderVO order : listOrder) {
String orderNo = order.getOrderNo();
Integer sourceType = order.getSourceType();
+ Integer hongBaoType = order.getHongBaoType();
// 鍟嗗搧淇℃伅缁勫悎
for (CommonOrderVO commonOrder : listGoods) {
@@ -1788,7 +1921,9 @@
if (sourceType.equals(commonOrder.getSourceType()) && orderNo.equals(commonOrder.getOrderNo())) {
CommonOrderGoodsVO commonGoodsVO = new CommonOrderGoodsVO();
PropertyUtils.copyProperties(commonGoodsVO, goods);
- commonGoodsVO.setGoodsType(sourceType);
+ if (commonGoodsVO.getGoodsType() == null) {
+ commonGoodsVO.setGoodsType(sourceType);
+ }
// 娣樺疂鍟嗗搧鍥剧墖澶勭悊
String picture = commonGoodsVO.getPicture();
@@ -1807,7 +1942,6 @@
}
commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
- Integer hongBaoType = order.getHongBaoType();
// 閭�璇疯鍗曚俊鎭繚鎶�
if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
|| HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
@@ -1821,18 +1955,31 @@
}
// 璁㈠崟绫诲瀷涓虹┖鏃� 宸插晢鍝佺被涓哄噯
- Integer orderType = order.getOrderType();
- if (orderType == null) {
- String shopType = commonGoodsVO.getShopType();
- if (CommonOrderGoodsVO.TYPE_TAOBAO.equalsIgnoreCase(shopType)) {
- order.setOrderType(1);
- } else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {
- order.setOrderType(2);
- }
+ String shopType = commonGoodsVO.getShopType();
+ if (CommonOrderGoodsVO.TYPE_TAOBAO.equalsIgnoreCase(shopType)) {
+ order.setOrderType(1);
+ } else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {
+ order.setOrderType(2);
}
+ Integer goodsType = commonGoodsVO.getGoodsType();
+ if (goodsType != null & goodsType == Constant.SOURCE_TYPE_ELME) {
+ order.setOrderType(Constant.SOURCE_TYPE_ELME); // 楗夸簡涔堣鍗�
+ }
order.getListOrderGoods().add(commonGoodsVO);
}
+ }
+
+ // 璁㈠崟绫诲瀷
+ if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
+ Integer orderType = order.getOrderType();
+ if (orderType == null) {
+ order.setOrderType(1);
+ }
+ } else if (sourceType == Constant.SOURCE_TYPE_JD) {
+ order.setOrderType(3);
+ } else if (sourceType == Constant.SOURCE_TYPE_PDD) {
+ order.setOrderType(4);
}
Date thirdCreateTime = order.getThirdCreateTime();
@@ -1846,25 +1993,9 @@
order.setReceiveTime("鏀惰揣鏃堕棿锛�" + format.format(settleTime));
}
- // 璁㈠崟绫诲瀷
- if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- Integer orderType = order.getOrderType();
- if (orderType == null)
- order.setOrderType(1);
- } else if (sourceType == Constant.SOURCE_TYPE_JD) {
- order.setOrderType(3);
- } else if (sourceType == Constant.SOURCE_TYPE_PDD) {
- order.setOrderType(4);
- }
-
- /* 璁㈠崟鐘舵�� 杞崲澶勭悊 */
- String orderStateContent = "";
Map<String, String> orderStateMap = new HashMap<String, String>();
// 璁㈠崟鐘舵��
Integer orderState = order.getState();
- // 绾㈠寘鐘舵��
- Integer hongBaoState = order.getHongBaoState();
-
Integer stateWholeOrder = order.getStateWholeOrder();
if (CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO == stateWholeOrder) {
// 鏁翠釜璁㈠崟閮ㄥ垎澶辨晥锛氬垽鏂湡瀹炵姸鎬� 璁㈠崟銆佺孩鍖�
@@ -1872,16 +2003,25 @@
if (buFenOrder != null) {
// 鏈夋晥鐨勮鍗曠姸鎬�
orderState = buFenOrder.getState();
- // 鏈夋晥鐨勭孩鍖呯姸鎬�
- hongBaoState = buFenOrder.getHongBaoState();
}
}
- BigDecimal hongBao = order.getHongBao();
- if (hongBao == null) {
- hongBao = new BigDecimal(0);
+ // 鏄剧ず杩斿埄璇存槑杩炴帴> 鏈け鏁�
+ if (CommonOrder.STATE_SX != orderState
+ && thirdCreateTime.getTime() > TimeUtil.convertDateToTemp(Constant.ORDER_SHOW_BRACE_TIME)) {
+ String rebateLink = configService.get(ConfigKeyEnum.orderRebateDescLink.getKey());
+ order.setRebateLink(rebateLink + "?orderNo=" + orderNo + "&sourceType=" + sourceType);
}
+ // 绾㈠寘淇℃伅
+ List<HongBaoOrder> hongBaoOrderList = hongBaoOrderService.listDetailByOrderIdAndSourceTypeAndUid(orderNo,
+ sourceType, uid);
+ HongBaoCountVO hongBaoCountVO = hongBaoOrderService.getHongBaoCountVO(hongBaoOrderList);
+ BigDecimal hongBao = hongBaoCountVO.getValidMoney();
+ Integer hongBaoState = hongBaoCountVO.getCurrentState();
+
+ /* 璁㈠崟鐘舵�� 杞崲澶勭悊 */
+ String orderStateContent = "";
if (CommonOrder.STATE_FK == orderState) {
orderStateContent = "宸蹭粯娆�";
} else if (CommonOrder.STATE_JS == orderState) {
@@ -1890,80 +2030,56 @@
orderStateContent = "鏈粯娆�/宸查��娆�";
} else if (CommonOrder.STATE_WQ == orderState) {
orderStateContent = "宸插敭鍚�";
- if (sourceType != null && sourceType == Constant.SOURCE_TYPE_TAOBAO) {
+ if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
/* 璁㈠崟缁存潈 鍒ゆ柇鏄惁鍏ㄩ儴缁存潈 */
List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper
.selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛");
-
- boolean isPart = false;// 榛樿澶辨晥
BigDecimal weiQuanMoney = getWeiQuanMoney(listWQ, sourceType, uid);
- if (settleTime != null && august != null && settleTime.getTime() > august.getTime()) {
+
+ if (settleTime != null) {
orderStateContent = "鍞悗鎴愬姛";
WeiQuanInfo weiQuanInfo = new WeiQuanInfo();
weiQuanInfo.setOldHongBao("楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
weiQuanInfo.setWqHongBao("鍞悗锛�-楼" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
- hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
order.setWeiQuanInfo(weiQuanInfo);
}
+ hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
}
}
orderStateMap.put("content", orderStateContent);
orderStateMap.put("fontColor", "#666666");
order.setOrderState(orderStateMap);
- String hongbaoInfo = "";
// 璁㈠崟鏍囪瘑
List<String> signList = new ArrayList<String>();
/* 璁㈠崟杩斿埄绫诲瀷 杞崲 */
- Integer hongBaoType = order.getHongBaoType();
if (HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) {
// 鑷喘
- hongbaoInfo = "杩斿埄";
order.setOrderOrigin("1");
order.setHongBaoTypePic(CommonOrder.TYPE_FANLI);
signList.add(CommonOrder.TYPE_FANLI);
+
+ // 鏄惁宸蹭娇鐢ㄥ鍔卞埜銆佸厤鍗曞埜鎯呭喌
+ if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
+ couponUseFactory(order, listRecordTB);
+ } else if (sourceType == Constant.SOURCE_TYPE_JD) {
+ couponUseFactory(order, listRecordJD);
+ } else if (sourceType == Constant.SOURCE_TYPE_PDD) {
+ couponUseFactory(order, listRecordPDD);
+ }
} else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {
// 鍒嗕韩
- hongbaoInfo = "濂栭噾";
order.setOrderOrigin("2");
order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);
signList.add(CommonOrder.TYPE_SHARE);
- } else if (HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
- // 涓嬬骇鐨勫垎浜鍗曪細 鏄剧ず閭�璇�
- hongbaoInfo = "濂栭噾";
- order.setOrderOrigin("3");
- order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
- signList.add(CommonOrder.TYPE_INVITE);
-
- } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
+ } else if (HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType
+ || HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
|| HongBaoV2.TYPE_ERJI == hongBaoType) {
// 閭�璇疯鍗�
- hongbaoInfo = "濂栭噾";
order.setOrderOrigin("3");
order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
signList.add(CommonOrder.TYPE_INVITE);
-
- // 瓒呯骇浼氬憳琛ヨ创淇℃伅
- InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(),
- sourceType);
- if (orderSubsidy != null) {
- ClientTextStyleVO subsidyInfo = new ClientTextStyleVO();
- subsidyInfo.setContent("(琛ヨ创楼" + orderSubsidy.getMoney() + ")");
- if (orderSubsidy.getState() == InviteOrderSubsidy.STATE_SUBSIDIZED) {
- subsidyInfo.setColor("#E5005C");
- } else {
- subsidyInfo.setColor("#888888");
- }
- order.setSubsidy(subsidyInfo);
-
- // 瑙ｉ噴淇℃伅锛堥棶鍙凤級
- List<String> subsidyList = new ArrayList<String>();
- subsidyList.add("棰濆琛ヨ创鑳藉惁鑾峰緱鐢辩郴缁熺畻娉曡嚜鍔ㄥ垽鏂紝浜轰负鏃犳硶骞叉秹锛�");
- subsidyList.add("棰濆琛ヨ创鍒拌处鏃堕棿浠ュ強閲戦璇蜂互瀹為檯鍒拌处涓哄噯锛�");
- subsidyList.add("棰濆琛ヨ创浜х敓鍚庡皢浼氬湪娑堟伅-璧勯噾娑堟伅涓彁閱掍綘銆�");
- order.setSubsidyList(subsidyList);
- }
}
order.setSignList(signList);
@@ -1975,34 +2091,21 @@
String stateContent = "";
String stateFontColor = "#E5005C";
Integer orderHongBaoState = null;
-
if (HongBaoV2.STATE_KELINGQU == hongBaoState || HongBaoV2.STATE_BUKELINGQU == hongBaoState) {
orderHongBaoState = 1;
stateContent = "鏈埌璐�";
hongBaoState_Str = "棰勪及";
-
Date preAccountTime = order.getPreAccountTime();
if (preAccountTime != null) {
hongBaoDate = "棰勮鍒拌处鏃堕棿锛�" + formatday.format(preAccountTime);
}
-
} else if (HongBaoV2.STATE_YILINGQU == hongBaoState) {
orderHongBaoState = 3;
stateContent = "宸插埌璐�";
-
Date accountTime = order.getAccountTime();
if (accountTime != null) {
hongBaoDate = "鍒拌处鏃堕棿锛�" + formatday.format(accountTime);
}
-
- } else if (HongBaoV2.STATE_BUFENSHIXIAO == hongBaoState) {
- stateContent = "閮ㄥ垎澶辨晥";
- orderHongBaoState = 3;
- Date accountTime = order.getAccountTime();
- if (accountTime != null) {
- hongBaoDate = "鍒拌处鏃堕棿锛�" + formatday.format(accountTime);
- }
-
} else if (HongBaoV2.STATE_SHIXIAO == hongBaoState) {
orderHongBaoState = 4;
stateContent = "宸插け鏁�";
@@ -2020,31 +2123,16 @@
stateMap.put("fontColor", stateFontColor);
order.setAccountState(stateMap);
- hongbaoInfo = hongBaoState_Str + hongbaoInfo;
-
Map<String, String> hongBaoMap = new HashMap<String, String>();
- hongBaoMap.put("content", hongbaoInfo + " 楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ hongBaoMap.put("content",
+ hongBaoState_Str + "鏀剁泭 楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
hongBaoMap.put("fontColor", hongbaoInfoFontColor);
order.setHongBaoInfo(hongBaoMap);
- // 鏄剧ず杩斿埄銆佸厤鍗曡鎯�
- if (HongBaoV2.TYPE_ZIGOU == hongBaoType) {
- // 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
- if (sourceType == null) {
- couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, vip);
- } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, vip);
- } else if (sourceType == Constant.SOURCE_TYPE_JD) {
- couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, vip);
- } else if (sourceType == Constant.SOURCE_TYPE_PDD) {
- couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, uid, vip);
- }
- }
-
// 鍒嗕韩銆侀個璇� 闅愯棌璁㈠崟鍙�
- if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_YAOQING == hongBaoType
- || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType
- || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
+ if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
+ || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
+ || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo()));
}
}
@@ -2054,134 +2142,71 @@
* 璁㈠崟锛� 鍏嶅崟鏍囪瘑 濂栧姳鏍囪瘑
*
* @param order
- * @param hasRewardCoupon
- * @param hongBaoState
* @param list
- * @param signList
*/
- private void couponFactoryNew(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState,
- Integer hongBaoType, List<UserSystemCouponRecord> list, Long uid, boolean vip) throws Exception {
- // 鏄惁鍏嶅崟鍟嗗搧
- boolean freeOrder = false;
- // 鏄惁濂栧姳鎴愬姛
- boolean rewardSuccess = false;
- if (list != null && list.size() > 0) {
- for (UserSystemCouponRecord couponRecord : list) {
- int goodSource = couponRecord.getGoodSource();
- if (goodSource == 0)
- goodSource = 1;
+ private void couponUseFactory(CommonOrderVO order, List<UserSystemCouponRecord> list) throws Exception {
+ if (list == null || list.size() == 0) {
+ return;
+ }
- if (order.getOrderNo().equals(couponRecord.getOrderNo()) && goodSource == order.getSourceType()) {
- Integer state = couponRecord.getState();
- String systemCouponType = couponRecord.getCouponType();
- if (CouponTypeEnum.rebatePercentCoupon.name().equals(systemCouponType)
- && UserSystemCouponRecord.STATE_SUCCESS == state) {
- rewardSuccess = true;
- } else if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
- || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
- || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
+ String text = null;
+ for (UserSystemCouponRecord couponRecord : list) {
+ int goodSource = couponRecord.getGoodSource();
+ if (goodSource == 0)
+ goodSource = 1;
- if (UserSystemCouponRecord.STATE_FREE_ON == state) {
- // 鍏嶅崟涓�
- freeOrder = true;
- order.getSignList().add(PIC_FREE_ON);
- } else if (UserSystemCouponRecord.STATE_SUCCESS == state) {
- // 鍏嶅崟鎴愬姛
- freeOrder = true;
- order.getSignList().add(PIC_FREE_SUCCEED);
- } else if (UserSystemCouponRecord.STATE_FAIL_RULE == state
- || UserSystemCouponRecord.STATE_FAIL_DRAWBACK == state) {
- // 瑙勫垯涓嶅尮閰嶃�侀��娆�
- freeOrder = true;
- order.getSignList().add(PIC_FREE_FAIL);
- }
+ String orderNo = couponRecord.getOrderNo();
+ if (order.getOrderNo().equals(orderNo) && goodSource == order.getSourceType()) {
+ Integer state = couponRecord.getState();
+ String systemCouponType = couponRecord.getCouponType();
+ if (CouponTypeEnum.rebatePercentCoupon.name().equals(systemCouponType)
+ && UserSystemCouponRecord.STATE_SUCCESS == state) {
+ text = "宸插鍔�";
+ } else if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
+ || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
+ || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
+ if (UserSystemCouponRecord.STATE_FREE_ON == state) {
+ text = "鍏嶅崟涓�";
+ } else if (UserSystemCouponRecord.STATE_SUCCESS == state) {
+ text = "宸插厤鍗�";
}
- break;
}
+ break;
}
}
- // 鍏嶅崟璇︽儏
- if (freeOrder) {
+ if (!StringUtil.isNullOrEmpty(text)) {
ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
- rewardStyleVO.setContent("鍏嶅崟璇︽儏 >");
+ rewardStyleVO.setContent(text);
rewardStyleVO.setColor("#E5005C");
rewardStyleVO.setBottomColor("#FFDCEA");
- Map<String, Object> jumpLink = new HashMap<String, Object>();
- jumpLink.put("orderNo", order.getOrderNo());
- jumpLink.put("goodsType", order.getSourceType() + "");
-
- Map<String, Object> jump = new HashMap<String, Object>();
- jump.put("type", 1); // 椤甸潰璺宠浆
- jump.put("params", jumpLink);
- jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("freeCouponDetail"));
-
Map<String, Object> rewardMap = new HashMap<String, Object>();
rewardMap.put("text", rewardStyleVO);
- rewardMap.put("jump", jump);
order.setRewardDetail(rewardMap);
- }
-
- // 宸蹭娇鐢ㄥ鍔卞埜
- if (rewardSuccess) {
- ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
- rewardStyleVO.setColor("#E5005C");
- rewardStyleVO.setBottomColor("#FFDCEA");
- rewardStyleVO.setContent("宸蹭娇鐢ㄥ鍔卞埜 >");
-
- Map<String, Object> rewardMap = new HashMap<String, Object>();
- rewardMap.put("text", rewardStyleVO);
- Map<String, Object> jumpLink = new HashMap<String, Object>();
- jumpLink.put("orderNo", order.getOrderNo());
- jumpLink.put("goodsType", order.getSourceType() + "");
-
- Map<String, Object> jump = new HashMap<String, Object>();
- jump.put("type", 1); // 1 甯歌璺宠浆椤甸潰
- jump.put("params", jumpLink);
- jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
- rewardMap.put("jump", jump);
- order.setRewardDetail(rewardMap);
- }
-
- // 鏄惁鍙娇鐢ㄥ鍔卞埜
- if (!rewardSuccess && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
- && HongBaoV2.STATE_YILINGQU == hongBaoState && !vip && CommonOrder.STATE_WQ != order.getState()) {
- // 涓嬪崟鏃堕棿
- Date thirdCreateTime = order.getThirdCreateTime();
- // 鍒拌处鏃堕棿
- Date accountTime = order.getAccountTime();
- if (thirdCreateTime == null || accountTime == null)
- return;
-
- // 涓嬪崟鏃ユ湡鏄惁鏄鍚堜笂绾挎棩鏈�
- long downOrderTime = thirdCreateTime.getTime();
- long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
- if (downOrderTime > limitDate) {
- // 2.1 寮�濮嬫柊鐗�
- rewardCounponLimitTime(order, accountTime);
- } else if (hasRewardCoupon) {
- // 鍦�2.1鏂扮増涓婄嚎涔嬪墠璁㈠崟-瀛樺湪鍒欐樉绀哄鍔卞埜鍙娇鐢�
- ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
- rewardStyleVO.setColor("#E5005C");
- rewardStyleVO.setBottomColor("#FFDCEA");
- rewardStyleVO.setContent("浣跨敤濂栧姳鍒�");
-
- Map<String, Object> jumpLink = new HashMap<String, Object>();
- jumpLink.put("orderNo", order.getOrderNo());
- jumpLink.put("goodsType", order.getSourceType() + "");
-
- Map<String, Object> jump = new HashMap<String, Object>();
- jump.put("type", 2); // 寮规
- jump.put("params", jumpLink);
- jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
-
- Map<String, Object> rewardMap = new HashMap<String, Object>();
- rewardMap.put("text", rewardStyleVO);
- rewardMap.put("jump", jump);
- order.setRewardDetail(rewardMap);
- }
}
}
-
+
+
+ @Override
+ public long countOrderByUidAndSettled(Long uid, BigDecimal payment) {
+ Long count = commonOrderMapper.countOrderByUidAndSettled(uid, payment);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+
+
+ @Override
+ public String getNewestOrderNoByTaoBao() {
+ return commonOrderMapper.getNewestOrderNoByTaoBao();
+ }
+
+
+ @Override
+ public List<CommonOrder> listByOrderNo(String orderNo) {
+ return commonOrderMapper.listByOrderNo(orderNo);
+ }
+
}
--
Gitblit v1.8.0