From 89cc8f054c27f70fcfe16f14554a8a12e0c19e23 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 18 十二月 2019 09:22:31 +0800
Subject: [PATCH] 邀请统计
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 668 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 428 insertions(+), 240 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 e13ab17..a6075af 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
@@ -1,7 +1,6 @@
package com.yeshi.fanli.service.impl.order;
import java.math.BigDecimal;
-import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -14,6 +13,8 @@
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;
@@ -34,6 +35,7 @@
import com.yeshi.fanli.entity.order.CommonOrderGoods;
import com.yeshi.fanli.entity.order.CommonOrderTradeIdMap;
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;
@@ -49,8 +51,11 @@
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;
@@ -68,6 +73,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.OrderCountVO;
import com.yeshi.fanli.vo.order.WeiQuanInfo;
import net.sf.json.JSONObject;
@@ -110,6 +116,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";
@@ -167,7 +182,7 @@
@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 {
+ throws CommonOrderException, Exception {
int pageSize = Constant.PAGE_SIZE;
@@ -188,69 +203,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, 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;
- }
-
- 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>();
@@ -282,37 +249,76 @@
listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);
}
- /* 缁勫悎鍟嗗搧淇℃伅 */
- for (CommonOrderVO commonOrder : listGoods) {
- CommonOrderGoods goods = commonOrder.getCommonOrderGoods();
- if (goods == null) {
- continue;
- }
+ // 闇�瑕佹煡璇㈡槸鍚︿负VIP鐨勭敤鎴稩D,鍙湁閭�璇疯鍗曟墠闇�瑕佹煡璇�
+ List<Long> needSelectVIPUidList = new ArrayList<>();
- String orderNo1 = commonOrder.getOrderNo();
- Integer sourceType = commonOrder.getSourceType();
- for (CommonOrderVO order : listOrder) {
- String orderNo2 = order.getOrderNo();
- Integer sourceType2 = order.getSourceType();
+ 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);
- // 鏉ユ簮銆佽鍗曞彿鐩稿悓
- if (sourceType.equals(sourceType2) && orderNo1.equals(orderNo2)) {
- // 鍔犲叆鍟嗗搧淇℃伅
- List<CommonOrderGoodsVO> listOrderGoods = order.getListOrderGoods();
+ // 璁剧疆鏄惁涓簐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);
- commonGoodsVO.setGoodsType(sourceType2);
-
+ // 娣樺疂鍟嗗搧鍥剧墖澶勭悊
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();
// 閭�璇疯鍗曚俊鎭繚鎶�
@@ -327,16 +333,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);
-
+ // 璁㈠崟绫诲瀷涓虹┖鏃� 宸插晢鍝佺被涓哄噯
Integer orderType = order.getOrderType();
if (orderType == null) {
String shopType = commonGoodsVO.getShopType();
@@ -346,31 +343,10 @@
order.setOrderType(2);
}
}
- listOrderGoods.add(commonGoodsVO);
- 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);
- boolean hasRewardCoupon = userSystemCouponService.getIncludeNotExchange(uid);
- boolean exchangeCoupon = userSystemCouponService.getIncludeExchange(uid);
-
- // 2019.8.1寮�濮嬭繑鍥炵淮鏉冧俊鎭�
- Date august = null;
- try {
- august = TimeUtil.parse("2019-08-01");
- } catch (ParseException e) {
- e.printStackTrace();
- }
-
- /* 缁勭粐璁㈠崟鐘舵�� 绛変俊鎭� */
- for (CommonOrderVO order : listOrder) {
Date thirdCreateTime = order.getThirdCreateTime();
if (thirdCreateTime != null) {
@@ -383,22 +359,20 @@
order.setReceiveTime("鏀惰揣鏃堕棿锛�" + format.format(settleTime));
}
- Integer sourceType2 = order.getSourceType();
- if (sourceType2 == Constant.SOURCE_TYPE_TAOBAO) {
+ // 璁㈠崟绫诲瀷
+ if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
Integer orderType = order.getOrderType();
- if (orderType == null) {
+ if (orderType == null)
order.setOrderType(1);
- }
- } else if (sourceType2 == Constant.SOURCE_TYPE_JD) {
+ } else if (sourceType == Constant.SOURCE_TYPE_JD) {
order.setOrderType(3);
- } else if (sourceType2 == Constant.SOURCE_TYPE_PDD) {
+ } else if (sourceType == Constant.SOURCE_TYPE_PDD) {
order.setOrderType(4);
}
/* 璁㈠崟鐘舵�� 杞崲澶勭悊 */
String orderStateContent = "";
Map<String, String> orderStateMap = new HashMap<String, String>();
-
// 璁㈠崟鐘舵��
Integer orderState = order.getState();
// 绾㈠寘鐘舵��
@@ -428,9 +402,7 @@
} 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
@@ -448,20 +420,12 @@
} else {
// 2019.8.1 杩斿洖缁存潈淇℃伅
if (settleTime != null && august != null && settleTime.getTime() > august.getTime()) {
- orderStateContent = "缁存潈鎴愬姛";
+ orderStateContent = "鍞悗鎴愬姛";
WeiQuanInfo weiQuanInfo = new WeiQuanInfo();
weiQuanInfo.setOldHongBao("楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
- // if (isPart) {
weiQuanInfo
- .setWqHongBao("缁存潈锛�-楼" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ .setWqHongBao("鍞悗锛�-楼" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
- // } else {
- // weiQuanInfo
- // .setWqHongBao("缁存潈锛�-楼" + weiQuanMoney.setScale(2,
- // BigDecimal.ROUND_DOWN).toString());
- // hongBao = MoneyBigDecimalUtil.sub(hongBao,
- // weiQuanMoney);
- // }
order.setWeiQuanInfo(weiQuanInfo);
}
}
@@ -489,15 +453,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_1(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 = "";
@@ -543,6 +537,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);
@@ -555,24 +553,20 @@
hongBaoMap.put("fontColor", hongbaoInfoFontColor);
order.setHongBaoInfo(hongBaoMap);
- Integer sourceType = order.getSourceType();
- // 闈炶嚜璐殑璁㈠崟 涓嶆樉绀鸿繑鍒┿�佸厤鍗曡鎯�
- if (HongBaoV2.TYPE_ZIGOU != hongBaoType) {
- order.setSignList(signList);
- } else {
+ // 鏄剧ず杩斿埄銆佸厤鍗曡鎯�
+ if (HongBaoV2.TYPE_ZIGOU == hongBaoType) {
// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
if (sourceType == null) {
- setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, null,
- signList, acceptData);
+ couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, vip, acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
- listRecordTB, signList, acceptData);
+ couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, vip,
+ acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_JD) {
- setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
- listRecordJD, signList, acceptData);
+ couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, vip,
+ acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
- setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
- listRecordPDD, signList, acceptData);
+ couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, uid, vip,
+ acceptData);
}
}
@@ -594,27 +588,31 @@
* @param list
* @param signList
*/
- public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, boolean exchangeCoupon,
- Integer hongBaoState, Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList,
- AcceptData acceptData) {
+ 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_1(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.freeCouponBuy.name().equals(systemCouponType)) {
@@ -622,83 +620,26 @@
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);
-
- // 1.6.5 鏄惁瀛樺湪鏂板厬鎹㈢殑鍒�
- if (!hasRewardCoupon && exchangeCoupon) {
- try {
- Date thirdCreateTime = order.getThirdCreateTime();
- if (thirdCreateTime != null) {
- long downOrderTime = thirdCreateTime.getTime();
- long limitDate = TimeUtil.convertDateToTemp("2019-09-05");
- if (downOrderTime > limitDate)
- hasRewardCoupon = true;
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- 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());
- 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", 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");
@@ -706,7 +647,7 @@
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()+"");
+ jumpLink.put("goodsType", order.getSourceType() + "");
}
Map<String, Object> jump = new HashMap<String, Object>();
@@ -717,9 +658,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
@@ -949,14 +1094,26 @@
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 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 new CommonOrderAddResultDTO(oldCommonOrder, CommonOrderAddResultDTO.TYPE_NOUPDATE);
@@ -1071,17 +1228,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 = null;
if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗�
list = commonOrderMapper.listQueryWithNoChild(start, count, keyType, key, state, type, orderState,
startTime, endTime, source);
- } else
+ } else {
list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState, startTime, endTime,
- source);
+ source, listShopId, listGoodsId, minTime, money);
+ }
if (list == null) {
list = new ArrayList<CommonOrderVO>();
@@ -1266,12 +1424,15 @@
@Override
public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
- String startTime, String endTime, Integer source) throws CommonOrderException {
+ 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);
+ } else {
+ return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source,
+ listShopId, listGoodsId, minTime, money);
+ }
}
@Override
@@ -1377,19 +1538,19 @@
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 +"");
+ jumpLink.put("goodsType", goodsType == null ? goodsType : goodsType + "");
Map<String, Object> jump = new HashMap<String, Object>();
jump.put("type", 1);
@@ -1399,9 +1560,7 @@
Map<String, Object> rewardMap = new HashMap<String, Object>();
rewardMap.put("text", rewardStyleVO);
rewardMap.put("jump", jump);
-
map.put("rewardDetail", rewardMap);
-
return map;
}
@@ -1467,4 +1626,33 @@
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);
+ }
}
--
Gitblit v1.8.0