From 0ec22dcf4fd9c4496e6f681e7fab89f56c6e4e8a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 02 四月 2020 14:45:20 +0800
Subject: [PATCH] vip 消息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 270 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 177 insertions(+), 93 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 1d1cd7c..515a8bc 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,10 +17,14 @@
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.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;
@@ -59,6 +63,7 @@
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.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -71,9 +76,11 @@
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;
@@ -129,6 +136,12 @@
@Resource
private UserInfoService userInfoService;
+
+ @Resource
+ private UserInviteService userInviteService;
+
+ @Resource(name = "producer")
+ private Producer orderProducer;
// 濂栧姳璁㈠崟鍥剧墖
public final static String PIC_REWARD = "http://img.flqapp.com/resource/order/order_state_reward.png";
@@ -211,7 +224,11 @@
}
// 鏁版嵁鍔犲伐閲嶆柊缁勭粐
- orderVOFactory(acceptData, listOrder, listGoods, uid);
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ orderVOFactoryNew(acceptData, listOrder, listGoods, uid);
+ } else {
+ orderVOFactory(acceptData, listOrder, listGoods, uid);
+ }
return listOrder;
}
@@ -268,6 +285,7 @@
}
Map<Long, Boolean> vipUserMap = userVIPInfoService.listByUids(needSelectVIPUidList);
+
// 璁剧疆鏄惁涓簐ip璁㈠崟
for (CommonOrderVO order : listOrder) {
if (order.getHongBaoType() == HongBaoV2.TYPE_YIJI || order.getHongBaoType() == HongBaoV2.TYPE_ERJI
@@ -294,15 +312,11 @@
boolean vip = userVIPInfoService.isVIP(uid);
// 鏄惁瀛樺湪濂栧姳鍒�
boolean hasRewardCoupon = userSystemCouponService.getValidRebateCoupon(uid);
- long nowTime = java.lang.System.currentTimeMillis();
for (CommonOrderVO order : listOrder) {
String orderNo = order.getOrderNo();
Integer sourceType = order.getSourceType();
Integer hongBaoType = order.getHongBaoType();
-
-
- BigDecimal totalPay = new BigDecimal(0);
- BigDecimal totalActual = new BigDecimal(0);
+
// 鍟嗗搧淇℃伅缁勫悎
for (CommonOrderVO commonOrder : listGoods) {
CommonOrderGoods goods = commonOrder.getCommonOrderGoods();
@@ -332,16 +346,7 @@
}
commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
- totalPay = MoneyBigDecimalUtil.add(totalPay, totalSettlement);
-
- // 鍟嗗搧浠锋牸
- BigDecimal actualPrice = commonGoodsVO.getActualPrice();
- if (actualPrice != null) {
- Integer totalCount = commonOrder.getTotalCount();
- totalActual = MoneyBigDecimalUtil.add(totalActual,
- MoneyBigDecimalUtil.mul(new BigDecimal(totalCount), actualPrice));
- }
-
+
// 閭�璇疯鍗曚俊鎭繚鎶�
if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
|| HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
@@ -368,20 +373,10 @@
order.getListOrderGoods().add(commonGoodsVO);
}
}
-
+
Date thirdCreateTime = order.getThirdCreateTime();
order.setDownTime("涓嬪崟鏃堕棿锛�" + format.format(thirdCreateTime));
order.setObtainTime(thirdCreateTime.getTime());
-
- // 2.1鍒嗕韩璁㈠崟鍜岃繑鍒╄鍗曞疄浠橀噾棰濆ぇ浜庢垨鑰呭皬浜庡埜鍚庝环鐨勬椂鍊欙紝璁㈠崟椤甸潰 鍙樉绀�3澶� 涓嬪崟鏃堕棿寮�濮�
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- if (HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
- && DateUtil.plusDayDate(3, thirdCreateTime).getTime() > nowTime
- && totalPay.compareTo(totalActual) != 0) {
- order.setFanliDesc("鐢卞疄浠橀噾棰�*杩斿埄姣旇绠楄�屾潵");
- order.setFanliDescLink(configService.get(ConfigKeyEnum.shareOrderRebateDescLink.getKey()));
- }
- }
Date settleTime = order.getSettleTime();
if (settleTime != null) {
@@ -923,11 +918,20 @@
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);
+ cog.setPicture("http://img.flqapp.com/resource/goods/elme_picture_demo.png");
+ cog.setTitle(taoBaoOrder.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(),
@@ -935,22 +939,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) {
@@ -963,6 +970,7 @@
newCommonOrder.setUserInfo(new UserInfo(uid));
commonOrderList.add(addCommonOrder(newCommonOrder));
}
+ addConfirmMQMsg(commonOrderList);
return commonOrderList;
}
@@ -1013,7 +1021,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)
@@ -1078,6 +1132,7 @@
newCommonOrder.setUserInfo(new UserInfo(uid));
commonOrderList.add(addCommonOrder(newCommonOrder));
}
+ addConfirmMQMsg(commonOrderList);
return commonOrderList;
}
@@ -1261,7 +1316,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;
@@ -1270,7 +1325,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) {
@@ -1457,7 +1512,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);
@@ -1693,8 +1748,17 @@
return commonOrderMapper.countSearchOrderByUid(uid, list);
}
+
@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);
// 璁㈠崟淇℃伅涓虹┖
@@ -1711,7 +1775,7 @@
}
// 鏁版嵁鍔犲伐閲嶆柊缁勭粐
- orderVOFactoryNew(listVO, listGoods, uid);
+ orderVOFactoryNew(acceptData, listVO, listGoods, uid);
return listVO;
}
@@ -1724,8 +1788,8 @@
* @param listGoods
* @param uid
*/
- private void orderVOFactoryNew(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid)
- throws Exception {
+ private void orderVOFactoryNew(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>();
@@ -1766,23 +1830,19 @@
|| 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("璁㈠崟鏉ユ簮锛氱敱瓒呯骇浼氬憳鐨勭矇涓濅骇鐢�");
+ Integer urank = order.getUrank();
+ if (urank != null) {
+ String levelName = UserLevelUtil.getLevelName(urank);
+ if (!StringUtil.isNullOrEmpty(levelName)) {
+ order.setOrderDesc("璁㈠崟鏉ユ簮锛�" + levelName);
+ }
+ }
+ }
}
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
@@ -1790,14 +1850,15 @@
// 2019.8.1寮�濮嬭繑鍥炵淮鏉冧俊鎭�
Date august = TimeUtil.parse("2019-08-01");
- // 褰撳墠鐢ㄦ埛鏄惁VIP
- boolean vip = userVIPInfoService.isVIP(uid);
+ // 褰撳墠鐢ㄦ埛鏄惁鍙互浣跨敤濂栧姳鍒�
+ boolean isvip = 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) {
@@ -1809,7 +1870,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();
@@ -1828,7 +1891,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
@@ -1842,19 +1904,35 @@
}
// 璁㈠崟绫诲瀷涓虹┖鏃� 宸插晢鍝佺被涓哄噯
- 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();
if (thirdCreateTime != null) {
@@ -1867,16 +1945,6 @@
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 = "";
@@ -1898,6 +1966,16 @@
}
}
+
+ // 2.1鏄剧ず杩斿埄璇存槑杩炴帴> 鏈け鏁�-鑷喘-鍒嗕韩
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (CommonOrder.STATE_SX != orderState && thirdCreateTime.getTime() > TimeUtil.convertDateToTemp(Constant.ORDER_SHOW_BRACE_TIME)
+ && ((HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) || HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) ) {
+ String rebateLink = configService.get(ConfigKeyEnum.orderRebateDescLink.getKey());
+ order.setRebateLink(rebateLink + "?orderNo=" + orderNo +"&sourceType=" + sourceType);
+ }
+ }
+
BigDecimal hongBao = order.getHongBao();
if (hongBao == null) {
hongBao = new BigDecimal(0);
@@ -1916,7 +1994,6 @@
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()) {
orderStateContent = "鍞悗鎴愬姛";
@@ -1936,7 +2013,6 @@
// 璁㈠崟鏍囪瘑
List<String> signList = new ArrayList<String>();
/* 璁㈠崟杩斿埄绫诲瀷 杞崲 */
- Integer hongBaoType = order.getHongBaoType();
if (HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) {
// 鑷喘
hongbaoInfo = "杩斿埄";
@@ -2052,13 +2128,13 @@
if (HongBaoV2.TYPE_ZIGOU == hongBaoType) {
// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
if (sourceType == null) {
- couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, vip);
+ couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, isvip);
} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, vip);
+ couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, isvip);
} else if (sourceType == Constant.SOURCE_TYPE_JD) {
- couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, vip);
+ couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, isvip);
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
- couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, uid, vip);
+ couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, uid, isvip);
}
}
@@ -2205,4 +2281,12 @@
}
}
+ @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();
+ }
+
}
--
Gitblit v1.8.0