From 59b262966f00605a39a0de1e03ce79e5e0f425d9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 12 十月 2019 10:47:30 +0800
Subject: [PATCH] 饿了么到账消息设置，分享爆款商品列表不再需要登录
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 154 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 131 insertions(+), 23 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 b485e18..c2b3dc3 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
@@ -31,6 +31,8 @@
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.elme.ElmeHongBaoOrderMap;
+import com.yeshi.fanli.entity.elme.ElmeOrder;
import com.yeshi.fanli.entity.jd.JDOrder;
import com.yeshi.fanli.entity.jd.JDOrderItem;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
@@ -48,21 +50,23 @@
import com.yeshi.fanli.exception.order.OrderItemException;
import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.elme.ElmeHongBaoOrderMapService;
+import com.yeshi.fanli.service.inter.elme.ElmeOrderService;
import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
-import com.yeshi.fanli.service.inter.jd.JDOrderService;
-import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
+import com.yeshi.fanli.service.inter.money.UserMoneyService;
+import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
+import com.yeshi.fanli.service.inter.money.tb.TaoBaoWeiQuanDrawBackService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
+import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
-import com.yeshi.fanli.service.inter.pdd.PDDOrderService;
+import com.yeshi.fanli.service.inter.order.jd.JDOrderService;
+import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;
+import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;
-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.UserMoneyService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -338,7 +342,7 @@
// 鏌ヨ鏈�鏂扮殑绾㈠寘鏁版嵁
hb1 = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb1.getId());
// 姝ｅ父鐢ㄦ埛鎵嶈兘鍒拌处
- UserInfo mainUser = userInfoMapper.selectByPrimaryKey(hb1.getUserInfo().getId());
+ UserInfo mainUser = userInfoMapper.selectAvailableByPrimaryKey(hb1.getUserInfo().getId());
if (mainUser == null || mainUser.getState() != UserInfo.STATE_NORMAL) {
return;
}
@@ -462,7 +466,7 @@
}
// 绔欏唴淇�+鎺ㄩ��
- UserInfo user = userInfoMapper.selectByPKey(uid);
+ UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
// 鏂扮増閫氱煡
userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),
@@ -488,16 +492,7 @@
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,
- TaoKeOrderApiUtil.TK_STATUS_ALL);
- List<TaoBaoOrder> thirdOList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(
- TimeUtil.getGernalTime(time, "yyyy-MM-dd HH:mm:ss"), 30, 1,
- TaoKeOrderApiUtil.TK_STATUS_ALL, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- if (thirdOList != null && thirdOList.size() > 0)
- olist.addAll(thirdOList);
-
+ olist = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(time, time + 1000 * 2L, 1);
if (olist != null && olist.size() > 0) {
for (int i = 0; i < olist.size(); i++) {
if (!olist.get(i).getOrderId()
@@ -652,7 +647,7 @@
if (hongBaoOrder != null && hongBaoOrder.getCommonOrder() != null) {
CommonOrder co = hongBaoOrder.getCommonOrder();
// 涓婄骇鐢ㄦ埛涓嶆槸姝ｅ父鐢ㄦ埛锛岃鍗曞潎涓嶈兘鍒拌处
- UserInfo userInfo = userInfoMapper.selectByPrimaryKey(co.getUserInfo().getId());
+ UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());
if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {
hongBaoList.remove(i);
i--;
@@ -776,7 +771,7 @@
// 鏂扮増閫氱煡
userMoneyMsgNotificationService.inviteOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, inviteOrders.size(),
- inviteGoodsCount, invitemoney, userInfoMapper.selectByPKey(uid).getMyHongBao());
+ inviteGoodsCount, invitemoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
for (String orderId : drawBackOrders)
taoBaoWeiQuanDrawBackService.doWeiQuanInvite(orderId);
@@ -870,7 +865,7 @@
// 鏂扮増閫氱煡
userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),
- shareGoodsCount, sharemoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
+ shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());
for (String orderId : drawBackOrders)
taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);
@@ -1452,4 +1447,117 @@
return false;
}
+ @Transactional(rollbackFor = Exception.class)
+ public void invalidHongBaoV2AndGiveGodenCorn(Long hongBaoId, Long uid, String orderId, int sourceType,
+ String beiZhu) throws Exception {
+ HongBaoV2 v2 = new HongBaoV2(hongBaoId);
+ v2.setState(HongBaoV2.STATE_SHIXIAO);
+ v2.setBeizhu(beiZhu);
+ v2.setUpdateTime(new Date());
+ hongBaoV2Service.updateByPrimaryKeySelective(v2);
+ List<HongBaoV2> children = hongBaoV2Service.listChildrenById(hongBaoId);
+ if (children != null)
+ for (HongBaoV2 child : children) {
+ HongBaoV2 update = new HongBaoV2(child.getId());
+ update.setState(HongBaoV2.STATE_SHIXIAO);
+ update.setBeizhu(beiZhu);
+ update.setUpdateTime(new Date());
+ hongBaoV2Service.updateByPrimaryKeySelective(update);
+ }
+ userSystemCouponService.systemGiveRewardCoupon(uid, 1, orderId, sourceType, "鍥犲晢瀹惰繚绾︽湭鑳界粨绠楄繑鍒╂垨鍟嗗宸茬粡鍏冲簵");
+ }
+
+ @Transactional
+ @Override
+ public void doTaoBaoSellerNotPaid(TaoBaoOrder order) {
+
+ // 鏍规嵁浜ゆ槗ID鏌ヨ
+ if (!StringUtil.isNullOrEmpty(order.getTradeId())) {
+ List<CommonOrder> commonOrderList = commonOrderService
+ .listBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO, order.getTradeId());
+ if (commonOrderList != null)
+ // 鏌ヨ涓昏鍗�
+ for (CommonOrder commonOrder : commonOrderList) {
+ // 鏌ヨ涓荤孩鍖�
+ HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());
+ if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null) {
+ if (hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_BUKELINGQU) {
+ // 璁㈠崟澶辨晥,璧犻�侀噾甯�
+ try {
+ invalidHongBaoV2AndGiveGodenCorn(hongBaoOrder.getHongBaoV2().getId(), hongBaoOrder.getHongBaoV2().getUserInfo().getId(), commonOrder.getOrderNo(), commonOrder.getSourceType(), "璁㈠崟鎴愬姛锛屽晢瀹舵湭鎵撴");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ }
+
+ }
+ }
+ }
+
+ public void elmeFanli() {
+
+ }
+
+ // 楗夸簡涔堣鍗�
+ @Resource
+ private ElmeHongBaoOrderMapService elmeHongBaoOrderMapService;
+
+ @Resource
+ private ElmeOrderService elmeOrderService;
+
+ /**
+ * 鑾峰彇楗夸簡涔堝彲浠ヨ繑鍒╃殑绾㈠寘
+ *
+ * @return
+ */
+ @Override
+ public List<HongBaoV2> getCanBalanceElmeFanliHongBao() {
+ List<Integer> list = new ArrayList<>();
+ list.add(HongBaoV2.TYPE_ELME);
+ return hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(list, null, 0, 1000);
+ }
+
+ @Override
+ @Transactional
+ public void elmeFanli(Long hongBaoId) {
+ // 鏌ヨ璇︽儏
+ HongBaoV2 hongBao = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hongBaoId);
+ if (hongBao.getType() == HongBaoV2.TYPE_ELME && hongBao.getState() == HongBaoV2.STATE_KELINGQU
+ && hongBao.getPreGetTime() != null && System.currentTimeMillis() > hongBao.getPreGetTime().getTime()) {// 鍙互鍒拌处浜�
+ // 鍒ゆ柇鐢ㄦ埛鐘舵��
+ UserInfo user = userInfoMapper.selectByPrimaryKey(hongBao.getUserInfo().getId());
+ if (user == null || user.getState() != UserInfo.STATE_NORMAL)
+ return;
+ ElmeHongBaoOrderMap map = elmeHongBaoOrderMapService.selectByHongBaoId(hongBaoId);
+ if (map == null)
+ return;
+ ElmeOrder order = elmeOrderService.selectByPrimaryKey(map.getElmeOrder().getId());
+ if (order == null)
+ return;
+
+ // 鍒拌处锛屽姞鏁版嵁
+ HongBaoV2 update = new HongBaoV2(hongBao.getId());
+ update.setUpdateTime(new Date());
+ update.setGetTime(new Date());
+ update.setState(HongBaoV2.STATE_YILINGQU);
+ hongBaoV2Mapper.updateByPrimaryKeySelective(update);
+ // 澧炲姞璧勯噾
+ UserMoneyDetail detail = null;
+ try {
+ detail = UserMoneyDetailFactory.createElmeFanLi(hongBao.getUserInfo().getId(), order.getOrderId(),
+ hongBao.getId(), hongBao.getMoney());
+ } catch (UserMoneyDetailException e) {
+ e.printStackTrace();
+ }
+ userMoneyService.addUserMoney(hongBao.getUserInfo().getId(), hongBao.getMoney(), detail);
+ BigDecimal balance = userInfoMapper.selectByPrimaryKey(hongBao.getUserInfo().getId()).getMyHongBao();
+ // 娣诲姞娑堟伅
+ userMoneyMsgNotificationService.elmeFanli(hongBao.getUserInfo().getId(), order.getOrderId(),
+ hongBao.getMoney(), balance);
+ }
+ // 杩斿埄鍒拌处
+ }
+
}
--
Gitblit v1.8.0