From c649b8d239684694cae80279e27dda5d2130a576 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 16 四月 2019 18:48:05 +0800
Subject: [PATCH] 阿里云验证码完善
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 652 +++++++++++++++++++++++++++--------------------------------
1 files changed, 298 insertions(+), 354 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index 90402ea..eb972a2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -16,40 +17,28 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import com.yeshi.fanli.dao.mybatis.AccountDetailsMapper;
import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;
import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;
import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;
-import com.yeshi.fanli.dao.mybatis.MoneyRecordMapper;
-import com.yeshi.fanli.dao.mybatis.PidOrderMapper;
-import com.yeshi.fanli.dao.mybatis.ThreeSaleGiftMapper;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
-import com.yeshi.fanli.dao.mybatis.hongbao.HongBaoMapper;
import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;
import com.yeshi.fanli.dao.mybatis.order.HongBaoOrderMapper;
-import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;
import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
import com.yeshi.fanli.dao.mybatis.share.PidUserMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
-import com.yeshi.fanli.entity.bus.user.AccountDetails;
-import com.yeshi.fanli.entity.bus.user.HongBao;
-import com.yeshi.fanli.entity.bus.user.HongBaoExtra;
+import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
-import com.yeshi.fanli.entity.bus.user.MoneyRecord;
import com.yeshi.fanli.entity.bus.user.Order;
-import com.yeshi.fanli.entity.bus.user.OrderItem;
+import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.order.HongBaoOrder;
-import com.yeshi.fanli.entity.taobao.PidOrder;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
-import com.yeshi.fanli.entity.taobao.TaobaoOrderHongBao;
import com.yeshi.fanli.exception.HongBaoException;
-import com.yeshi.fanli.exception.ObjectStateException;
import com.yeshi.fanli.exception.OrderItemException;
import com.yeshi.fanli.exception.TaoBaoWeiQuanException;
import com.yeshi.fanli.exception.money.UserMoneyDetailException;
@@ -57,32 +46,29 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
+import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.LostOrderService;
-import com.yeshi.fanli.service.inter.order.OrderItemServcie;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.OrderService;
-import com.yeshi.fanli.service.inter.order.PidOrderService;
import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;
+import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserNotificationService;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.CMQManager;
-import com.yeshi.fanli.util.HongBaoUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.factory.AccountDetailsFactory;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
+import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
@Service
public class OrderProcessServiceImpl implements OrderProcessService {
-
- @Resource
- private PidOrderMapper pidOrderMapper;
@Resource
private OrderMapper orderMapper;
@@ -91,37 +77,13 @@
private PidUserMapper pidUserMapper;
@Resource
- private HongBaoService hongBaoService;
-
- @Resource
- private OrderItemServcie orderItemService;
-
- @Resource
- private PidOrderService pidOrderService;
-
- @Resource
private UserInfoMapper userInfoMapper;
-
- @Resource
- private OrderItemMapper orderItemMapper;
-
- @Resource
- private HongBaoMapper hongBaoMapper;
@Resource
private HongBaoManageMapper hongBaoManageMapper;
@Resource
- private AccountDetailsMapper accountDetailsMapper;
-
- @Resource
private AccountMessageMapper accountMessageMapper;
-
- @Resource
- private MoneyRecordMapper moneyRecordMapper;
-
- @Resource
- private ThreeSaleGiftMapper threeSaleGiftMapper;
@Resource
private OrderService orderService;
@@ -162,6 +124,15 @@
@Resource
private HongBaoV2Mapper hongBaoV2Mapper;
+ @Resource
+ private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
+
+ @Resource
+ private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+
+ @Resource
+ private UserSystemCouponService userSystemCouponService;
+
@Override
public void processOrder(Map<String, List<TaoBaoOrder>> orders) {
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
@@ -169,24 +140,31 @@
// 鍒嗙鍑鸿繑鍒╄鍗曚笌鍒嗕韩璧氳鍗�
Iterator<String> its = orders.keySet().iterator();
Map<String, List<TaoBaoOrder>> fanliOrderMap = new HashMap<>();
- Map<String, List<PidOrder>> sharePidOrderMap = new HashMap<>();
Map<String, List<TaoBaoOrder>> shareOrderMap = new HashMap<>();
while (its.hasNext()) {
String orderId = its.next();
+
if (orders.get(orderId) != null && orders.get(orderId).size() > 0) {
List<TaoBaoOrder> list = orders.get(orderId);
- String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(),
- list.get(0).getSourceMediaId(), list.get(0).getAdPositionId());
- PidUser pidUser = pidUserMapper.selectByPid(pid);
- if (pidUser != null && pidUser.getType() == PidUser.TYPE_SHARE_GOODS) {// 鍟嗗搧鍒嗕韩璁㈠崟
- // List<PidOrder> pidOrderList = new ArrayList<>();
- // for (TaoBaoOrder order : list) {
- // pidOrderList.add(TaoBaoOrderUtil.convertToPidOrder(order));
- // }
- // sharePidOrderMap.put(orderId, pidOrderList);
+
+ if (!StringUtil.isNullOrEmpty(list.get(0).getRelationId())) {
shareOrderMap.put(orderId, list);
- } else {// 鏅�氳繑鍒╄鍗�
+ } else if (!StringUtil.isNullOrEmpty(list.get(0).getSpecialId())) {
fanliOrderMap.put(orderId, list);
+ } else {
+ String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(),
+ list.get(0).getSourceMediaId(), list.get(0).getAdPositionId());
+ PidUser pidUser = pidUserMapper.selectByPid(pid);
+ if (pidUser != null && pidUser.getType() == PidUser.TYPE_SHARE_GOODS) {// 鍟嗗搧鍒嗕韩璁㈠崟
+ // List<PidOrder> pidOrderList = new ArrayList<>();
+ // for (TaoBaoOrder order : list) {
+ // pidOrderList.add(TaoBaoOrderUtil.convertToPidOrder(order));
+ // }
+ // sharePidOrderMap.put(orderId, pidOrderList);
+ shareOrderMap.put(orderId, list);
+ } else {// 鏅�氳繑鍒╄鍗�
+ fanliOrderMap.put(orderId, list);
+ }
}
}
}
@@ -275,7 +253,16 @@
Iterator<String> its = orders.keySet().iterator();
while (its.hasNext()) {
String orderId = its.next();
- processShareGoodsOrderNew(orderId, orders.get(orderId));
+ try {
+ processShareGoodsOrderNew(orderId, orders.get(orderId));
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e, "processShareGoodsOrderNew鍑洪敊", "璁㈠崟鍙�:" + orderId);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+
}
}
}
@@ -378,216 +365,18 @@
return validCount >= list.size();
}
- @Override
- @Transactional
- public void processShopingFanliOrder(String orderId, List<TaoBaoOrder> orderList)
- throws HongBaoException, OrderItemException {
-
- List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
-
- Order oldOrder = orderMapper.selectOrderByOrderId(orderId);
- // 鍘熸潵涓嶅瓨鍦ㄨ鍗�
- if (oldOrder == null && orderList.size() > 0) {
- // 鑾峰彇浜х敓璁㈠崟鐨凱ID
- String mediaId = orderList.get(0).getSourceMediaId();
- String adzoneId = orderList.get(0).getAdPositionId();
- String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(), mediaId, adzoneId);
- // 鏌ヨ璇ID鏄惁鏈夊搴旂殑鐢ㄦ埛
- PidUser pidUser = pidUserMapper.selectByPid(pid);
- // 鍒ゆ柇鏄惁灞炰簬杩斿埄鐨凱ID
- if (pidUser != null && (pidUser.getType() == PidUser.TYPE_FANLI_ANDROID
- || pidUser.getType() == PidUser.TYPE_FANLI_IOS)) {
- // 濡傛灉鏄鍗曞け鏁堝氨涓嶅鐞�
- // 2018-08-02寮�濮嬬敓鏁�
- if (isOrderValid(orderList))
- if (TimeUtil.convertToTimeTemp(orderList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") < TimeUtil
- .convertToTimeTemp("2018-08-02", "yyyy-MM-dd"))
- return;
-
- // 娣诲姞鍒拌鍗曚腑鍘�
- Order order = new Order();
- order.setBeizhu("PID杩斿埄璁㈠崟");
- order.setCreatetime(System.currentTimeMillis());
- order.setOrderId(orderId);
- order.setOrderType(1);
- order.setState(Order.STATE_YIZHIFU);
- order.setUserInfo(new UserInfo(pidUser.getUid()));
- order.setVersion(2);
-
- // 鍔犲叆鍒拌鍗曡〃
- orderMapper.insertSelective(order);
- oldOrder = order;
- }
- }
-
- if (oldOrder != null) {// 璇ヨ鍗曞彿鍙互杩斿埄
- // 鍘熸潵澶辨晥鐨勮鍗曚笉鍐嶅鐞�
- // if (oldOrder.getState() == Order.STATE_SHIXIAO)
- // return;
- // 鏇存柊璁㈠崟鐨勭姸鎬�
- Order updateOrder = new Order();
- updateOrder.setId(oldOrder.getId());
- updateOrder.setThirdCreateTime(
- new Date(TimeUtil.convertToTimeTemp(orderList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss")));
-
- if (isOrderValid(orderList)) {
- // 澶勭悊璁㈠崟澶辨晥
- updateOrder.setState(Order.STATE_SHIXIAO);
- if (oldOrder.getState() == Order.STATE_YIZHIFU)
- updateOrder.setDrawbackTime(System.currentTimeMillis());
- updateOrder.setThirdState("璁㈠崟澶辨晥");
- } else// 璁＄畻璁㈠崟鐨勬�婚噾棰�
- {
- BigDecimal money = new BigDecimal(0);
- for (TaoBaoOrder o : orderList) {
- if (o.getOrderState().equalsIgnoreCase("璁㈠崟缁撶畻"))
- money = money.add(o.getSettlement());
- else {
- money = money.add(o.getPayment());
- }
- }
- updateOrder.setMoney(money);
- String thirdState = null;
- for (TaoBaoOrder o : orderList)
- if (!o.getOrderState().equalsIgnoreCase("璁㈠崟澶辨晥")) {
- thirdState = o.getOrderState();
- break;
- }
- updateOrder.setThirdState(thirdState);
- }
- orderMapper.updateByPrimaryKeySelective(updateOrder);
- Order order = oldOrder;
- // 璁㈠崟杩斿埄姣斾緥
- BigDecimal rate = hongBaoManageService.getFanLiRate();
-
- // 鏌ユ壘鏄惁瀛樺湪绾㈠寘
- List<HongBao> hongBaoList = hongBaoMapper.selectByOid(order.getId());
- // 杩樻病鏈夊姞鍏ユ湁鏁堢殑璁㈠崟
- if ((hongBaoList == null || hongBaoList.size() == 0)) {
- for (TaoBaoOrder taoBaoOrder : orderList) {
- // 鍒涘缓OrderItem;
- OrderItem orderItem = orderItemService.addOrderItem(taoBaoOrder, order, rate);
- hongBaoService.addHongBao(order, taoBaoOrder, orderItem.getId());
- }
- } else if (hongBaoList.size() > 0)// 鍘熸潵宸茬粡瀛樺湪璁㈠崟浜�
- {
- List<TaobaoOrderHongBao> sortList = HongBaoUtil.sortHongBaoAndTaoBaoOrder(orderList, hongBaoList);
- orderList = new ArrayList<>();
- hongBaoList = new ArrayList<>();
- if (sortList != null)
- for (TaobaoOrderHongBao tb : sortList) {
- orderList.add(tb.taoBaoOrder);
- hongBaoList.add(tb.hongBao);
- }
-
- if (orderList.size() != hongBaoList.size()) {
- LogHelper.userOrder("绾㈠寘鏁板拰璁㈠崟鏁颁笉瀵圭瓑:" + orderId);
- return;
- }
-
- for (int i = 0; i < orderList.size(); i++) {
- hongBaoService.updateHongBao(hongBaoList.get(i), orderList.get(i));
- orderItemService.updateOrderItem(orderList.get(i), hongBaoList.get(i).getOrderItemId(), rate);
- }
- }
-
- }
- }
-
- @Override
- @Transactional
- public void fanli(HongBao hb) throws TaoBaoWeiQuanException {
- // 鏌ヨ鏈�鏂扮殑绾㈠寘鏁版嵁
- hb = hongBaoMapper.selectByPrimaryKeyForUpdate(hb.getId());
- // 缁存潈涓殑涓嶈繑鍒�
- List<TaoBaoWeiQuanOrder> taoBaoWeiQuanList = taoBaoWeiQuanOrderMapper
- .selectListByOrderIdAndState(hb.getOrderId(), "缁存潈鍒涘缓");
- if (taoBaoWeiQuanList != null && taoBaoWeiQuanList.size() > 0)
- return;
-
- taoBaoWeiQuanList = taoBaoWeiQuanOrderMapper.selectListByOrderIdAndState(hb.getOrderId(), "绛夊緟澶勭悊");
- if (taoBaoWeiQuanList != null && taoBaoWeiQuanList.size() > 0)
- return;
-
- long currentTimeMillis = System.currentTimeMillis();
- if (hb.getState() != HongBao.STATE_SHIXIAO) {
- // 璁剧疆涓哄凡杩斿埄
- // 澶勭悊涓荤孩鍖�
- if (hb.getState() != HongBao.STATE_SHIXIAO && hb.getState() != HongBao.STATE_YILINGQU
- && hb.getType() == HongBao.TYPE_TAOBAO) {
- OrderItem orderItem = null;
- if (hb.getOrderItemId() != null) {
- orderItem = orderItemMapper.selectByPrimaryKey(hb.getOrderItemId());
- OrderItem updateOrderItem = new OrderItem();
- updateOrderItem.setId(orderItem.getId());
- updateOrderItem.setFanTime(currentTimeMillis);
- updateOrderItem.setState(OrderItem.STATE_DAOZHANG);
- orderItemMapper.updateByPrimaryKeySelective(updateOrderItem);
- }
- // 濡傛灉绾㈠寘娌¤棰嗗彇
- HongBao updateHongBao = new HongBao();
- updateHongBao.setId(hb.getId());
- updateHongBao.setState(HongBao.STATE_YILINGQU);
- updateHongBao.setGetTime(currentTimeMillis);
- hongBaoMapper.updateByPrimaryKeySelective(updateHongBao);
- userInfoMapper.addHongBaoByUid(hb.getUserInfo().getId(), hb.getMoney());
-
- // ...娑堟伅銆佹槑缁�
- HongBaoExtra hongBaoExtra = HongBaoUtil.convert(hb);
- // 鏄庣粏鎿嶄綔锛堝鏋滄湇鍔″櫒鎬уソ浜嗗悗锛屽彲鏀规垚寮傛锛�
- MoneyRecord moneyRecord = new MoneyRecord(hb.getUserInfo(), hb, hb.getMoney(), hongBaoExtra.getTitle(),
- "", currentTimeMillis, 1);
- moneyRecordMapper.insertSelective(moneyRecord);
- AccountDetails accountDetails = AccountDetailsFactory.create("+" + hb.getMoney(),
- AccountDetailsFactory.FANLI, orderItem, null, hb.getUserInfo());
- accountDetailsMapper.insertSelective(accountDetails);
-
- // 鎻掑叆鏂扮増璧勯噾鏄庣粏
- try {
- UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createFanLi(hb.getUserInfo().getId(),
- hb.getOrderId(), 1, hb.getId(), hb.getMoney());
- userMoneyDetail.setId(accountDetails.getId());
- userMoneyDetailMapper.insert(userMoneyDetail);
- } catch (UserMoneyDetailException e1) {
- try {
- LogHelper.errorDetailInfo(e1);
- } catch (Exception e2) {
- e2.printStackTrace();
- }
- }
-
- // 娣诲姞璧勯噾鏄庣粏涓庣孩鍖呯殑鏄犲皠鍏崇郴
- accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hb.getId(), accountDetails.getId());
-
- // 缁存潈鎵ｆ锛�2018-08-05鍚庡紑濮嬪疄琛岋級
- if (hb.getBalanceTime() != null
- && hb.getBalanceTime().getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {
- taoBaoWeiQuanDrawBackService.doWeiQuanFanli(hb.getOrderId());
- }
-
- // 绔欏唴淇�+鎺ㄩ��
- try {
- userNotificationService.orderFanliRecieved(hb.getUserInfo().getId(), orderItem.getOrderId(),
- orderItem.getFanMoney());
- } catch (Exception e) {
- }
-
- }
- }
- }
-
@Resource
private HongBaoOrderMapper hongBaoOrderMapper;
@Override
@Transactional
- public void fanli(HongBaoV2 hb) throws TaoBaoWeiQuanException {
+ public void fanli(HongBaoV2 hb1) throws TaoBaoWeiQuanException {
// 鏌ヨ鏈�鏂扮殑绾㈠寘鏁版嵁
- hb = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb.getId());
+ hb1 = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb1.getId());
// 鏌ヨ绾㈠寘鐩稿叧鑱旂殑璁㈠崟
- HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hb.getId());
+ HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hb1.getId());
if (hongBaoOrder == null) {
- LogHelper.error("杩斿埄澶辫触:" + hb.getId());
+ LogHelper.error("杩斿埄澶辫触:" + hb1.getId());
return;
}
// 缁存潈涓殑涓嶈繑鍒�
@@ -601,57 +390,149 @@
if (taoBaoWeiQuanList != null && taoBaoWeiQuanList.size() > 0)
return;
- long currentTimeMillis = System.currentTimeMillis();
- if (hb.getState() != HongBao.STATE_SHIXIAO) {
- // 璁剧疆涓哄凡杩斿埄
- // 澶勭悊涓荤孩鍖�
- if (hb.getState() != HongBaoV2.STATE_SHIXIAO && hb.getState() != HongBaoV2.STATE_YILINGQU
- && hb.getType() == HongBaoV2.TYPE_ZIGOU) {
- // 濡傛灉绾㈠寘娌¤棰嗗彇
- HongBaoV2 updateHongBao = new HongBaoV2();
- updateHongBao.setId(hb.getId());
- updateHongBao.setState(HongBaoV2.STATE_YILINGQU);
- updateHongBao.setGetTime(new Date(currentTimeMillis));
- hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBao);
- userInfoMapper.addHongBaoByUid(hb.getUserInfo().getId(), hb.getMoney());
+ // 鏌ヨ鍚屼竴璁㈠崟鍙风殑绾㈠寘
+ List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(
+ hongBaoOrder.getCommonOrder().getSourceType(), hongBaoOrder.getCommonOrder().getOrderNo());
+ List<HongBaoV2> hongBaoList = new ArrayList<>();
+ Map<Long, BigDecimal> userMoney = new HashMap<>();
+ Map<Long, List<HongBaoV2>> userHongBao = new HashMap<>();
+ Map<Long, Integer> userGoodsCount = new HashMap<>();
+ // Map<Long, BigDecimal> userPayMent = new HashMap<>();
+ for (CommonOrder co : orderList) {
+ hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(co.getId());
+ hongBaoList.add(hongBaoOrder.getHongBaoV2());
+ Long uid = co.getUserInfo().getId();
+ if (userGoodsCount.get(uid) == null)
+ userGoodsCount.put(uid, co.getCount());
+ else
+ userGoodsCount.put(uid, Integer.valueOf(co.getCount() + userGoodsCount.get(uid)));
+ // if (userPayMent.get(uid) == null)
+ // userPayMent.put(uid, new BigDecimal(0));
+ // if (co.getState() == CommonOrder.STATE_JS)
+ // userPayMent.put(uid,
+ // userPayMent.get(uid).add(co.getSettlement()));
+ // else
+ // userPayMent.put(uid, userPayMent.get(uid).add(co.getPayment()));
+ }
- AccountDetails accountDetails = AccountDetailsFactory.create("+" + hb.getMoney(),
- AccountDetailsFactory.FANLI, null, null, hb.getUserInfo());
- accountDetailsMapper.insertSelective(accountDetails);
+ for (HongBaoV2 hb : hongBaoList) {
+ long currentTimeMillis = System.currentTimeMillis();
+ if (hb.getState() != HongBao.STATE_SHIXIAO) {
+ // 璁剧疆涓哄凡杩斿埄
+ // 澶勭悊涓荤孩鍖�
+ if (hb.getState() != HongBaoV2.STATE_SHIXIAO && hb.getState() != HongBaoV2.STATE_YILINGQU
+ && hb.getType() == HongBaoV2.TYPE_ZIGOU) {
+ // 濡傛灉绾㈠寘娌¤棰嗗彇
+ Long uid = hb.getUserInfo().getId();
+ HongBaoV2 updateHongBao = new HongBaoV2();
+ updateHongBao.setId(hb.getId());
+ updateHongBao.setState(HongBaoV2.STATE_YILINGQU);
+ updateHongBao.setGetTime(new Date(currentTimeMillis));
+ hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBao);
+ if (userMoney.get(uid) == null)
+ userMoney.put(uid, hb.getMoney());
+ else
+ userMoney.put(uid, userMoney.get(uid).add(hb.getMoney()));
- // 鎻掑叆鏂扮増璧勯噾鏄庣粏
- try {
- UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createFanLi(hb.getUserInfo().getId(),
- hongBaoOrder.getCommonOrder().getOrderNo(), hongBaoOrder.getCommonOrder().getSourceType(),
- hb.getId(), hb.getMoney());
- userMoneyDetail.setId(accountDetails.getId());
- userMoneyDetailMapper.insert(userMoneyDetail);
- } catch (UserMoneyDetailException e1) {
- try {
- LogHelper.errorDetailInfo(e1);
- } catch (Exception e2) {
- e2.printStackTrace();
- }
+ // 娣诲姞绾㈠寘鍒扮敤鎴�
+ if (userHongBao.get(uid) == null)
+ userHongBao.put(uid, new ArrayList<>());
+ userHongBao.get(uid).add(hb);
}
-
- // 娣诲姞璧勯噾鏄庣粏涓庣孩鍖呯殑鏄犲皠鍏崇郴
- accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hb.getId(), accountDetails.getId());
-
- // 缁存潈鎵ｆ锛�2018-08-05鍚庡紑濮嬪疄琛岋級
- if (hongBaoOrder.getCommonOrder().getSettleTime() != null && hongBaoOrder.getCommonOrder()
- .getSettleTime().getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {
- taoBaoWeiQuanDrawBackService.doWeiQuanFanli(hongBaoOrder.getCommonOrder().getOrderNo());
- }
-
- // 绔欏唴淇�+鎺ㄩ��
- try {
- userNotificationService.orderFanliRecieved(hb.getUserInfo().getId(),
- hongBaoOrder.getCommonOrder().getOrderNo(), hb.getMoney());
- } catch (Exception e) {
- }
-
}
}
+
+ Iterator<Long> its = userMoney.keySet().iterator();
+
+ while (its.hasNext()) {
+ // 灏嗚嚜宸辨坊鍔犲埌鐢ㄦ埛
+ Long uid = its.next();
+ BigDecimal money = userMoney.get(uid);
+ UserMoneyDetail userMoneyDetail = null;
+ // 鎻掑叆鏂扮増璧勯噾鏄庣粏
+ try {
+ // 姝ゅ涓嶇敤璁㈠崟鍙峰仛鍞竴鎬х储寮�
+ userMoneyDetail = UserMoneyDetailFactory.createFanLi(uid, hongBaoOrder.getCommonOrder().getOrderNo(),
+ hongBaoOrder.getCommonOrder().getSourceType(), null, money);
+ } catch (UserMoneyDetailException e1) {
+ try {
+ LogHelper.errorDetailInfo(e1, "璁㈠崟鍙�:" + hongBaoOrder.getCommonOrder().getOrderNo(), "");
+ } catch (Exception e2) {
+ e2.printStackTrace();
+ }
+ }
+
+ userMoneyDetailMapper.insertSelective(userMoneyDetail);
+ // 娣诲姞璧勯噾鏄庣粏涓庣孩鍖呯殑鏄犲皠鍏崇郴
+ for (HongBaoV2 v2 : userHongBao.get(uid)) {
+ accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(v2.getId(), userMoneyDetail.getId());
+ }
+ // 澧炲姞鐢ㄦ埛璧勯噾
+ userInfoMapper.addHongBaoByUid(uid, money);
+
+ // 绔欏唴淇�+鎺ㄩ��
+ UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
+ try {
+ userNotificationService.orderFanliRecieved(uid, hongBaoOrder.getCommonOrder().getOrderNo(),
+ userGoodsCount.get(uid), user.getMyHongBao(), money);
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+
+ // 鏂扮増閫氱煡
+ userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),
+ userGoodsCount.get(uid), money, user.getMyHongBao());
+ }
+ // 閫氱煡鍏嶅崟鍒拌处
+ try {
+ userSystemCouponService.updateStateByArrivalAccount(hongBaoOrder.getCommonOrder().getOrderNo());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ // 缁存潈鎵ｆ锛�2018-08-05鍚庡紑濮嬪疄琛岋級
+ if (hongBaoOrder.getCommonOrder().getSettleTime() != null && hongBaoOrder.getCommonOrder().getSettleTime()
+ .getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {
+ try {
+
+ taoBaoWeiQuanDrawBackService.doWeiQuanFanli(hongBaoOrder.getCommonOrder().getOrderNo());
+
+ } catch (TaoBaoWeiQuanException e) {
+ if (e.getCode() == TaoBaoWeiQuanException.CODE_NEDD_UPDATE_ORDER) {
+ List<TaoBaoOrder> olist = taoBaoOrderService
+ .getTaoBaoOrderByOrderId(hongBaoOrder.getCommonOrder().getOrderNo());
+
+ if (olist != null && olist.size() > 0) {
+ long time = TimeUtil.convertToTimeTemp(olist.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+ olist = TaoKeOrderApiUtil.getTaoBaoAllOrder(TimeUtil.getGernalTime(time, "yyyy-MM-dd HH:mm:ss"),
+ TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ List<TaoBaoOrder> thirdOList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(
+ TimeUtil.getGernalTime(time, "yyyy-MM-dd HH:mm:ss"), 30, 1,
+ TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ if (thirdOList != null && thirdOList.size() > 0)
+ olist.addAll(thirdOList);
+
+ if (olist != null && olist.size() > 0) {
+ for (int i = 0; i < olist.size(); i++) {
+ if (!olist.get(i).getOrderId()
+ .equalsIgnoreCase(hongBaoOrder.getCommonOrder().getOrderNo())) {// 鍒犻櫎鏃犲叧璁㈠崟
+ olist.remove(i);
+ i--;
+ }
+ }
+
+ taoBaoOrderService.addTaoBaoOrderList(olist);
+ }
+ }
+ } else
+ throw new TaoBaoWeiQuanException(e.getCode(), e.getMsg());
+ }
+ }
+
}
@Override
@@ -676,12 +557,6 @@
if (order.getJieSuanTime().getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {
return;
}
- try {
- orderService.failureOrderWithWeiQuan(order.getOrderId(), Order.ORDER_TYPE_TAOBAO);
- } catch (ObjectStateException e) {
- e.printStackTrace();
- }
- pidOrderService.weiQuan(order.getOrderId());
}
@Override
@@ -744,6 +619,9 @@
List<Long> hbIdList = new ArrayList<>();
BigDecimal invitemoney = new BigDecimal(0);
+ Set<String> inviteOrders = new HashSet<>();
+ int inviteGoodsCount = 0;
+
// 闇�瑕佸垽鏂��娆剧殑璁㈠崟鍙�
Set<String> drawBackOrders = new HashSet<String>();
for (HongBaoV2 hongBao : hongBaoList) {
@@ -758,12 +636,16 @@
updateHongBao.setId(hongBao.getId());
updateHongBao.setGetTime(new Date());
updateHongBao.setState(HongBaoV2.STATE_YILINGQU);
+ updateHongBao.setUpdateTime(new Date());
hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBao);
// 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
hbIdList.add(hongBao.getId());
+
// 2018-08-05 杩囧悗鐨勮鍗曟墠澶勭悊缁存潈
HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hongBao.getParent().getId());
+ inviteGoodsCount += hongBaoOrder.getCommonOrder().getCount();
+ inviteOrders.add(hongBaoOrder.getCommonOrder().getOrderNo());
Date balanceTime = hongBaoOrder.getCommonOrder().getSettleTime();
if (balanceTime != null
@@ -799,11 +681,14 @@
updateHongBao.setId(hb.getId());
updateHongBao.setGetTime(new Date());
updateHongBao.setState(HongBaoV2.STATE_YILINGQU);
+ updateHongBao.setUpdateTime(new Date());
hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBao);
// 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
hbIdList.add(hb.getId());
HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hb.getParent().getId());
+ inviteGoodsCount += hongBaoOrder.getCommonOrder().getCount();
+ inviteOrders.add(hongBaoOrder.getCommonOrder().getOrderNo());
if (!StringUtil.isNullOrEmpty(hongBaoOrder.getCommonOrder().getOrderNo()))
drawBackOrders.add(hongBaoOrder.getCommonOrder().getOrderNo());
}
@@ -812,17 +697,29 @@
// 閭�璇疯禋鍒拌处
if (invitemoney.compareTo(new BigDecimal(0)) > 0) {
userInfoMapper.addHongBaoByUid(uid, invitemoney);
- // 娣诲姞璁板綍
- AccountDetails accountDetails = AccountDetailsFactory.create("+" + invitemoney,
- AccountDetailsFactory.TICHENG, null, null, new UserInfo(uid));
- accountDetailsMapper.insertSelective(accountDetails);
// 娣诲姞鏂扮増璇︽儏璁板綍
try {
- UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, 0, 0, 0, invitemoney,
- new Date());
- userMoneyDetail.setId(accountDetails.getId());
+ // 鏌ヨ閭�璇疯禋鐨勬湁鏁堣鍗曪紝澶辨晥璁㈠崟锛岀淮鏉冭鍗�
+ Calendar ca = Calendar.getInstance();
+ Date maxDate = new Date(TimeUtil
+ .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));
+ ca.add(Calendar.MONTH, -1);
+
+ Date minDate = new Date(TimeUtil
+ .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));
+ long validCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_JS,
+ minDate, maxDate);
+ long weiQuanCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ,
+ minDate, maxDate);
+ long invalidCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX,
+ minDate, maxDate);
+
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, (int) validCount,
+ (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());
userMoneyDetailMapper.insert(userMoneyDetail);
+ // 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
+ accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, userMoneyDetail.getId());
} catch (UserMoneyDetailException e) {
try {
LogHelper.errorDetailInfo(e);
@@ -831,18 +728,19 @@
}
}
- // 璁板綍杩斿埄绾㈠寘涓庤祫閲戣鎯呯殑瀵瑰簲鍏崇郴
-
- // 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
- accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, accountDetails.getId());
-
// 鍙戦�佹帹閫�
try {
// 鎻愭垚鍒拌处娑堟伅閫氱煡
- userNotificationService.tiChengInviteRecieved(uid, invitemoney);
+ userNotificationService.tiChengInviteRecieved(uid, inviteOrders.size(), inviteGoodsCount, null,
+ invitemoney);
} catch (Exception e) {
e.printStackTrace();
}
+
+ // 鏂扮増閫氱煡
+ userMoneyMsgNotificationService.inviteOrderReceived(uid, inviteOrders.size(), inviteGoodsCount, invitemoney,
+ userInfoMapper.selectByPKey(uid).getMyHongBao());
+
for (String orderId : drawBackOrders)
taoBaoWeiQuanDrawBackService.doWeiQuanInvite(orderId);
}
@@ -853,6 +751,9 @@
/**
* 澶勭悊鍒嗕韩璧�
*/
+
+ int shareGoodsCount = 0;
+ Set<String> shareOrders = new HashSet<>();
BigDecimal sharemoney = new BigDecimal(0);
// 鏌ヨUID鐨勫垎浜禋璁㈠崟
types.clear();
@@ -869,6 +770,7 @@
updateHongBao.setId(hongBao.getId());
updateHongBao.setGetTime(new Date());
updateHongBao.setState(HongBao.STATE_YILINGQU);
+ updateHongBao.setUpdateTime(new Date());
hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBao);
// 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
hbIdList.add(hongBao.getId());
@@ -877,6 +779,7 @@
HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hongBao.getId());
if (hongBaoOrder != null)
balanceTime = hongBaoOrder.getCommonOrder().getSettleTime();
+ shareOrders.add(hongBaoOrder.getCommonOrder().getOrderNo());
if (balanceTime != null
&& balanceTime.getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {
drawBackOrders.add(hongBaoOrder.getCommonOrder().getOrderNo());
@@ -890,17 +793,29 @@
if (sharemoney.compareTo(new BigDecimal(0)) > 0) {
userInfoMapper.addHongBaoByUid(uid, sharemoney);
- // 娣诲姞璁板綍
- AccountDetails accountDetails = AccountDetailsFactory.create("+" + sharemoney,
- AccountDetailsFactory.SHARE_GOODS, null, null, new UserInfo(uid));
- accountDetailsMapper.insertSelective(accountDetails);
-
// 娣诲姞鏂扮増璇︽儏璁板綍
try {
- UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, 0, 0, 0, sharemoney,
- new Date());
- userMoneyDetail.setId(accountDetails.getId());
+ // 璁＄畻鏈湀鐨勬湁鏁堣鍗曪紝澶辨晥璁㈠崟锛岀淮鏉冭鍗�
+ Calendar ca = Calendar.getInstance();
+
+ Date maxDate = new Date(TimeUtil
+ .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));
+ ca.add(Calendar.MONTH, -1);
+
+ Date minDate = new Date(TimeUtil
+ .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));
+ long validCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,
+ CommonOrder.STATE_JS, minDate, maxDate);
+ long weiQuanCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,
+ CommonOrder.STATE_WQ, minDate, maxDate);
+ long invalidCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,
+ CommonOrder.STATE_SX, minDate, maxDate);
+
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, (int) validCount,
+ (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());
userMoneyDetailMapper.insert(userMoneyDetail);
+ // 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
+ accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, userMoneyDetail.getId());
} catch (UserMoneyDetailException e) {
try {
LogHelper.errorDetailInfo(e);
@@ -908,18 +823,20 @@
e1.printStackTrace();
}
}
- // 璁板綍杩斿埄绾㈠寘涓庤祫閲戣鎯呯殑瀵瑰簲鍏崇郴
-
- // 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
- accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, accountDetails.getId());
// 鍙戦�佹帹閫�
try {
// 鎻愭垚鍒拌处娑堟伅閫氱煡
- userNotificationService.tiChengShareRecieved(uid, sharemoney);
+ userNotificationService.tiChengShareRecieved(uid, shareOrders.size(), shareGoodsCount, null,
+ sharemoney);
} catch (Exception e) {
e.printStackTrace();
}
+
+ // 鏂扮増閫氱煡
+ userMoneyMsgNotificationService.shareOrderReceived(uid, shareOrders.size(), shareGoodsCount, sharemoney,
+ userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
+
for (String orderId : drawBackOrders)
taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);
}
@@ -936,6 +853,11 @@
@Override
public void processShopingFanliOrderNew(String orderId, List<TaoBaoOrder> orderList)
throws HongBaoException, OrderItemException {
+
+ LogHelper.test(String.format("璁㈠崟澶勭悊:璁㈠崟鍙�-%s 璁㈠崟鏁伴噺-%s", orderId, orderList.size() + ""));
+ if (orderList.size() == 1)
+ LogHelper.test("璁㈠崟鎺掑簭鍊�:" + orderList.get(0).getOrderBy());
+
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
if (orderList != null && orderList.size() > 0) {
@@ -963,6 +885,25 @@
// 鍔犲叆鍒拌鍗曡〃
orderMapper.insertSelective(order);
oldOrder = order;
+ } else {
+ UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService
+ .getBySpecialId(orderList.get(0).getSpecialId());
+ if (info != null && info.getUser() != null) {
+ uid = info.getUser().getId();
+ // 鎻掑叆鍒癘rder涓�
+ // 娣诲姞鍒拌鍗曚腑鍘�
+ Order order = new Order();
+ order.setBeizhu("PID杩斿埄璁㈠崟");
+ order.setCreatetime(System.currentTimeMillis());
+ order.setOrderId(orderId);
+ order.setOrderType(1);
+ order.setState(Order.STATE_YIZHIFU);
+ order.setUserInfo(new UserInfo(uid));
+ order.setVersion(2);
+ // 鍔犲叆鍒拌鍗曡〃
+ orderMapper.insertSelective(order);
+ oldOrder = order;
+ }
}
} else {
uid = oldOrder.getUserInfo().getId();
@@ -998,13 +939,14 @@
orderMapper.updateByPrimaryKeySelective(updateOrder);
// 鐢ㄧ涓�涓瓙璁㈠崟閿佸畾鐢ㄦ埛
- for (TaoBaoOrder taoBaoOrder : orderList) {
+ List<CommonOrder> commonOrderList = null;
+ try {
+ commonOrderList = commonOrderService.addTaoBaoOrder(orderList, uid);
+ hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU);
+ } catch (CommonOrderException e) {
try {
- CommonOrder commonOrder = commonOrderService.addTaoBaoOrder(taoBaoOrder, uid);
- hongBaoV2Service.addHongBao(commonOrder, HongBaoV2.TYPE_ZIGOU);
- } catch (CommonOrderException e) {
- e.printStackTrace();
- } catch (HongBaoException e1) {
+ LogHelper.errorDetailInfo(e, "addTaoBaoOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + orderId);
+ } catch (Exception e1) {
e1.printStackTrace();
}
}
@@ -1022,24 +964,26 @@
PidUser pidUser = pidUserMapper.selectByPid(pid);
if (pidUser != null)
uid = pidUser.getUid();
+ else {
+ UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService.getByRelationId(orderList.get(0).getRelationId());
+ if (info != null && info.getUser() != null)
+ uid = info.getUser().getId();
+ }
// 灏氭湭鎵惧埌鍜孭ID瀵瑰簲鐨勭敤鎴�
if (uid == null)
return;
// 鐢ㄧ涓�涓瓙璁㈠崟閿佸畾鐢ㄦ埛
- for (TaoBaoOrder taoBaoOrder : orderList) {
- try {
- CommonOrder commonOrder = commonOrderService.addTaoBaoOrder(taoBaoOrder, uid);
- hongBaoV2Service.addHongBao(commonOrder, HongBaoV2.TYPE_SHARE_GOODS);
- } catch (CommonOrderException e) {
- e.printStackTrace();
- } catch (HongBaoException e1) {
- e1.printStackTrace();
- }
+ try {
+ List<CommonOrder> commonOrders = commonOrderService.addTaoBaoOrder(orderList, uid);
+ hongBaoV2Service.addHongBao(commonOrders, HongBaoV2.TYPE_SHARE_GOODS);
+ } catch (CommonOrderException e) {
+ e.printStackTrace();
+ } catch (HongBaoException e1) {
+ e1.printStackTrace();
}
}
-
}
}
--
Gitblit v1.8.0