From eed54c262df12dd3d132bf14691915e6183afd4c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 01 一月 2020 17:23:11 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 1340 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 1,093 insertions(+), 247 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 15d76b2..91bdd50 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
@@ -13,12 +13,15 @@
import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.yeshi.utils.DateUtil;
+import org.yeshi.utils.entity.DateInfo;
import org.yeshi.utils.taobao.TbImgUtil;
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.order.CommonOrderAddResultDTO;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
@@ -31,7 +34,9 @@
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.order.CommonOrderGoods;
import com.yeshi.fanli.entity.order.CommonOrderTradeIdMap;
+import com.yeshi.fanli.entity.order.ESOrder;
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.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -44,17 +49,24 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemCouponService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
+import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
+import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyService;
+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.vip.UserVIPInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.VersionUtil;
+import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.factory.CommonOrderGoodsFactory;
import com.yeshi.fanli.util.factory.goods.CommonOrderFactory;
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.taobao.TaoBaoUtil;
@@ -62,6 +74,8 @@
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.OrderCountVO;
+import com.yeshi.fanli.vo.order.WeiQuanInfo;
import net.sf.json.JSONObject;
@@ -103,6 +117,15 @@
@Resource
private HongBaoOrderService hongBaoOrderService;
+
+ @Resource
+ private InviteOrderSubsidyService inviteOrderSubsidyService;
+
+ @Resource
+ private UserVIPInfoService userVIPInfoService;
+
+ @Resource
+ private UserInfoService userInfoService;
// 濂栧姳璁㈠崟鍥剧墖
public final static String PIC_REWARD = "http://img.flqapp.com/resource/order/order_state_reward.png";
@@ -153,12 +176,14 @@
@Override
public long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException {
- return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime, dateType, source);
+ return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime, dateType,
+ source);
}
@Override
- public List<CommonOrderVO> getOrderByUid(AcceptData acceptData,Integer page, Long uid, Integer state, Integer type, Integer orderState,
- String orderNo, String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException {
+ public List<CommonOrderVO> getOrderByUid(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
+ Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, Integer source)
+ throws CommonOrderException, Exception {
int pageSize = Constant.PAGE_SIZE;
@@ -179,40 +204,21 @@
}
// 鏁版嵁鍔犲伐閲嶆柊缁勭粐
- listDataFactory(acceptData, listOrder, listGoods, uid);
+ orderVOFactory(acceptData, listOrder, listGoods, uid);
return listOrder;
}
- @Override
- public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day, Integer source) {
- return commonOrderMapper.countHistoryOrder(uid, day, source);
- }
-
- @Override
- public long countBonusOrderNumber(Long uid, Integer type, Integer day, String startTime, String endTime, Integer source) {
- return commonOrderMapper.countBonusOrderNumber(uid, type, day, startTime, endTime, source);
- }
-
- @Override
- public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer day, String startTime, String endTime, Integer source) {
- return commonOrderMapper.countBonusOrderMoney(uid, type, day, startTime, endTime, source);
- }
-
- @Override
- public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime,
- String endTime) {
- return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime);
- }
-
- @Override
- public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime,
- Integer day, Integer source) {
- return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime, day, source);
- }
-
- public void listDataFactory(AcceptData acceptData, List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid) {
-
+ /**
+ * 璁㈠崟淇℃伅鍔犲伐
+ *
+ * @param acceptData
+ * @param listOrder
+ * @param listGoods
+ * @param uid
+ */
+ private void orderVOFactory(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>();
@@ -233,46 +239,87 @@
if (listTB.size() > 0) {
listRecordTB = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_TAOBAO, listTB);
}
-
- List<UserSystemCouponRecord> listRecordJD = null;
+
+ List<UserSystemCouponRecord> listRecordJD = null;
if (listJD.size() > 0) {
listRecordJD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_JD, listJD);
}
-
+
List<UserSystemCouponRecord> listRecordPDD = null;
if (listPDD.size() > 0) {
listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);
}
-
- /* 缁勫悎鍟嗗搧淇℃伅 */
- for (CommonOrderVO commonOrder : listGoods) {
- CommonOrderGoods goods = commonOrder.getCommonOrderGoods();
- if (goods == null) {
- continue;
- }
- String orderNo1 = commonOrder.getOrderNo();
- Integer sourceType = commonOrder.getSourceType();
- for (CommonOrderVO order : listOrder) {
- String orderNo2 = order.getOrderNo();
- Integer sourceType2 = order.getSourceType();
+ // 闇�瑕佹煡璇㈡槸鍚︿负VIP鐨勭敤鎴稩D,鍙湁閭�璇疯鍗曟墠闇�瑕佹煡璇�
+ List<Long> needSelectVIPUidList = new ArrayList<>();
- // 鏉ユ簮銆佽鍗曞彿鐩稿悓
- if (sourceType.equals(sourceType2) && orderNo1.equals(orderNo2)) {
- // 鍔犲叆鍟嗗搧淇℃伅
- List<CommonOrderGoodsVO> listOrderGoods = order.getListOrderGoods();
+ 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();
+
+ // 鍟嗗搧淇℃伅缁勫悎
+ for (CommonOrderVO commonOrder : listGoods) {
+ CommonOrderGoods goods = commonOrder.getCommonOrderGoods();
+ if (goods == null) {
+ continue;
+ }
+
+ if (sourceType.equals(commonOrder.getSourceType()) && orderNo.equals(commonOrder.getOrderNo())) {
CommonOrderGoodsVO commonGoodsVO = new CommonOrderGoodsVO();
- try {
- PropertyUtils.copyProperties(commonGoodsVO, goods);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ PropertyUtils.copyProperties(commonGoodsVO, goods);
+ commonGoodsVO.setGoodsType(sourceType);
+ // 娣樺疂鍟嗗搧鍥剧墖澶勭悊
String picture = commonGoodsVO.getPicture();
- if (!StringUtil.isNullOrEmpty(picture) && !picture.contains("320x320")) {
+ if (sourceType == Constant.SOURCE_TYPE_TAOBAO && !StringUtil.isNullOrEmpty(picture)
+ && !picture.contains("320x320")) {
commonGoodsVO.setPicture(TbImgUtil.getTBSize320Img(picture));
}
+
+ // 璐拱鏁伴噺
+ commonGoodsVO.setActualCount(commonOrder.getTotalCount() + "浠�");
+
+ // 瀹炰粯娆�
+ BigDecimal totalSettlement = commonOrder.getTotalSettlement();
+ if (totalSettlement == null || totalSettlement.compareTo(new BigDecimal(0)) <= 0) {
+ totalSettlement = commonOrder.getTotalPayment();
+ }
+ commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
Integer hongBaoType = order.getHongBaoType();
// 閭�璇疯鍗曚俊鎭繚鎶�
@@ -287,18 +334,7 @@
commonGoodsVO.setGoodsTitle(titleMap);
}
- // 璐拱鏁伴噺
- commonGoodsVO.setActualCount(commonOrder.getTotalCount() + "浠�");
-
- BigDecimal totalSettlement = commonOrder.getTotalSettlement();
- if (totalSettlement == null || totalSettlement.compareTo(new BigDecimal(0)) <= 0) {
- totalSettlement = commonOrder.getTotalPayment();
- }
- // 瀹炰粯娆�
- commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
-
- listOrderGoods.add(commonGoodsVO);
-
+ // 璁㈠崟绫诲瀷涓虹┖鏃� 宸插晢鍝佺被涓哄噯
Integer orderType = order.getOrderType();
if (orderType == null) {
String shopType = commonGoodsVO.getShopType();
@@ -306,28 +342,12 @@
order.setOrderType(1);
} else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {
order.setOrderType(2);
- }
-
- if (Constant.SOURCE_TYPE_JD == sourceType2) {
- order.setOrderType(3);
- } else if (Constant.SOURCE_TYPE_PDD == sourceType2) {
- order.setOrderType(4);
}
}
- break;
+ order.getListOrderGoods().add(commonGoodsVO);
}
}
- }
-
- SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
- SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");
-
- // 鏄惁瀛樺湪濂栧姳鍒�
- boolean hasRewardCoupon = userSystemCouponService.hasRewardCoupon(uid);
-
- /* 缁勭粐璁㈠崟鐘舵�� 绛変俊鎭� */
- for (CommonOrderVO order : listOrder) {
Date thirdCreateTime = order.getThirdCreateTime();
if (thirdCreateTime != null) {
@@ -340,10 +360,20 @@
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();
// 绾㈠寘鐘舵��
@@ -361,6 +391,11 @@
}
}
+ BigDecimal hongBao = order.getHongBao();
+ if (hongBao == null) {
+ hongBao = new BigDecimal(0);
+ }
+
if (CommonOrder.STATE_FK == orderState) {
orderStateContent = "宸蹭粯娆�";
} else if (CommonOrder.STATE_JS == orderState) {
@@ -368,34 +403,32 @@
} else if (CommonOrder.STATE_SX == orderState) {
orderStateContent = "鏈粯娆�/宸查��娆�";
} else if (CommonOrder.STATE_WQ == orderState) {
- orderStateContent = "宸茬淮鏉�";
-
- Integer sourceType = order.getSourceType();
+ orderStateContent = "宸插敭鍚�";
if (sourceType != null && sourceType == Constant.SOURCE_TYPE_TAOBAO) {
/* 璁㈠崟缁存潈 鍒ゆ柇鏄惁鍏ㄩ儴缁存潈 */
List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper
.selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛");
boolean isPart = false;// 榛樿澶辨晥
+ BigDecimal weiQuanMoney = getWeiQuanMoney(listWQ, sourceType, uid);
- if (listWQ != null && listWQ.size() > 0) {
- BigDecimal fanTotalMoney = new BigDecimal(0);
- for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) {
- BigDecimal fanMoney = weiQuanOrder.getFanMoney();
- if (fanMoney != null) {
- fanTotalMoney = MoneyBigDecimalUtil.add(fanTotalMoney, fanMoney);
- }
+ if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (isPart) {
+ hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 閮ㄥ垎澶辨晥
+ } else {
+ hongBaoState = HongBaoV2.STATE_SHIXIAO; // 鍏ㄩ儴澶辨晥
}
-
- if (fanTotalMoney.compareTo(order.getHongBao()) < 0) {
- isPart = true;
- }
- }
-
- if (isPart) {
- hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 閮ㄥ垎澶辨晥
} else {
- hongBaoState = HongBaoV2.STATE_SHIXIAO; // 鍏ㄩ儴澶辨晥
+ // 2019.8.1 杩斿洖缁存潈淇℃伅
+ if (settleTime != null && august != null && settleTime.getTime() > august.getTime()) {
+ 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);
+ }
}
}
}
@@ -421,15 +454,45 @@
order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);
signList.add(CommonOrder.TYPE_SHARE);
- } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
- || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
- || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
- // 閭�璇�
+ } 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
+ || HongBaoV2.TYPE_ERJI == hongBaoType) {
+ // 閭�璇疯鍗�
+ hongbaoInfo = "濂栭噾";
+ order.setOrderOrigin("3");
+ order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
+ signList.add(CommonOrder.TYPE_INVITE);
+
+ // 鐗堟湰鍖哄垎锛�2-0-2
+ if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
+ 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);
String hongBaoDate = null;
String hongBaoState_Str = "";
@@ -475,6 +538,10 @@
order.setHongBaoState(orderHongBaoState);
order.setHongBaoDate(hongBaoDate);
+ if (!StringUtil.isNullOrEmpty(order.getStateDesc())) {
+ stateContent = stateContent + "-" + order.getStateDesc();
+ }
+
Map<String, String> stateMap = new HashMap<String, String>();
stateMap.put("content", stateContent);
stateMap.put("fontColor", stateFontColor);
@@ -482,147 +549,107 @@
hongbaoInfo = hongBaoState_Str + hongbaoInfo;
- BigDecimal hongBao = order.getHongBao();
- if (hongBao == null) {
- hongBao = new BigDecimal(0);
- }
Map<String, String> hongBaoMap = new HashMap<String, String>();
hongBaoMap.put("content", hongbaoInfo + " 楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
hongBaoMap.put("fontColor", hongbaoInfoFontColor);
order.setHongBaoInfo(hongBaoMap);
- // 闈炶嚜璐殑璁㈠崟 涓嶆樉绀鸿繑鍒┿�佸厤鍗曡鎯�
- if (HongBaoV2.TYPE_ZIGOU != hongBaoType) {
- order.setSignList(signList);
- } else {
- Integer sourceType = order.getSourceType();
+ // 鏄剧ず杩斿埄銆佸厤鍗曡鎯�
+ if (HongBaoV2.TYPE_ZIGOU == hongBaoType) {
// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
if (sourceType == null) {
- setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, null, signList);
+ couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, vip, acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, signList);
+ couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, vip,
+ acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_JD) {
- setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, signList);
+ couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, vip,
+ acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
- setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, signList);
+ couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, uid, vip,
+ acceptData);
}
}
-
- // 閭�璇� 闅愯棌璁㈠崟鍙�
- if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {
- String orderNo = order.getOrderNo();
- orderNo = orderNo.substring(0, orderNo.length()-6);
- order.setOrderNo(orderNo + "******");
- } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
- || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
- || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
- String orderNo = order.getOrderNo();
- orderNo = orderNo.substring(0, orderNo.length()-6);
- order.setOrderNo(orderNo + "******");
+
+ // 鍒嗕韩銆侀個璇� 闅愯棌璁㈠崟鍙�
+ 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) {
+ order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo()));
}
}
}
-
-
+
/**
- * 璁㈠崟锛� 鍏嶅崟鏍囪瘑 濂栧姳鏍囪瘑
+ * 璁㈠崟锛� 鍏嶅崟鏍囪瘑 濂栧姳鏍囪瘑
+ *
* @param order
* @param hasRewardCoupon
* @param hongBaoState
* @param list
* @param signList
*/
- public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState, Integer hongBaoType,
- List<UserSystemCouponRecord> list, List<String> signList) {
+ private void couponFactory(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState, Integer hongBaoType,
+ List<UserSystemCouponRecord> list, Long uid, boolean vip, AcceptData acceptData) throws Exception {
// 鏄惁鍏嶅崟鍟嗗搧
boolean freeOrder = false;
// 鏄惁濂栧姳鎴愬姛
boolean rewardSuccess = false;
+ boolean version2_1 = VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion());
if (list != null && list.size() > 0) {
for (UserSystemCouponRecord couponRecord : list) {
- // 璁㈠崟鍙峰尮閰�
- if (order.getOrderNo().equals(couponRecord.getOrderNo())) {
+ int goodSource = couponRecord.getGoodSource();
+ if (goodSource == 0)
+ goodSource = 1;
+
+ 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;
- signList.add(PIC_REWARD); // 鍔犲叆濂栧姳鎴愬姛鍥剧墖
-
+ if (!version2_1) {
+ // 濂栧姳鎴愬姛
+ order.getSignList().add(PIC_REWARD);
+ }
} else if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
- || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
+ || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
+ || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
if (UserSystemCouponRecord.STATE_FREE_ON == state) {
// 鍏嶅崟涓�
freeOrder = true;
- signList.add(PIC_FREE_ON);
+ order.getSignList().add(PIC_FREE_ON);
} else if (UserSystemCouponRecord.STATE_SUCCESS == state) {
// 鍏嶅崟鎴愬姛
freeOrder = true;
- signList.add(PIC_FREE_SUCCEED);
+ order.getSignList().add(PIC_FREE_SUCCEED);
} else if (UserSystemCouponRecord.STATE_FAIL_RULE == state
|| UserSystemCouponRecord.STATE_FAIL_DRAWBACK == state) {
// 瑙勫垯涓嶅尮閰嶃�侀��娆�
freeOrder = true;
- signList.add(PIC_FREE_FAIL);
+ order.getSignList().add(PIC_FREE_FAIL);
}
}
-
break;
}
}
}
- // 璁㈠崟鏍囪瘑
- order.setSignList(signList);
-
- boolean rewardOrder = false;
-
- int type = 1; // 1 甯歌璺宠浆椤甸潰 2寮瑰嚭閫夐」锛堝鍔卞埜锛�
- if (rewardSuccess) {
- // 濂栧姳鎴愬姛
- rewardOrder = true;
- } else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
- && HongBaoV2.STATE_YILINGQU == hongBaoState) {
- // 鏈夊彲鐢ㄧ殑濂栧姳鍒� 銆侀潪鍏嶅崟璁㈠崟 銆佷笖宸插埌璐︾殑 銆佽繑鍒╄鍗�
- type = 2;
- rewardOrder = true;
- }
-
- if (rewardOrder) {
- ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
- // 濂栧姳鍒歌繘搴﹁鎯�
- rewardStyleVO.setContent("杩斿埄濂栧姳 >");
- rewardStyleVO.setColor("#E5005C");
- rewardStyleVO.setBottomColor("#FFDCEA");
-
- Map<String, Object> jumpLink = new HashMap<String, Object>();
- jumpLink.put("orderNo", order.getOrderNo());
-
- Map<String, Object> jump = new HashMap<String, Object>();
- jump.put("type", type);
- 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);
- }
-
+ // 鍏嶅崟璇︽儏
if (freeOrder) {
ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
- // 杩斿埄銆佸厤鍗曡鎯�
rewardStyleVO.setContent("鍏嶅崟璇︽儏 >");
rewardStyleVO.setColor("#E5005C");
rewardStyleVO.setBottomColor("#FFDCEA");
Map<String, Object> jumpLink = new HashMap<String, Object>();
jumpLink.put("orderNo", order.getOrderNo());
+ if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
+ jumpLink.put("goodsType", order.getSourceType() + "");
+ }
Map<String, Object> jump = new HashMap<String, Object>();
jump.put("type", 1); // 椤甸潰璺宠浆
@@ -632,9 +659,213 @@
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");
+
+ if (version2_1) {
+ rewardStyleVO.setContent("宸蹭娇鐢ㄥ鍔卞埜 >");
+ } else {
+ 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);
+ }
+ }
+ }
+
+ private void rewardCounponLimitTime(CommonOrderVO order, Date accountTime) throws Exception {
+ // 鍊掕鏃堕獙璇�
+ Date endDay = DateUtil.plusDayDate(Constant.COUPON_REWARD_LIMIT_DAY, accountTime);
+ long currentTime = java.lang.System.currentTimeMillis();
+ if (endDay.getTime() <= currentTime)
+ return;
+
+ String num = null;
+ String unit = null;
+ boolean canUse = false;
+ DateInfo dateInfo = DateUtil.dateDiff3(currentTime, endDay.getTime());
+
+ if (dateInfo.getDay() > 0) {
+ canUse = true;
+ unit = "澶�";
+ num = dateInfo.getDay().toString();
+ }
+
+ if (!canUse && dateInfo.getHour() > 0) {
+ canUse = true;
+ unit = "灏忔椂";
+ num = dateInfo.getHour().toString();
+ }
+
+ if (!canUse && dateInfo.getMinute() > 0) {
+ canUse = true;
+ unit = "鍒�";
+ num = dateInfo.getMinute().toString();
+ }
+
+ if (!canUse && dateInfo.getSecond() > 0) {
+ canUse = true;
+ unit = "绉�";
+ num = dateInfo.getSecond().toString();
+ }
+
+ // 宸茬粡瓒呮椂
+ if (!canUse)
+ return;
+
+ Map<String, Object> rewardMap = new HashMap<String, Object>();
+ ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
+ rewardStyleVO.setColor("#E5005C");
+ rewardStyleVO.setBottomColor("#FFDCEA");
+ rewardStyleVO.setContent("浣跨敤濂栧姳鍒�");
+ rewardMap.put("text", rewardStyleVO);
+
+ ClientTextStyleVO txt1 = new ClientTextStyleVO();
+ txt1.setContent("鍓�");
+ txt1.setColor("#666666");
+ txt1.setBottomColor("#FFDCEA");
+
+ ClientTextStyleVO txt2 = new ClientTextStyleVO();
+ txt2.setContent(num);
+ txt2.setColor("#E5005C");
+ txt2.setBottomColor("#FFDCEA");
+ txt2.setFontSize("1.33");
+
+ ClientTextStyleVO txt3 = new ClientTextStyleVO();
+ txt3.setContent(unit + "鍏抽棴 >");
+ txt3.setColor("#666666");
+ txt3.setBottomColor("#FFDCEA");
+
+ List<ClientTextStyleVO> ticking = new ArrayList<ClientTextStyleVO>();
+ ticking.add(txt1);
+ ticking.add(txt2);
+ ticking.add(txt3);
+ rewardMap.put("ticking", ticking);
+ 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"));
+ rewardMap.put("jump", jump);
+ order.setRewardDetail(rewardMap);
+ }
+
+ @Override
+ public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day, Integer source) {
+ return commonOrderMapper.countHistoryOrder(uid, day, source);
+ }
+
+ @Override
+ public OrderCountVO getOrderCount(Long uid, Integer day, Integer source) {
+ return commonOrderMapper.getOrderCount(uid, day, source);
+ }
+
+ @Override
+ public long countBonusOrderNumber(Long uid, Integer type, Integer day, String startTime, String endTime,
+ Integer source) {
+ return commonOrderMapper.countBonusOrderNumber(uid, type, day, startTime, endTime, source);
+ }
+
+ @Override
+ public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer day, String startTime, String endTime,
+ Integer source) {
+ return commonOrderMapper.countBonusOrderMoney(uid, type, day, startTime, endTime, source);
+ }
+
+ @Override
+ public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime,
+ String endTime, Integer source) {
+ return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime, source);
+ }
+
+ @Override
+ public Long countUserOrderToApp(Long uid, Integer type, String startTime, String endTime, Integer day,
+ Integer source, Integer state, Integer stateOrder) {
+ return commonOrderMapper.countUserOrderToApp(uid, type, startTime, endTime, day, source, state, stateOrder);
+ }
+
+ private BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid) {
+ BigDecimal weiQuanMoney = new BigDecimal(0);
+ if (listWQ != null && listWQ.size() > 0) {
+ for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) {
+ String tradeId = weiQuanOrder.getOrderItemId();
+ // 鏌ヨ绾㈠寘
+ List<String> tradeList = new ArrayList<>();
+ tradeList.add(tradeId);
+ List<HongBaoV2> hongBaoList = hongBaoV2Service.listBySourceTypeAndTradeIdListAndUid(sourceType, uid,
+ tradeList);
+ if (hongBaoList != null && hongBaoList.size() > 0) {
+ CommonOrder commonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId);
+ if (commonOrder != null && commonOrder.getSettlement().compareTo(new BigDecimal(0)) > 0) {
+ BigDecimal wqMoney = MoneyBigDecimalUtil
+ .mul(hongBaoList.get(0).getMoney(), weiQuanOrder.getMoney())
+ .divide(commonOrder.getSettlement(), 2, BigDecimal.ROUND_UP);
+ if (wqMoney.compareTo(hongBaoList.get(0).getMoney()) > 0)
+ wqMoney = hongBaoList.get(0).getMoney();
+ weiQuanMoney = weiQuanMoney.add(wqMoney);
+ }
+ }
+ }
+ }
+ return weiQuanMoney;
}
@Override
@@ -642,10 +873,11 @@
return commonOrderMapper.listBySourceTypeAndOrderNo(sourceType, orderId);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
- public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid) throws CommonOrderException {
- List<CommonOrder> commonOrderList = new ArrayList<>();
+ public List<CommonOrderAddResultDTO> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid)
+ throws CommonOrderException {
+ List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();
// 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
int invalidCount = 0;
for (TaoBaoOrder tb : taoBaoOrders) {
@@ -703,10 +935,11 @@
return commonOrderList;
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
- public List<CommonOrder> addPDDOrder(List<PDDOrder> pddOrderList, Long uid) throws CommonOrderException {
- List<CommonOrder> commonOrderList = new ArrayList<>();
+ public List<CommonOrderAddResultDTO> addPDDOrder(List<PDDOrder> pddOrderList, Long uid)
+ throws CommonOrderException {
+ List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();
// 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
int invalidCount = 0;
for (PDDOrder order : pddOrderList) {
@@ -744,6 +977,7 @@
cog.setUpdateTime(new Date());
commonOrderGoodsMapper.insertSelective(cog);
newCommonOrder.setCommonOrderGoods(cog);
+ } else {
}
newCommonOrder.setUserInfo(new UserInfo(uid));
commonOrderList.add(addCommonOrder(newCommonOrder));
@@ -751,10 +985,10 @@
return commonOrderList;
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
- public List<CommonOrder> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException {
- List<CommonOrder> commonOrderList = new ArrayList<>();
+ public List<CommonOrderAddResultDTO> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException {
+ List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();
// 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
int invalidCount = 0;
for (JDOrderItem tb : jdOrder.getOrderItemList()) {
@@ -789,13 +1023,26 @@
if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
{
JDGoods goods = JDApiUtil.getGoodsDetail(itemOrder.getSkuId());
+ if (goods == null) {
+ goods = JDUtil.getGoodsFromWeb(itemOrder.getSkuId());
+ }
+
+ if (goods == null) {
+ goods = new JDGoods();
+ goods.setSkuName(itemOrder.getSkuName());
+ goods.setPrice(itemOrder.getPrice());
+ goods.setSkuId(itemOrder.getSkuId());
+ }
if (goods != null) {
cog = CommonOrderGoodsFactory.create(goods);
}
+
cog.setCreateTime(new Date());
cog.setUpdateTime(new Date());
commonOrderGoodsMapper.insertSelective(cog);
+ } else {
+
}
newCommonOrder.setUserInfo(new UserInfo(uid));
commonOrderList.add(addCommonOrder(newCommonOrder));
@@ -808,8 +1055,8 @@
*
* @param commonOrder
*/
- @Transactional
- private CommonOrder addCommonOrder(CommonOrder commonOrder) throws CommonOrderException {
+ @Transactional(rollbackFor=Exception.class)
+ private CommonOrderAddResultDTO addCommonOrder(CommonOrder commonOrder) throws CommonOrderException {
// 鍒ゆ柇鍟嗗搧鏄惁瀛樺湪
if (commonOrder == null)
throw new CommonOrderException(1, "璁㈠崟涓虹┖");
@@ -842,23 +1089,35 @@
if (!StringUtil.isNullOrEmpty(commonOrder.getTradeId()))
oldCommonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(commonOrder.getSourceType(),
commonOrder.getTradeId());
- else
- oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(),
- commonOrder.getSourceType(), commonOrder.getOrderBy());
-
+ else {
+ throw new CommonOrderException(10, "浜ゆ槗ID涓虹┖");
+ }
if (oldCommonOrder == null)// 鏂板
{
commonOrder.setCreateTime(new Date());
+ // 鏌ヨ鏄惁涓簐ip
+ boolean isVIP = userVIPInfoService.isVIP(commonOrder.getUserInfo().getId());
+ if (isVIP)
+ commonOrder.setUrank(100);// VIP璁㈠崟
+ else {
+ UserInfo user = userInfoService.selectAvailableByPrimaryKey(commonOrder.getUserInfo().getId());
+ if (user != null)
+ commonOrder.setUrank(user.getRank());
+ }
+
commonOrderMapper.insertSelective(commonOrder);
// 鎻掑叆鏄犲皠锛屼繚璇佷氦鏄揑D鐨勫畬鏁存��
commonOrderTradeIdMapMapper.insertSelective(new CommonOrderTradeIdMap(commonOrder.getId(),
commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));
- return commonOrder;
+ return new CommonOrderAddResultDTO(commonOrder, CommonOrderAddResultDTO.TYPE_ADD);
} else {// 淇敼
- // 宸茬粡缁撶畻锛屽凡缁忓け鏁堬紝鐘舵�佹湭鏀瑰彉鐨勮鍗曚笉澶勭悊
- if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX
+ // 闈炰含涓滃凡缁忕粨绠楋紝宸茬粡澶辨晥锛岀姸鎬佹湭鏀瑰彉鐨勮鍗曚笉澶勭悊
+ if ((oldCommonOrder.getState() == CommonOrder.STATE_JS
+ && oldCommonOrder.getSourceType() != Constant.SOURCE_TYPE_JD)
+ || oldCommonOrder.getState() == CommonOrder.STATE_SX
+ || oldCommonOrder.getState() == CommonOrder.STATE_WQ
|| (oldCommonOrder.getState().intValue() == commonOrder.getState())) {
- return oldCommonOrder;
+ return new CommonOrderAddResultDTO(oldCommonOrder, CommonOrderAddResultDTO.TYPE_NOUPDATE);
}
// 浜ゆ槗ID涓�鑷存墠淇敼
if (commonOrder.getTradeId() != null
@@ -874,9 +1133,10 @@
updateCommonOrder.setUpdateTime(new Date());
updateCommonOrder.setTradeId(commonOrder.getTradeId());
commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);
- return commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId());
+ return new CommonOrderAddResultDTO(commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId()),
+ CommonOrderAddResultDTO.TYPE_UPDATE);
} else
- return oldCommonOrder;
+ return new CommonOrderAddResultDTO(oldCommonOrder, CommonOrderAddResultDTO.TYPE_NOUPDATE);
}
}
@@ -969,10 +1229,18 @@
@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) throws CommonOrderException {
+ Integer type, Integer orderState, String startTime, String endTime, Integer source, List<Long> listShopId,
+ List<Long> listGoodsId, Date minTime, BigDecimal money) throws CommonOrderException {
- List<CommonOrderVO> list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState,
- startTime, endTime, source);
+ List<CommonOrderVO> list = null;
+
+ if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗�
+ list = commonOrderMapper.listQueryWithNoChild(start, count, keyType, key, state, type, orderState,
+ startTime, endTime, source);
+ } else {
+ list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState, startTime, endTime,
+ source, listShopId, listGoodsId, minTime, money);
+ }
if (list == null) {
list = new ArrayList<CommonOrderVO>();
@@ -981,7 +1249,7 @@
if (list.size() == 0) {
return list;
}
-
+
List<String> listTB = new ArrayList<String>();
List<String> listJD = new ArrayList<String>();
List<String> listPDD = new ArrayList<String>();
@@ -1002,17 +1270,17 @@
if (listTB.size() > 0) {
listRecordTB = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_TAOBAO, listTB);
}
-
- List<UserSystemCouponRecord> listRecordJD = null;
+
+ List<UserSystemCouponRecord> listRecordJD = null;
if (listJD.size() > 0) {
listRecordJD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_JD, listJD);
}
-
+
List<UserSystemCouponRecord> listRecordPDD = null;
if (listPDD.size() > 0) {
listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);
}
-
+
SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
for (CommonOrderVO order : list) {
@@ -1089,23 +1357,25 @@
}
}
}
-
-
+
Integer sourceType = order.getSourceType();
// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
if (sourceType == null) {
-
+
} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO && listRecordTB != null && listRecordTB.size() > 0) {
for (UserSystemCouponRecord couponRecord : listRecordTB) {
if (order.getOrderNo().equals(couponRecord.getOrderNo())) {
String systemCouponType = couponRecord.getCouponType();
Integer couponState = couponRecord.getState();
if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
- || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
- if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
+ || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
+ || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
+ if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
// 鍏嶅崟鎴愬姛
- order.setOtherState(1);
- }
+ order.setOtherState(2);
+ } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
+ order.setOtherState(1);
+ }
}
break;
}
@@ -1116,11 +1386,14 @@
String systemCouponType = couponRecord.getCouponType();
Integer couponState = couponRecord.getState();
if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
- || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
- if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
+ || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
+ || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
+ if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
// 鍏嶅崟鎴愬姛
- order.setOtherState(1);
- }
+ order.setOtherState(2);
+ } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
+ order.setOtherState(1);
+ }
}
break;
}
@@ -1131,11 +1404,14 @@
String systemCouponType = couponRecord.getCouponType();
Integer couponState = couponRecord.getState();
if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
- || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
- if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
+ || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
+ || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
+ if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
// 鍏嶅崟鎴愬姛
- order.setOtherState(1);
- }
+ order.setOtherState(2);
+ } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
+ order.setOtherState(1);
+ }
}
break;
}
@@ -1149,10 +1425,16 @@
@Override
public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
- String startTime, String endTime, Integer source) throws CommonOrderException {
- return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source);
+ String startTime, String endTime, Integer source, List<Long> listShopId, List<Long> listGoodsId,
+ Date minTime, BigDecimal money) throws CommonOrderException {
+ if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗�
+ return commonOrderMapper.countQueryWithNoChild(keyType, key, state, type, orderState, startTime, endTime,
+ source);
+ } else {
+ return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source,
+ listShopId, listGoodsId, minTime, money);
+ }
}
-
@Override
public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState, Integer sourceType)
@@ -1161,7 +1443,7 @@
if (sourceType == null) {
sourceType = Constant.SOURCE_TYPE_TAOBAO;
}
-
+
CommonOrderVO commonOrderVO = commonOrderMapper.getCommonOrderByOrderNo(uid, orderNo, orderState, sourceType);
// 璁㈠崟淇℃伅涓虹┖
if (commonOrderVO == null) {
@@ -1251,25 +1533,25 @@
return commonOrderVO;
}
-
@Override
- public JSONObject getRewardJumpInfo(String orderNo) {
+ public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType) {
JSONObject map = new JSONObject();
// 璁㈠崟鏍囪瘑
List<String> signList = new ArrayList<String>();
- signList.add(CommonOrder.TYPE_FANLI);
- signList.add(PIC_REWARD); // 鍔犲叆濂栧姳鎴愬姛鍥剧墖
+ // signList.add(CommonOrder.TYPE_FANLI);
+ // signList.add(PIC_REWARD); // 鍔犲叆濂栧姳鎴愬姛鍥剧墖
map.put("signList", signList);
ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
// 濂栧姳鍒歌繘搴﹁鎯�
- rewardStyleVO.setContent("杩斿埄濂栧姳 >");
+ rewardStyleVO.setContent("宸蹭娇鐢ㄥ鍔卞埜 >");
rewardStyleVO.setColor("#E5005C");
rewardStyleVO.setBottomColor("#FFDCEA");
Map<String, Object> jumpLink = new HashMap<String, Object>();
jumpLink.put("orderNo", orderNo);
+ jumpLink.put("goodsType", goodsType == null ? goodsType : goodsType + "");
Map<String, Object> jump = new HashMap<String, Object>();
jump.put("type", 1);
@@ -1279,9 +1561,7 @@
Map<String, Object> rewardMap = new HashMap<String, Object>();
rewardMap.put("text", rewardStyleVO);
rewardMap.put("jump", jump);
-
map.put("rewardDetail", rewardMap);
-
return map;
}
@@ -1331,4 +1611,570 @@
(page - 1) * pageSize, pageSize);
}
+ @Override
+ public List<CommonOrder> getByOrderNo(Long uid, String orderNO) {
+ return commonOrderMapper.getByOrderNo(uid, orderNO);
+ }
+
+ @Override
+ public CommonOrder selectLatestValidByUid(Long uid) {
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add(CommonOrder.STATE_FK);
+ stateList.add(CommonOrder.STATE_JS);
+ List<CommonOrder> commonOrderList = commonOrderMapper.listByUid(uid, stateList, 0, 1);
+ if (commonOrderList == null || commonOrderList.size() == 0)
+ return null;
+ return commonOrderList.get(0);
+ }
+
+ @Override
+ public CommonOrderVO firstValidOrderByUid(Long uid) {
+ return commonOrderMapper.firstValidOrderByUid(uid, null, null);
+ }
+
+ @Override
+ public CommonOrderVO firstValidOrderByUidAndType(Long uid, Integer type) {
+ return commonOrderMapper.firstValidOrderByUid(uid, type, null);
+ }
+
+ @Override
+ public CommonOrderVO firstValidOrderLastMonthByUidAndType(Long uid, Integer type) {
+ return commonOrderMapper.firstValidOrderByUid(uid, type, 4);
+ }
+
+ @Override
+ public CommonOrder getFirstShareOrderByUid(Long uid) {
+ return commonOrderMapper.getFirstShareOrderByUid(uid);
+ }
+
+ @Override
+ public BigDecimal getTotalRewardMoneyByOrderNoAndSourceType(String orderNo, Integer sourceType) {
+ return commonOrderMapper.getTotalRewardMoneyByOrderNoAndSourceType(orderNo, sourceType);
+ }
+
+ @Override
+ public long count24HValidOrderByUid(Long uid, Date minTime) {
+ return commonOrderMapper.count24HValidOrderByUid(uid, minTime);
+ }
+
+
+ @Override
+ public long countSearchOrderByUid(Long uid, List<ESOrder> list) {
+ return commonOrderMapper.countSearchOrderByUid(uid, list);
+ }
+
+ @Override
+ public List<CommonOrderVO> searchOrderByUid (int page, int size, Long uid, List<ESOrder> list) throws Exception {
+ List<CommonOrderVO> listVO = commonOrderMapper.searchOrderByUid((page-1) * size, size, uid, list);
+
+ // 璁㈠崟淇℃伅涓虹┖
+ if (listVO == null || listVO.size() == 0) {
+ listVO = new ArrayList<CommonOrderVO>();
+ return listVO;
+ }
+
+ // 鍟嗗搧淇℃伅
+ List<CommonOrderVO> listGoods = commonOrderMapper.listOrderGoodsInfo(listVO);
+ // 璁㈠崟鍟嗗搧涓虹┖
+ if (listGoods == null || listGoods.size() == 0) {
+ return listVO;
+ }
+
+ // 鏁版嵁鍔犲伐閲嶆柊缁勭粐
+ orderVOFactoryNew(listVO, listGoods, uid);
+
+ return listVO;
+ }
+
+
+ /**
+ * 璁㈠崟淇℃伅鍔犲伐
+ *
+ * @param acceptData
+ * @param listOrder
+ * @param listGoods
+ * @param uid
+ */
+ private void orderVOFactoryNew(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();
+ if (sourceType == null) {
+ continue;
+ } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
+ listTB.add(commonOrderVO.getOrderNo());
+ } else if (sourceType == Constant.SOURCE_TYPE_JD) {
+ listJD.add(commonOrderVO.getOrderNo());
+ } else if (sourceType == Constant.SOURCE_TYPE_PDD) {
+ listPDD.add(commonOrderVO.getOrderNo());
+ }
+ }
+
+ List<UserSystemCouponRecord> listRecordTB = null;
+ if (listTB.size() > 0) {
+ listRecordTB = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_TAOBAO, listTB);
+ }
+
+ List<UserSystemCouponRecord> listRecordJD = null;
+ if (listJD.size() > 0) {
+ listRecordJD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_JD, listJD);
+ }
+
+ List<UserSystemCouponRecord> listRecordPDD = null;
+ if (listPDD.size() > 0) {
+ 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();
+
+ // 鍟嗗搧淇℃伅缁勫悎
+ for (CommonOrderVO commonOrder : listGoods) {
+ CommonOrderGoods goods = commonOrder.getCommonOrderGoods();
+ if (goods == null) {
+ continue;
+ }
+
+ if (sourceType.equals(commonOrder.getSourceType()) && orderNo.equals(commonOrder.getOrderNo())) {
+ CommonOrderGoodsVO commonGoodsVO = new CommonOrderGoodsVO();
+ PropertyUtils.copyProperties(commonGoodsVO, goods);
+ commonGoodsVO.setGoodsType(sourceType);
+
+ // 娣樺疂鍟嗗搧鍥剧墖澶勭悊
+ String picture = commonGoodsVO.getPicture();
+ if (sourceType == Constant.SOURCE_TYPE_TAOBAO && !StringUtil.isNullOrEmpty(picture)
+ && !picture.contains("320x320")) {
+ commonGoodsVO.setPicture(TbImgUtil.getTBSize320Img(picture));
+ }
+
+ // 璐拱鏁伴噺
+ commonGoodsVO.setActualCount(commonOrder.getTotalCount() + "浠�");
+
+ // 瀹炰粯娆�
+ BigDecimal totalSettlement = commonOrder.getTotalSettlement();
+ if (totalSettlement == null || totalSettlement.compareTo(new BigDecimal(0)) <= 0) {
+ totalSettlement = commonOrder.getTotalPayment();
+ }
+ 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
+ || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
+ Map<String, String> titleMap = new HashMap<String, String>();
+ titleMap.put("content", "涓轰繚闅滅敤鎴烽殣绉侊紝鍟嗗搧淇℃伅宸查殣钘�!");
+ titleMap.put("fontColor", "#888888");
+ titleMap.put("bottomColor", "#E9E9E9");
+ commonGoodsVO.setTitle(null);
+ commonGoodsVO.setGoodsTitle(titleMap);
+ }
+
+ // 璁㈠崟绫诲瀷涓虹┖鏃� 宸插晢鍝佺被涓哄噯
+ 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);
+ }
+ }
+
+ order.getListOrderGoods().add(commonGoodsVO);
+ }
+ }
+
+ Date thirdCreateTime = order.getThirdCreateTime();
+ if (thirdCreateTime != null) {
+ order.setDownTime("涓嬪崟鏃堕棿锛�" + format.format(thirdCreateTime));
+ order.setObtainTime(thirdCreateTime.getTime());
+ }
+
+ Date settleTime = order.getSettleTime();
+ if (settleTime != null) {
+ 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) {
+ // 鏁翠釜璁㈠崟閮ㄥ垎澶辨晥锛氬垽鏂湡瀹炵姸鎬� 璁㈠崟銆佺孩鍖�
+ CommonOrderVO buFenOrder = commonOrderMapper.getBuFenOrderState(uid, order.getOrderNo());
+ if (buFenOrder != null) {
+ // 鏈夋晥鐨勮鍗曠姸鎬�
+ orderState = buFenOrder.getState();
+ // 鏈夋晥鐨勭孩鍖呯姸鎬�
+ hongBaoState = buFenOrder.getHongBaoState();
+ }
+ }
+
+ BigDecimal hongBao = order.getHongBao();
+ if (hongBao == null) {
+ hongBao = new BigDecimal(0);
+ }
+
+ if (CommonOrder.STATE_FK == orderState) {
+ orderStateContent = "宸蹭粯娆�";
+ } else if (CommonOrder.STATE_JS == orderState) {
+ orderStateContent = "宸叉敹璐�";
+ } else if (CommonOrder.STATE_SX == orderState) {
+ orderStateContent = "鏈粯娆�/宸查��娆�";
+ } else if (CommonOrder.STATE_WQ == orderState) {
+ orderStateContent = "宸插敭鍚�";
+ if (sourceType != null && 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()) {
+ 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);
+ }
+ }
+ }
+ 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);
+ } 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
+ || 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);
+
+ String hongBaoDate = null;
+ String hongBaoState_Str = "";
+ String hongbaoInfoFontColor = "#E5005C";
+
+ /* 绾㈠寘鐘舵�� 杞崲 */
+ 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 = "宸插け鏁�";
+ hongbaoInfoFontColor = "#888888";
+ }
+ order.setHongBaoState(orderHongBaoState);
+ order.setHongBaoDate(hongBaoDate);
+
+ if (!StringUtil.isNullOrEmpty(order.getStateDesc())) {
+ stateContent = stateContent + "-" + order.getStateDesc();
+ }
+
+ Map<String, String> stateMap = new HashMap<String, String>();
+ stateMap.put("content", stateContent);
+ 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("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) {
+ order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo()));
+ }
+ }
+ }
+
+ /**
+ * 璁㈠崟锛� 鍏嶅崟鏍囪瘑 濂栧姳鏍囪瘑
+ *
+ * @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;
+
+ 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)) {
+
+ 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);
+ }
+ }
+ break;
+ }
+ }
+ }
+
+ // 鍏嶅崟璇︽儏
+ if (freeOrder) {
+ ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
+ rewardStyleVO.setContent("鍏嶅崟璇︽儏 >");
+ 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);
+ }
+ }
+ }
+
+
}
--
Gitblit v1.8.0