From 469bba3a544b3beef0c170f6fce5804c9e8a9676 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期五, 10 四月 2020 17:02:51 +0800 Subject: [PATCH] 消息 --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 437 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 433 insertions(+), 4 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 25c333b..e21b765 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 @@ -86,6 +86,7 @@ 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; @@ -230,7 +231,7 @@ // 鏁版嵁鍔犲伐閲嶆柊缁勭粐 if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) { - orderVOFactoryNew(acceptData, listOrder, listGoods, uid); + orderVOFactory21(acceptData, listOrder, listGoods, uid); } else { orderVOFactory(acceptData, listOrder, listGoods, uid); } @@ -313,7 +314,8 @@ 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) { @@ -867,7 +869,9 @@ 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) { @@ -1776,7 +1780,11 @@ } // 鏁版嵁鍔犲伐閲嶆柊缁勭粐 - orderVOFactoryNew(acceptData, 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; } @@ -2288,4 +2296,425 @@ 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) 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); + + // 璁㈠崟淇℃伅涓虹┖ + 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) throws CommonOrderException { + return commonOrderMapper.countOrderList(uid, state, type, orderState, orderNo, startTime, endTime, dateType, + listSource); + } + + + + /** + * 璁㈠崟淇℃伅鍔犲伐 + * + * @param acceptData + * @param listOrder + * @param listGoods + * @param uid + */ + 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 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) { + Integer urank = order.getUrank(); + if (urank != null) { + String levelName = UserLevelUtil.getLevelName(urank); + if (!StringUtil.isNullOrEmpty(levelName)) { + order.setOrderDesc("璁㈠崟鏉ユ簮锛�" + levelName); + } + } + } + + Integer sourceType = order.getSourceType(); + if (sourceType == null) { + continue; + } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) { + listTB.add(order.getOrderNo()); + } else if (sourceType == Constant.SOURCE_TYPE_JD) { + listJD.add(order.getOrderNo()); + } else if (sourceType == Constant.SOURCE_TYPE_PDD) { + listPDD.add(order.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); + } + + + SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm"); + SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd"); + // 鏄惁瀛樺湪濂栧姳鍒� + for (CommonOrderVO order : listOrder) { + String orderNo = order.getOrderNo(); + Integer sourceType = order.getSourceType(); + Integer hongBaoType = order.getHongBaoType(); + + // 鍟嗗搧淇℃伅缁勫悎 + 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); + if (commonGoodsVO.getGoodsType() == null) { + 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); + + // 閭�璇疯鍗曚俊鎭繚鎶� + 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); + } + + // 璁㈠崟绫诲瀷涓虹┖鏃� 宸插晢鍝佺被涓哄噯 + 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) { + order.setDownTime("涓嬪崟鏃堕棿锛�" + format.format(thirdCreateTime)); + order.setObtainTime(thirdCreateTime.getTime()); + } + + Date settleTime = order.getSettleTime(); + if (settleTime != null) { + order.setReceiveTime("鏀惰揣鏃堕棿锛�" + format.format(settleTime)); + } + + + Map<String, String> orderStateMap = new HashMap<String, String>(); + // 璁㈠崟鐘舵�� + Integer orderState = order.getState(); + Integer stateWholeOrder = order.getStateWholeOrder(); + if (CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO == stateWholeOrder) { + // 鏁翠釜璁㈠崟閮ㄥ垎澶辨晥锛氬垽鏂湡瀹炵姸鎬� 璁㈠崟銆佺孩鍖� + CommonOrderVO buFenOrder = commonOrderMapper.getBuFenOrderState(uid, order.getOrderNo()); + if (buFenOrder != null) { + // 鏈夋晥鐨勮鍗曠姸鎬� + orderState = buFenOrder.getState(); + } + } + + // 鏄剧ず杩斿埄璇存槑杩炴帴> 鏈け鏁� + 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) { + orderStateContent = "宸叉敹璐�"; + } else if (CommonOrder.STATE_SX == orderState) { + orderStateContent = "鏈粯娆�/宸查��娆�"; + } else if (CommonOrder.STATE_WQ == orderState) { + orderStateContent = "宸插敭鍚�"; + if (sourceType == Constant.SOURCE_TYPE_TAOBAO) { + /* 璁㈠崟缁存潈 鍒ゆ柇鏄惁鍏ㄩ儴缁存潈 */ + List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper.selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛"); + BigDecimal weiQuanMoney = getWeiQuanMoney(listWQ, sourceType, uid); + hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney); + } + } + orderStateMap.put("content", orderStateContent); + orderStateMap.put("fontColor", "#666666"); + order.setOrderState(orderStateMap); + + String hongbaoInfo = ""; + // 璁㈠崟鏍囪瘑 + List<String> signList = new ArrayList<String>(); + /* 璁㈠崟杩斿埄绫诲瀷 杞崲 */ + 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 + || 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); + } + 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_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_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 couponUseFactory(CommonOrderVO order, List<UserSystemCouponRecord> list) throws Exception { + if (list == null || list.size() == 0) { + return; + } + + // 鏄惁鍏嶅崟鍟嗗搧 + boolean freeOrder = false; + // 鏄惁濂栧姳鎴愬姛 + boolean rewardSuccess = false; + for (UserSystemCouponRecord couponRecord : list) { + int goodSource = couponRecord.getGoodSource(); + if (goodSource == 0) + goodSource = 1; + + 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) { + // 宸蹭娇鐢ㄥ鍔卞埜 + 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); + } + } } -- Gitblit v1.8.0