From 7e37f77192fa701e309fa04f821aa5fd5259ca33 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 01 四月 2020 09:28:31 +0800
Subject: [PATCH] 队员列表
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 222 +++++++++++++++++++++++++++---------------------------
1 files changed, 111 insertions(+), 111 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 da7e0cb..da9cc4e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -17,10 +17,14 @@
import org.yeshi.utils.entity.DateInfo;
import org.yeshi.utils.taobao.TbImgUtil;
+import com.aliyun.openservices.ons.api.Message;
+import com.aliyun.openservices.ons.api.Producer;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderTradeIdMapMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
+import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;
+import com.yeshi.fanli.dto.mq.order.body.OrderConfirmMQMsg;
import com.yeshi.fanli.dto.order.CommonOrderAddResultDTO;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.entity.accept.AcceptData;
@@ -59,6 +63,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -71,6 +76,8 @@
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.rocketmq.MQMsgBodyFactory;
+import com.yeshi.fanli.util.rocketmq.MQTopicName;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.user.UserLevelUtil;
@@ -129,6 +136,12 @@
@Resource
private UserInfoService userInfoService;
+
+ @Resource
+ private UserInviteService userInviteService;
+
+ @Resource(name = "producer")
+ private Producer orderProducer;
// 濂栧姳璁㈠崟鍥剧墖
public final static String PIC_REWARD = "http://img.flqapp.com/resource/order/order_state_reward.png";
@@ -272,38 +285,22 @@
}
Map<Long, Boolean> vipUserMap = userVIPInfoService.listByUids(needSelectVIPUidList);
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- 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);
- }
- }
- }
- }
- } else {
- // 璁剧疆鏄惁涓簐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
+ // 璁剧疆鏄惁涓簐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("璁㈠崟鏉ユ簮锛氱敱瓒呯骇浼氬憳鐨勭矇涓濅骇鐢�");
- }
+ if (order.isVipOrder())
+ order.setVipOrderDesc("璁㈠崟鏉ユ簮锛氱敱瓒呯骇浼氬憳鐨勭矇涓濅骇鐢�");
}
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
@@ -315,14 +312,11 @@
boolean vip = userVIPInfoService.isVIP(uid);
// 鏄惁瀛樺湪濂栧姳鍒�
boolean hasRewardCoupon = userSystemCouponService.getValidRebateCoupon(uid);
- long nowTime = java.lang.System.currentTimeMillis();
for (CommonOrderVO order : listOrder) {
String orderNo = order.getOrderNo();
Integer sourceType = order.getSourceType();
Integer hongBaoType = order.getHongBaoType();
- BigDecimal totalPay = new BigDecimal(0);
- BigDecimal totalActual = new BigDecimal(0);
// 鍟嗗搧淇℃伅缁勫悎
for (CommonOrderVO commonOrder : listGoods) {
CommonOrderGoods goods = commonOrder.getCommonOrderGoods();
@@ -352,15 +346,6 @@
}
commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
- totalPay = MoneyBigDecimalUtil.add(totalPay, totalSettlement);
-
- // 鍟嗗搧浠锋牸
- BigDecimal actualPrice = commonGoodsVO.getActualPrice();
- if (actualPrice != null) {
- Integer totalCount = commonOrder.getTotalCount();
- totalActual = MoneyBigDecimalUtil.add(totalActual,
- MoneyBigDecimalUtil.mul(new BigDecimal(totalCount), actualPrice));
- }
// 閭�璇疯鍗曚俊鎭繚鎶�
if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
@@ -392,16 +377,6 @@
Date thirdCreateTime = order.getThirdCreateTime();
order.setDownTime("涓嬪崟鏃堕棿锛�" + format.format(thirdCreateTime));
order.setObtainTime(thirdCreateTime.getTime());
-
- // 2.1鍒嗕韩璁㈠崟鍜岃繑鍒╄鍗曞疄浠橀噾棰濆ぇ浜庢垨鑰呭皬浜庡埜鍚庝环鐨勬椂鍊欙紝璁㈠崟椤甸潰 鍙樉绀�3澶� 涓嬪崟鏃堕棿寮�濮�
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- if (HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
- && DateUtil.plusDayDate(3, thirdCreateTime).getTime() > nowTime
- && totalPay.compareTo(totalActual) != 0) {
- order.setFanliDesc("鐢卞疄浠橀噾棰�*杩斿埄姣旇绠楄�屾潵");
- order.setFanliDescLink(configService.get(ConfigKeyEnum.shareOrderRebateDescLink.getKey()));
- }
- }
Date settleTime = order.getSettleTime();
if (settleTime != null) {
@@ -1033,7 +1008,53 @@
newCommonOrder.setUserInfo(new UserInfo(uid));
commonOrderList.add(addCommonOrder(newCommonOrder));
}
+ addConfirmMQMsg(commonOrderList);
return commonOrderList;
+ }
+
+ private void addConfirmMQMsg(List<CommonOrderAddResultDTO> resultList) {
+
+ // 璁㈠崟鏄惁鏂板鎴栬�呮洿鏂拌繃
+ boolean isAddOrUpdate = false;
+ for (CommonOrderAddResultDTO dto : resultList)
+ if (dto.getType() == CommonOrderAddResultDTO.TYPE_ADD
+ || dto.getType() == CommonOrderAddResultDTO.TYPE_UPDATE) {
+ isAddOrUpdate = true;
+ break;
+ }
+ boolean hasSettleOrder = false;
+ // 鏌ヨ鏄惁鏈夌粨绠楃殑璁㈠崟
+ if (isAddOrUpdate) {
+ for (CommonOrderAddResultDTO dto : resultList) {
+ if (dto.getCommonOrder().getSettleTime() != null && dto.getCommonOrder().getSettlement() != null) {
+ hasSettleOrder = true;
+ break;
+ }
+ }
+ }
+ // 鏈夌粨绠楃殑璁㈠崟
+ if (hasSettleOrder) {
+ if (!Constant.IS_TEST) {
+ // 缁熻缁撶畻閲戦
+ BigDecimal settlement = new BigDecimal("0");
+ CommonOrder firstOrder = null;
+ for (CommonOrderAddResultDTO dto : resultList)
+ if (dto.getCommonOrder().getSettlement() != null) {
+ settlement = settlement.add(dto.getCommonOrder().getSettlement());
+ if (firstOrder == null)
+ firstOrder = dto.getCommonOrder();
+ }
+ if (firstOrder != null) {
+ Date placeDate = firstOrder.getThirdCreateTime();
+ OrderConfirmMQMsg mqMsg = new OrderConfirmMQMsg(firstOrder.getOrderNo(), firstOrder.getSourceType(),
+ settlement, firstOrder.getUserInfo().getId(), placeDate, new Date());
+ Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderConfirm,
+ mqMsg);
+ orderProducer.send(msg);
+ }
+ }
+ }
+
}
@Transactional(rollbackFor = Exception.class)
@@ -1713,6 +1734,14 @@
return commonOrderMapper.countSearchOrderByUid(uid, list);
}
+
+ @Override
+ public List<CommonOrder> getMinSettleTimeAndUid() {
+ return commonOrderMapper.getMinSettleTimeAndUid();
+ }
+
+
+
@Override
public List<CommonOrderVO> searchOrderByUid(AcceptData acceptData, int page, int size, Long uid, List<ESOrder> list)
throws Exception {
@@ -1787,39 +1816,18 @@
|| order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI)
needSelectVIPUidList.add(Long.parseLong(order.getUserId()));
}
- Map<Long, Boolean> vipUserMap = userVIPInfoService.listByUids(needSelectVIPUidList);
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- 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);
- }
+ 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);
}
}
-
- }
- } else {
- // 璁剧疆鏄惁涓簐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("璁㈠崟鏉ユ簮锛氱敱瓒呯骇浼氬憳鐨勭矇涓濅骇鐢�");
}
}
@@ -1828,19 +1836,15 @@
// 2019.8.1寮�濮嬭繑鍥炵淮鏉冧俊鎭�
Date august = TimeUtil.parse("2019-08-01");
- // 褰撳墠鐢ㄦ埛鏄惁VIP
- boolean vip = userVIPInfoService.isVIP(uid);
+ // 褰撳墠鐢ㄦ埛鏄惁鍙互浣跨敤濂栧姳鍒�
+ boolean isvip = userInviteService.verifyVIP(uid);
// 鏄惁瀛樺湪濂栧姳鍒�
boolean hasRewardCoupon = userSystemCouponService.getValidRebateCoupon(uid);
- long nowTime = java.lang.System.currentTimeMillis();
for (CommonOrderVO order : listOrder) {
String orderNo = order.getOrderNo();
Integer sourceType = order.getSourceType();
Integer hongBaoType = order.getHongBaoType();
-
- BigDecimal totalPay = new BigDecimal(0);
- BigDecimal totalActual = new BigDecimal(0);
// 鍟嗗搧淇℃伅缁勫悎
for (CommonOrderVO commonOrder : listGoods) {
@@ -1871,16 +1875,6 @@
}
commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
- totalPay = MoneyBigDecimalUtil.add(totalPay, totalSettlement);
-
- // 鍟嗗搧浠锋牸
- BigDecimal actualPrice = commonGoodsVO.getActualPrice();
- if (actualPrice != null) {
- Integer totalCount = commonOrder.getTotalCount();
- totalActual = MoneyBigDecimalUtil.add(totalActual,
- MoneyBigDecimalUtil.mul(new BigDecimal(totalCount), actualPrice));
- }
-
// 閭�璇疯鍗曚俊鎭繚鎶�
if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
|| HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
@@ -1903,6 +1897,11 @@
order.setOrderType(2);
}
}
+
+ Integer goodsType = commonGoodsVO.getGoodsType();
+ if (goodsType != null & goodsType == 6) {
+ order.setOrderType(5); // 楗夸簡涔堣鍗�
+ }
order.getListOrderGoods().add(commonGoodsVO);
}
@@ -1912,16 +1911,6 @@
if (thirdCreateTime != null) {
order.setDownTime("涓嬪崟鏃堕棿锛�" + format.format(thirdCreateTime));
order.setObtainTime(thirdCreateTime.getTime());
- }
-
- // 2.1鍒嗕韩璁㈠崟鍜岃繑鍒╄鍗曞疄浠橀噾棰濆ぇ浜庢垨鑰呭皬浜庡埜鍚庝环鐨勬椂鍊欙紝璁㈠崟椤甸潰 鍙樉绀�3澶� 涓嬪崟鏃堕棿寮�濮�
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType
- && DateUtil.plusDayDate(3, thirdCreateTime).getTime() > nowTime
- && totalPay.compareTo(totalActual) != 0) {
- order.setFanliDesc("鐢卞疄浠橀噾棰�*杩斿埄姣旇绠楄�屾潵");
- order.setFanliDescLink(configService.get(ConfigKeyEnum.shareOrderRebateDescLink.getKey()));
- }
}
Date settleTime = order.getSettleTime();
@@ -1960,6 +1949,17 @@
}
}
+
+ // 2.1鏄剧ず杩斿埄璇存槑杩炴帴>
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (CommonOrder.STATE_SX != orderState && thirdCreateTime.getTime() > TimeUtil.convertDateToTemp(Constant.ORDER_SHOW_BRACE_TIME)) {
+ String rebateLink = configService.get(ConfigKeyEnum.orderRebateDescLink.getKey());
+ order.setRebateLink(rebateLink + "?orderNo=" + orderNo +"&sourceType=" + sourceType);
+ }
+ }
+
+
+
BigDecimal hongBao = order.getHongBao();
if (hongBao == null) {
hongBao = new BigDecimal(0);
@@ -2113,13 +2113,13 @@
if (HongBaoV2.TYPE_ZIGOU == hongBaoType) {
// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
if (sourceType == null) {
- couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, vip);
+ couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, isvip);
} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, vip);
+ couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, isvip);
} else if (sourceType == Constant.SOURCE_TYPE_JD) {
- couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, vip);
+ couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, isvip);
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
- couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, uid, vip);
+ couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, uid, isvip);
}
}
--
Gitblit v1.8.0