From d28bed1a1275131a5ca37f7da37961e2b518ac07 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 13:44:00 +0800
Subject: [PATCH] 淘礼金创建异常处理
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 1024 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 730 insertions(+), 294 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 4693672..82441ef 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,6 +1,7 @@
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;
@@ -17,34 +18,56 @@
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.pdd.PDDGoodsDetail;
+import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
+import com.yeshi.fanli.entity.goods.CommonGoods;
+import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.jd.JDOrder;
+import com.yeshi.fanli.entity.jd.JDOrderItem;
import com.yeshi.fanli.entity.order.CommonOrder;
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.pdd.PDDOrder;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemCouponService;
+import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
+import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
+import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.VersionUtil;
+import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.factory.CommonOrderGoodsFactory;
+import com.yeshi.fanli.util.factory.goods.CommonOrderFactory;
+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.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
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.WeiQuanInfo;
import net.sf.json.JSONObject;
@@ -59,31 +82,41 @@
@Resource
private CommonOrderGoodsMapper commonOrderGoodsMapper;
-
+
@Resource
private JumpDetailV2Service jumpDetailV2Service;
-
+
@Resource
private ConfigService configService;
-
+
@Resource
private UserSystemCouponService userSystemCouponService;
-
+
@Resource
private UserSystemCouponRecordService userSystemCouponRecordService;
-
+
@Resource
private SystemCouponService systemCouponService;
-
-
+
+ @Resource
+ private HongBaoV2Service hongBaoV2Service;
+
+ @Resource
+ private CommonOrderTradeIdMapMapper commonOrderTradeIdMapMapper;
+
+ @Resource
+ private CommonGoodsService commonGoodsService;
+
+ @Resource
+ private HongBaoOrderService hongBaoOrderService;
+
// 濂栧姳璁㈠崟鍥剧墖
- public final static String PIC_REWARD= "http://img.flqapp.com/resource/order/order_state_reward.png";
-
+ public final static String PIC_REWARD = "http://img.flqapp.com/resource/order/order_state_reward.png";
+
// 鍏嶅崟鐘舵�佸浘鐗�
public final static String PIC_FREE_ON = "http://img.flqapp.com/resource/order/order_state_freeing.png";
- public final static String PIC_FREE_FAIL = "http://img.flqapp.com/resource/order/order_state_free_fail.png";
- public final static String PIC_FREE_SUCCEED = "http://img.flqapp.com/resource/order/order_state_free_suc.png";
-
+ public final static String PIC_FREE_FAIL = "http://img.flqapp.com/resource/order/order_state_free_fail.png";
+ public final static String PIC_FREE_SUCCEED = "http://img.flqapp.com/resource/order/order_state_free_suc.png";
@Override
public int insert(CommonOrder record) {
@@ -117,26 +150,28 @@
@Override
public List<CommonOrderVO> listGroupOrderNoByUid(long start, int count, Long uid, Integer state, Integer type,
- Integer orderState, String orderNo, String startTime, String endTime, Integer dateType)
+ Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, Integer source)
throws CommonOrderException {
return commonOrderMapper.listUserOrder(start, count, uid, state, type, orderState, orderNo, startTime, endTime,
- dateType);
+ dateType, source);
}
@Override
public long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
- String startTime, String endTime, Integer dateType) throws CommonOrderException {
- return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime, dateType);
+ String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException {
+ return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime, dateType,
+ source);
}
@Override
- public List<CommonOrderVO> getOrderByUid(Integer page, Long uid, Integer state, Integer type, Integer orderState,
- String orderNo, String startTime, String endTime, Integer dateType) throws CommonOrderException {
+ 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 {
int pageSize = Constant.PAGE_SIZE;
List<CommonOrderVO> listOrder = listGroupOrderNoByUid((page - 1) * pageSize, pageSize, uid, state, type,
- orderState, orderNo, startTime, endTime, dateType);
+ orderState, orderNo, startTime, endTime, dateType, source);
// 璁㈠崟淇℃伅涓虹┖
if (listOrder == null || listOrder.size() == 0) {
@@ -152,53 +187,76 @@
}
// 鏁版嵁鍔犲伐閲嶆柊缁勭粐
- listDataFactory(listOrder, listGoods, uid);
+ listDataFactory(acceptData, listOrder, listGoods, uid);
return listOrder;
}
-
-
+
@Override
- public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day) {
- return commonOrderMapper.countHistoryOrder(uid, day);
+ 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) {
- return commonOrderMapper.countBonusOrderNumber(uid, type, day, startTime, endTime);
+ 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) {
- return commonOrderMapper.countBonusOrderMoney(uid, type, day, startTime, endTime);
+ 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) {
- return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime);
+ String endTime, Integer source) {
+ return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime, source);
}
@Override
public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime,
- Integer day) {
- return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime, day);
+ Integer day, Integer source) {
+ return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime, day, source);
}
- public void listDataFactory(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid) {
+ public void listDataFactory(AcceptData acceptData, List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods,
+ Long uid) {
- List<String> listNo = new ArrayList<String>();
- for (CommonOrderVO commonOrderVO: listOrder) {
- listNo.add(commonOrderVO.getOrderNo());
+ List<String> listTB = new ArrayList<String>();
+ List<String> listJD = new ArrayList<String>();
+ List<String> listPDD = new ArrayList<String>();
+ for (CommonOrderVO commonOrderVO : listOrder) {
+ Integer sourceType = commonOrderVO.getSourceType();
+ if (sourceType == null) {
+ continue;
+ } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
+ listTB.add(commonOrderVO.getOrderNo());
+ } else if (sourceType == Constant.SOURCE_TYPE_JD) {
+ listJD.add(commonOrderVO.getOrderNo());
+ } else if (sourceType == Constant.SOURCE_TYPE_PDD) {
+ listPDD.add(commonOrderVO.getOrderNo());
+ }
}
-
- // 宸茬粡浣跨敤鍒歌鍗�
- List<UserSystemCouponRecord> couponRecordList = userSystemCouponRecordService.getRecordByOrderNoList(listNo);
-
-
+
+ List<UserSystemCouponRecord> listRecordTB = null;
+ if (listTB.size() > 0) {
+ listRecordTB = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_TAOBAO, listTB);
+ }
+
+ List<UserSystemCouponRecord> listRecordJD = null;
+ if (listJD.size() > 0) {
+ listRecordJD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_JD, listJD);
+ }
+
+ List<UserSystemCouponRecord> listRecordPDD = null;
+ if (listPDD.size() > 0) {
+ listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);
+ }
+
/* 缁勫悎鍟嗗搧淇℃伅 */
for (CommonOrderVO commonOrder : listGoods) {
-
CommonOrderGoods goods = commonOrder.getCommonOrderGoods();
if (goods == null) {
continue;
@@ -206,7 +264,6 @@
String orderNo1 = commonOrder.getOrderNo();
Integer sourceType = commonOrder.getSourceType();
-
for (CommonOrderVO order : listOrder) {
String orderNo2 = order.getOrderNo();
Integer sourceType2 = order.getSourceType();
@@ -222,6 +279,8 @@
} catch (Exception e) {
e.printStackTrace();
}
+
+ commonGoodsVO.setGoodsType(sourceType2);
String picture = commonGoodsVO.getPicture();
if (!StringUtil.isNullOrEmpty(picture) && !picture.contains("320x320")) {
@@ -249,20 +308,18 @@
totalSettlement = commonOrder.getTotalPayment();
}
// 瀹炰粯娆�
- commonGoodsVO.setActualPay("瀹炰粯娆撅細楼" + totalSettlement);
+ commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
- listOrderGoods.add(commonGoodsVO);
-
- Integer orderType = commonOrder.getOrderType();
+ Integer orderType = order.getOrderType();
if (orderType == null) {
String shopType = commonGoodsVO.getShopType();
if (CommonOrderGoodsVO.TYPE_TAOBAO.equalsIgnoreCase(shopType)) {
- commonOrder.setOrderType(1);
+ order.setOrderType(1);
} else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {
- commonOrder.setOrderType(2);
+ order.setOrderType(2);
}
}
-
+ listOrderGoods.add(commonGoodsVO);
break;
}
}
@@ -270,10 +327,18 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");
-
+
// 鏄惁瀛樺湪濂栧姳鍒�
boolean hasRewardCoupon = userSystemCouponService.hasRewardCoupon(uid);
-
+
+ // 2019.8.1寮�濮嬭繑鍥炵淮鏉冧俊鎭�
+ Date august = null;
+ try {
+ august = TimeUtil.parse("2019-08-01");
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
/* 缁勭粐璁㈠崟鐘舵�� 绛変俊鎭� */
for (CommonOrderVO order : listOrder) {
@@ -286,6 +351,18 @@
Date settleTime = order.getSettleTime();
if (settleTime != null) {
order.setReceiveTime("鏀惰揣鏃堕棿锛�" + format.format(settleTime));
+ }
+
+ Integer sourceType2 = order.getSourceType();
+ if (sourceType2 == Constant.SOURCE_TYPE_TAOBAO) {
+ Integer orderType = order.getOrderType();
+ if (orderType == null) {
+ order.setOrderType(1);
+ }
+ } else if (sourceType2 == Constant.SOURCE_TYPE_JD) {
+ order.setOrderType(3);
+ } else if (sourceType2 == Constant.SOURCE_TYPE_PDD) {
+ order.setOrderType(4);
}
/* 璁㈠崟鐘舵�� 杞崲澶勭悊 */
@@ -309,6 +386,11 @@
}
}
+ BigDecimal hongBao = order.getHongBao();
+ if (hongBao == null) {
+ hongBao = new BigDecimal(0);
+ }
+
if (CommonOrder.STATE_FK == orderState) {
orderStateContent = "宸蹭粯娆�";
} else if (CommonOrder.STATE_JS == orderState) {
@@ -318,30 +400,57 @@
} else if (CommonOrder.STATE_WQ == orderState) {
orderStateContent = "宸茬淮鏉�";
- /* 璁㈠崟缁存潈 鍒ゆ柇鏄惁鍏ㄩ儴缁存潈 */
- List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper
- .selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛");
+ Integer sourceType = order.getSourceType();
+ if (sourceType != null && sourceType == Constant.SOURCE_TYPE_TAOBAO) {
+ /* 璁㈠崟缁存潈 鍒ゆ柇鏄惁鍏ㄩ儴缁存潈 */
+ List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper
+ .selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛");
- boolean isPart = false;// 榛樿澶辨晥
+ boolean isPart = false;// 榛樿澶辨晥
+ BigDecimal weiQuanMoney = new BigDecimal(0);
+ if (listWQ != null && listWQ.size() > 0) {
+ BigDecimal fanTotalMoney = new BigDecimal(0);
+ for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) {
+ BigDecimal fanMoney = weiQuanOrder.getFanMoney();
+ if (fanMoney != null) {
+ fanTotalMoney = MoneyBigDecimalUtil.add(fanTotalMoney, fanMoney);
+ }
+ weiQuanMoney = MoneyBigDecimalUtil.add(weiQuanOrder.getMoney(), weiQuanMoney);
+ }
- if (listWQ != null && listWQ.size() > 0) {
- BigDecimal fanTotalMoney = new BigDecimal(0);
- for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) {
- BigDecimal fanMoney = weiQuanOrder.getFanMoney();
- if (fanMoney != null) {
- fanTotalMoney = MoneyBigDecimalUtil.add(fanTotalMoney, fanMoney);
+ if (fanTotalMoney.compareTo(hongBao) < 0) {
+ isPart = true;
}
}
- if (fanTotalMoney.compareTo(order.getHongBao()) < 0) {
- isPart = true;
+ if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (isPart) {
+ hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 閮ㄥ垎澶辨晥
+ } else {
+ hongBaoState = HongBaoV2.STATE_SHIXIAO; // 鍏ㄩ儴澶辨晥
+ }
+ } else {
+ // 2019.8.1 杩斿洖缁存潈淇℃伅
+ if (settleTime != null && august != null && settleTime.getTime() > august.getTime()) {
+ orderStateContent = "缁存潈鎴愬姛";
+ WeiQuanInfo weiQuanInfo = new WeiQuanInfo();
+ weiQuanInfo.setOldHongBao("楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ if (isPart) {
+ // 缁存潈澶辨晥閲戦=缁存潈鐨勯噾棰�*鑾峰緱鐨勭孩鍖�/缁撶畻閲戦
+ BigDecimal settlement = order.getSettlement();
+ BigDecimal wqHongbao = MoneyBigDecimalUtil
+ .div(MoneyBigDecimalUtil.mul(hongBao, settlement), settlement);
+ weiQuanInfo.setWqHongBao(
+ "缁存潈锛�-楼" + wqHongbao.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ hongBao = MoneyBigDecimalUtil.sub(hongBao, wqHongbao);
+ } else {
+ weiQuanInfo
+ .setWqHongBao("缁存潈锛�-楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ hongBao = new BigDecimal(0);
+ }
+ order.setWeiQuanInfo(weiQuanInfo);
+ }
}
- }
-
- if (isPart) {
- hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 閮ㄥ垎澶辨晥
- } else {
- hongBaoState = HongBaoV2.STATE_SHIXIAO; // 鍏ㄩ儴澶辨晥
}
}
orderStateMap.put("content", orderStateContent);
@@ -365,7 +474,7 @@
order.setOrderOrigin("2");
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) {
@@ -427,126 +536,148 @@
hongbaoInfo = hongBaoState_Str + hongbaoInfo;
- BigDecimal hongBao = order.getHongBao();
- if (hongBao == null) {
- hongBao = new BigDecimal(0);
- }
Map<String, String> hongBaoMap = new HashMap<String, String>();
hongBaoMap.put("content", hongbaoInfo + " 楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
hongBaoMap.put("fontColor", hongbaoInfoFontColor);
order.setHongBaoInfo(hongBaoMap);
-
+
+ Integer sourceType = order.getSourceType();
// 闈炶嚜璐殑璁㈠崟 涓嶆樉绀鸿繑鍒┿�佸厤鍗曡鎯�
if (HongBaoV2.TYPE_ZIGOU != hongBaoType) {
- // 璁㈠崟鏍囪瘑
order.setSignList(signList);
-
} else {
-
- // 鏄惁鍏嶅崟鍟嗗搧
- boolean freeOrder = false;
- // 鏄惁濂栧姳鎴愬姛
- boolean rewardSuccess = false;
-
// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
- if (couponRecordList != null && couponRecordList.size() > 0) {
-
- for (UserSystemCouponRecord couponRecord: couponRecordList) {
- // 璁㈠崟鍙峰尮閰�
- if (order.getOrderNo().equals(couponRecord.getOrderNo())) {
-
- String systemCouponType = couponRecord.getCouponType();
- Integer state = couponRecord.getState();
-
- // 濂栧姳璁㈠崟: 涓旀垚鍔�
- if (CouponTypeEnum.rebatePercentCoupon.name().equals(systemCouponType)
- && UserSystemCouponRecord.STATE_SUCCESS == state) {
- rewardSuccess = true;
- signList.add(PIC_REWARD); // 鍔犲叆濂栧姳鎴愬姛鍥剧墖
-
- } else if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
- || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
-
- if (UserSystemCouponRecord.STATE_FREE_ON == state) {
- // 鍏嶅崟涓�
- freeOrder = true;
- signList.add(PIC_FREE_ON);
- } else if (UserSystemCouponRecord.STATE_SUCCESS == state) {
- // 鍏嶅崟鎴愬姛
- freeOrder = true;
- signList.add(PIC_FREE_SUCCEED);
- } else if (UserSystemCouponRecord.STATE_FAIL_RULE == state || UserSystemCouponRecord.STATE_FAIL_DRAWBACK == state) {
- // 瑙勫垯涓嶅尮閰嶃�侀��娆�
- freeOrder = true;
- signList.add(PIC_FREE_FAIL);
- }
- }
-
- break;
- }
- }
- }
-
- // 璁㈠崟鏍囪瘑
- order.setSignList(signList);
-
- 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());
-
- 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");
-
- Map<String, Object> jumpLink = new HashMap<String,Object>();
- jumpLink.put("orderNo", order.getOrderNo());
-
- Map<String, Object> jump = new HashMap<String,Object>();
- jump.put("type", 1); // 椤甸潰璺宠浆
- jump.put("params", jumpLink);
- jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("freeCouponDetail"));
-
- Map<String, Object> rewardMap = new HashMap<String,Object>();
- rewardMap.put("text", rewardStyleVO);
- rewardMap.put("jump", jump);
-
- order.setRewardDetail(rewardMap);
+ if (sourceType == null) {
+ setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, null, signList);
+ } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
+ setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, signList);
+ } else if (sourceType == Constant.SOURCE_TYPE_JD) {
+ setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, signList);
+ } else if (sourceType == Constant.SOURCE_TYPE_PDD) {
+ setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, signList);
}
}
+
+ // 鍒嗕韩銆侀個璇� 闅愯棌璁㈠崟鍙�
+ if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_YAOQING == hongBaoType
+ || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType
+ || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
+ order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo()));
+ }
+ }
+ }
+
+ /**
+ * 璁㈠崟锛� 鍏嶅崟鏍囪瘑 濂栧姳鏍囪瘑
+ *
+ * @param order
+ * @param hasRewardCoupon
+ * @param hongBaoState
+ * @param list
+ * @param signList
+ */
+ public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState,
+ Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList) {
+
+ // 鏄惁鍏嶅崟鍟嗗搧
+ boolean freeOrder = false;
+ // 鏄惁濂栧姳鎴愬姛
+ boolean rewardSuccess = false;
+
+ if (list != null && list.size() > 0) {
+ for (UserSystemCouponRecord couponRecord : list) {
+ // 璁㈠崟鍙峰尮閰�
+ if (order.getOrderNo().equals(couponRecord.getOrderNo())) {
+ Integer state = couponRecord.getState();
+ String systemCouponType = couponRecord.getCouponType();
+ // 濂栧姳璁㈠崟: 涓旀垚鍔�
+ if (CouponTypeEnum.rebatePercentCoupon.name().equals(systemCouponType)
+ && UserSystemCouponRecord.STATE_SUCCESS == state) {
+ rewardSuccess = true;
+ signList.add(PIC_REWARD); // 鍔犲叆濂栧姳鎴愬姛鍥剧墖
+
+ } else if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
+ || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
+
+ if (UserSystemCouponRecord.STATE_FREE_ON == state) {
+ // 鍏嶅崟涓�
+ freeOrder = true;
+ signList.add(PIC_FREE_ON);
+ } else if (UserSystemCouponRecord.STATE_SUCCESS == state) {
+ // 鍏嶅崟鎴愬姛
+ freeOrder = true;
+ signList.add(PIC_FREE_SUCCEED);
+ } else if (UserSystemCouponRecord.STATE_FAIL_RULE == state
+ || UserSystemCouponRecord.STATE_FAIL_DRAWBACK == state) {
+ // 瑙勫垯涓嶅尮閰嶃�侀��娆�
+ freeOrder = true;
+ signList.add(PIC_FREE_FAIL);
+ }
+ }
+
+ break;
+ }
+ }
+ }
+
+ // 璁㈠崟鏍囪瘑
+ order.setSignList(signList);
+
+ 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());
+
+ 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");
+
+ Map<String, Object> jumpLink = new HashMap<String, Object>();
+ jumpLink.put("orderNo", order.getOrderNo());
+
+ Map<String, Object> jump = new HashMap<String, Object>();
+ jump.put("type", 1); // 椤甸潰璺宠浆
+ jump.put("params", jumpLink);
+ jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("freeCouponDetail"));
+
+ Map<String, Object> rewardMap = new HashMap<String, Object>();
+ rewardMap.put("text", rewardStyleVO);
+ rewardMap.put("jump", jump);
+
+ order.setRewardDetail(rewardMap);
}
}
@@ -577,65 +708,234 @@
wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO;
for (TaoBaoOrder taoBaoOrder : taoBaoOrders) {
- CommonOrder commonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(taoBaoOrder.getOrderId(),
- Constant.SOURCE_TYPE_TAOBAO, taoBaoOrder.getOrderBy());
- if (commonOrder == null)// 鏂板
+ CommonOrder newCommonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);
+ CommonOrderGoods cog = new CommonOrderGoods();
+ cog.setGoodsId(taoBaoOrder.getAuctionId() + "");
+ cog.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
+ newCommonOrder.setCommonOrderGoods(cog);
+ newCommonOrder.setStateWholeOrder(wholeOrderState);
+ // 璁㈠崟鍟嗗搧鎻掑叆
+ List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper.listByGoodsIdAndGoodsType(cog.getGoodsId(),
+ cog.getGoodsType());
+ if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
{
- commonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);
- CommonOrderGoods goods = new CommonOrderGoods();
- goods.setGoodsId(taoBaoOrder.getAuctionId() + "");
- goods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
-
- // 鍟嗗搧鏄惁宸茬粡鎻掑叆
- List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper
- .listByGoodsIdAndGoodsType(goods.getGoodsId(), goods.getGoodsType());
- if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
- {
- TaoBaoGoodsBrief taoBaoGoods = null;
+ TaoBaoGoodsBrief taoBaoGoods = null;
+ try {
+ taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ LogHelper.errorDetailInfo(e, "AUCTIONID:" + taoBaoOrder.getAuctionId(), "");
try {
- taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- taoBaoGoods=TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());
+ taoBaoGoods = TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());
+ } catch (Exception e1) {
+ CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(
+ taoBaoOrder.getAuctionId(), Constant.SOURCE_TYPE_TAOBAO);
+ if (commonGoods != null)
+ taoBaoGoods = TaoBaoUtil.convert(commonGoods);
}
- if (taoBaoGoods != null) {
- goods = CommonOrderGoodsFactory.create(taoBaoGoods);
- }
- goods.setCreateTime(new Date());
- goods.setUpdateTime(new Date());
- commonOrderGoodsMapper.insertSelective(goods);
- } else
- goods.setId(commonGoodsList.get(commonGoodsList.size() - 1).getId());
- commonOrder.setCommonOrderGoods(goods);
- commonOrder.setUserInfo(new UserInfo(uid));
- commonOrder.setCreateTime(new Date());
- commonOrder.setStateWholeOrder(wholeOrderState);
- commonOrderMapper.insertSelective(commonOrder);
-
- commonOrderList.add(commonOrder);
- continue;
- } else {// 淇敼
- // 宸茬粡缁撶畻鎴栬�呭凡缁忓け鏁堢殑璁㈠崟涓嶅鐞�
- if (commonOrder.getState() == CommonOrder.STATE_JS || commonOrder.getState() == CommonOrder.STATE_SX) {
- commonOrderList.add(commonOrder);
- continue;
}
- CommonOrder newCommonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);
- CommonOrder updateCommonOrder = new CommonOrder(commonOrder.getId());
- updateCommonOrder.seteIncome(newCommonOrder.geteIncome());
- updateCommonOrder.setEstimate(newCommonOrder.getEstimate());
- updateCommonOrder.setPayment(newCommonOrder.getPayment());
- updateCommonOrder.setSettlement(newCommonOrder.getSettlement());
- updateCommonOrder.setSettleTime(newCommonOrder.getSettleTime());
- updateCommonOrder.setState(newCommonOrder.getState());
- updateCommonOrder.setStateWholeOrder(wholeOrderState);
- updateCommonOrder.setUpdateTime(new Date());
- commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);
- commonOrderList.add(commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId()));
- continue;
+ if (taoBaoGoods != null) {
+ cog = CommonOrderGoodsFactory.create(taoBaoGoods);
+ }
+ cog.setCreateTime(new Date());
+ cog.setUpdateTime(new Date());
+ commonOrderGoodsMapper.insertSelective(cog);
}
+ newCommonOrder.setUserInfo(new UserInfo(uid));
+ commonOrderList.add(addCommonOrder(newCommonOrder));
}
return commonOrderList;
+ }
+
+ @Transactional
+ @Override
+ public List<CommonOrder> addPDDOrder(List<PDDOrder> pddOrderList, Long uid) throws CommonOrderException {
+ List<CommonOrder> commonOrderList = new ArrayList<>();
+ // 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
+ int invalidCount = 0;
+ for (PDDOrder order : pddOrderList) {
+ if (order.getOrderStatus() == -1 || order.getOrderStatus() == 4 || order.getOrderStatus() == 8) {
+ invalidCount++;
+ }
+ }
+ // 鑾峰彇鏁翠綋璁㈠崟鐨勭姸鎬�
+ int wholeOrderState = 0;
+ if (pddOrderList.size() == invalidCount)
+ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_SHIXIAO;
+ else if (invalidCount == 0)
+ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_YOUXIAO;
+ else
+ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO;
+
+ for (PDDOrder pddOrder : pddOrderList) {
+ CommonOrder newCommonOrder = CommonOrderFactory.create(pddOrder);
+ CommonOrderGoods cog = new CommonOrderGoods();
+ cog.setGoodsId(pddOrder.getGoodsId() + "");
+ cog.setGoodsType(Constant.SOURCE_TYPE_PDD);
+ newCommonOrder.setCommonOrderGoods(cog);
+ newCommonOrder.setStateWholeOrder(wholeOrderState);
+ // 璁㈠崟鍟嗗搧鎻掑叆
+ List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper.listByGoodsIdAndGoodsType(cog.getGoodsId(),
+ cog.getGoodsType());
+ if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
+ {
+ PDDGoodsDetail pddGoods = null;
+ pddGoods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(cog.getGoodsId()));
+ if (pddGoods != null) {
+ cog = CommonOrderGoodsFactory.create(pddGoods);
+ }
+ cog.setCreateTime(new Date());
+ cog.setUpdateTime(new Date());
+ commonOrderGoodsMapper.insertSelective(cog);
+ newCommonOrder.setCommonOrderGoods(cog);
+ } else {
+ }
+ newCommonOrder.setUserInfo(new UserInfo(uid));
+ commonOrderList.add(addCommonOrder(newCommonOrder));
+ }
+ return commonOrderList;
+ }
+
+ @Transactional
+ @Override
+ public List<CommonOrder> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException {
+ List<CommonOrder> commonOrderList = new ArrayList<>();
+ // 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
+ int invalidCount = 0;
+ for (JDOrderItem tb : jdOrder.getOrderItemList()) {
+ if (tb.getValidCode() < 16) {
+ invalidCount++;
+ }
+ }
+
+ // 鑾峰彇鏁翠綋璁㈠崟鐨勭姸鎬�
+ int wholeOrderState = 0;
+ if (jdOrder.getOrderItemList().size() == invalidCount)
+ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_SHIXIAO;
+ else if (invalidCount == 0)
+ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_YOUXIAO;
+ else
+ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO;
+
+ List<JDOrderItem> orderItemList = jdOrder.getOrderItemList();
+ jdOrder.setOrderItemList(null);
+
+ for (JDOrderItem itemOrder : orderItemList) {
+ itemOrder.setOrder(jdOrder);
+ CommonOrder newCommonOrder = CommonOrderFactory.create(itemOrder);
+ CommonOrderGoods cog = new CommonOrderGoods();
+ cog.setGoodsId(itemOrder.getSkuId() + "");
+ cog.setGoodsType(Constant.SOURCE_TYPE_JD);
+ newCommonOrder.setCommonOrderGoods(cog);
+ newCommonOrder.setStateWholeOrder(wholeOrderState);
+ // 璁㈠崟鍟嗗搧鎻掑叆
+ List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper.listByGoodsIdAndGoodsType(cog.getGoodsId(),
+ cog.getGoodsType());
+ if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
+ {
+ JDGoods goods = JDApiUtil.getGoodsDetail(itemOrder.getSkuId());
+ if (goods == null) {
+ goods = JDUtil.getGoodsFromWeb(itemOrder.getSkuId());
+ }
+
+ if (goods == null) {
+ goods = new JDGoods();
+ goods.setSkuName(itemOrder.getSkuName());
+ goods.setPrice(itemOrder.getPrice());
+ goods.setSkuId(itemOrder.getSkuId());
+ }
+
+ if (goods != null) {
+ cog = CommonOrderGoodsFactory.create(goods);
+ }
+
+ cog.setCreateTime(new Date());
+ cog.setUpdateTime(new Date());
+ commonOrderGoodsMapper.insertSelective(cog);
+ } else {
+
+ }
+ newCommonOrder.setUserInfo(new UserInfo(uid));
+ commonOrderList.add(addCommonOrder(newCommonOrder));
+ }
+ return commonOrderList;
+ }
+
+ /**
+ * 娣诲姞璁㈠崟
+ *
+ * @param commonOrder
+ */
+ @Transactional
+ private CommonOrder addCommonOrder(CommonOrder commonOrder) throws CommonOrderException {
+ // 鍒ゆ柇鍟嗗搧鏄惁瀛樺湪
+ if (commonOrder == null)
+ throw new CommonOrderException(1, "璁㈠崟涓虹┖");
+ if (commonOrder.getUserInfo() == null)
+ throw new CommonOrderException(2, "璁㈠崟鐢ㄦ埛涓虹┖");
+
+ if (commonOrder.getCommonOrderGoods() == null || commonOrder.getCommonOrderGoods().getGoodsId() == null
+ || commonOrder.getCommonOrderGoods().getGoodsType() == null)
+ throw new CommonOrderException(3, "璁㈠崟鍟嗗搧涓虹┖");
+ // 涓嶅瓨鍦ㄥ氨鎻掑叆锛屽瓨鍦ㄥ氨涓嶇
+ CommonOrderGoods goods = commonOrder.getCommonOrderGoods();
+
+ // 涔嬪墠涓嶅瓨鍦ㄤ簬鏁版嵁搴�
+ if (commonOrder.getCommonOrderGoods().getId() == null) {
+ List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper
+ .listByGoodsIdAndGoodsType(goods.getGoodsId(), goods.getGoodsType());
+
+ if (commonGoodsList == null || commonGoodsList.size() < 1) {// 涓嶅瓨鍦�
+ commonOrderGoodsMapper.insertSelective(goods);
+ } else {// 瀛樺湪
+ goods = commonGoodsList.get(0);
+ }
+ if (goods.getId() == null)
+ throw new CommonOrderException(4, "鍟嗗搧鎻掑叆澶辫触");
+ commonOrder.setCommonOrderGoods(goods);
+ }
+
+ CommonOrder oldCommonOrder = null;
+
+ if (!StringUtil.isNullOrEmpty(commonOrder.getTradeId()))
+ oldCommonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(commonOrder.getSourceType(),
+ commonOrder.getTradeId());
+ else {
+ throw new CommonOrderException(10, "浜ゆ槗ID涓虹┖");
+ }
+ if (oldCommonOrder == null)// 鏂板
+ {
+ commonOrder.setCreateTime(new Date());
+ commonOrderMapper.insertSelective(commonOrder);
+ // 鎻掑叆鏄犲皠锛屼繚璇佷氦鏄揑D鐨勫畬鏁存��
+ commonOrderTradeIdMapMapper.insertSelective(new CommonOrderTradeIdMap(commonOrder.getId(),
+ commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));
+ return commonOrder;
+ } else {// 淇敼
+ // 宸茬粡缁撶畻锛屽凡缁忓け鏁堬紝鐘舵�佹湭鏀瑰彉鐨勮鍗曚笉澶勭悊
+ if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX
+ || oldCommonOrder.getState() == CommonOrder.STATE_WQ
+ || (oldCommonOrder.getState().intValue() == commonOrder.getState())) {
+ return oldCommonOrder;
+ }
+ // 浜ゆ槗ID涓�鑷存墠淇敼
+ if (commonOrder.getTradeId() != null
+ && commonOrder.getTradeId().equalsIgnoreCase(oldCommonOrder.getTradeId())) {
+ CommonOrder updateCommonOrder = new CommonOrder(oldCommonOrder.getId());
+ updateCommonOrder.seteIncome(commonOrder.geteIncome());
+ updateCommonOrder.setEstimate(commonOrder.getEstimate());
+ updateCommonOrder.setPayment(commonOrder.getPayment());
+ updateCommonOrder.setSettlement(commonOrder.getSettlement());
+ updateCommonOrder.setSettleTime(commonOrder.getSettleTime());
+ updateCommonOrder.setState(commonOrder.getState());
+ updateCommonOrder.setStateWholeOrder(commonOrder.getStateWholeOrder());
+ updateCommonOrder.setUpdateTime(new Date());
+ updateCommonOrder.setTradeId(commonOrder.getTradeId());
+ commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);
+ return commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId());
+ } else
+ return oldCommonOrder;
+ }
}
@Override
@@ -727,10 +1027,17 @@
@Override
public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
- Integer type, Integer orderState, String startTime, String endTime) throws CommonOrderException {
+ Integer type, Integer orderState, String startTime, String endTime, Integer source)
+ throws CommonOrderException {
- List<CommonOrderVO> list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState,
- startTime, endTime);
+ List<CommonOrderVO> list = null;
+
+ if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗�
+ list = commonOrderMapper.listQueryWithNoChild(start, count, keyType, key, state, type, orderState,
+ startTime, endTime, source);
+ } else
+ list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState, startTime, endTime,
+ source);
if (list == null) {
list = new ArrayList<CommonOrderVO>();
@@ -738,6 +1045,37 @@
if (list.size() == 0) {
return list;
+ }
+
+ List<String> listTB = new ArrayList<String>();
+ List<String> listJD = new ArrayList<String>();
+ List<String> listPDD = new ArrayList<String>();
+ for (CommonOrderVO commonOrderVO : list) {
+ Integer sourceType = commonOrderVO.getSourceType();
+ if (sourceType == null) {
+ continue;
+ } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
+ listTB.add(commonOrderVO.getOrderNo());
+ } else if (sourceType == Constant.SOURCE_TYPE_JD) {
+ listJD.add(commonOrderVO.getOrderNo());
+ } else if (sourceType == Constant.SOURCE_TYPE_PDD) {
+ listPDD.add(commonOrderVO.getOrderNo());
+ }
+ }
+
+ List<UserSystemCouponRecord> listRecordTB = null;
+ if (listTB.size() > 0) {
+ listRecordTB = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_TAOBAO, listTB);
+ }
+
+ List<UserSystemCouponRecord> listRecordJD = null;
+ if (listJD.size() > 0) {
+ listRecordJD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_JD, listJD);
+ }
+
+ List<UserSystemCouponRecord> listRecordPDD = null;
+ if (listPDD.size() > 0) {
+ listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);
}
SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
@@ -794,6 +1132,85 @@
order.setHongBaoState(3);
}
+ List<HongBaoV2> listhb = hongBaoV2Service.listChildrenById(order.getHongbaoId());
+ if (listhb != null && listhb.size() > 0) {
+ if (listhb.size() == 1) {
+ UserInfo userInfo = listhb.get(0).getUserInfo();
+ if (userInfo != null) {
+ order.setLevelOneId(userInfo.getId() + "");
+ order.setLevelOneMoney(listhb.get(0).getMoney() + "");
+ }
+ } else if (listhb.size() == 2) {
+ UserInfo userInfo = listhb.get(0).getUserInfo();
+ if (userInfo != null) {
+ order.setLevelOneId(userInfo.getId() + "");
+ order.setLevelOneMoney(listhb.get(0).getMoney() + "");
+ }
+
+ UserInfo userInfo2 = listhb.get(1).getUserInfo();
+ if (userInfo2 != null) {
+ order.setLevelTwoId(userInfo2.getId() + "");
+ order.setLevelTwoMoney(listhb.get(1).getMoney() + "");
+ }
+ }
+ }
+
+ Integer sourceType = order.getSourceType();
+ // 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
+ if (sourceType == null) {
+
+ } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO && listRecordTB != null && listRecordTB.size() > 0) {
+ for (UserSystemCouponRecord couponRecord : listRecordTB) {
+ if (order.getOrderNo().equals(couponRecord.getOrderNo())) {
+ String systemCouponType = couponRecord.getCouponType();
+ Integer couponState = couponRecord.getState();
+ if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
+ || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
+ if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
+ // 鍏嶅崟鎴愬姛
+ order.setOtherState(2);
+ } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
+ order.setOtherState(1);
+ }
+ }
+ break;
+ }
+ }
+ } else if (sourceType == Constant.SOURCE_TYPE_JD && listRecordJD != null && listRecordJD.size() > 0) {
+ for (UserSystemCouponRecord couponRecord : listRecordJD) {
+ if (order.getOrderNo().equals(couponRecord.getOrderNo())) {
+ String systemCouponType = couponRecord.getCouponType();
+ Integer couponState = couponRecord.getState();
+ if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
+ || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
+ if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
+ // 鍏嶅崟鎴愬姛
+ order.setOtherState(2);
+ } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
+ order.setOtherState(1);
+ }
+ }
+ break;
+ }
+ }
+ } else if (sourceType == Constant.SOURCE_TYPE_PDD && listRecordPDD != null && listRecordPDD.size() > 0) {
+ for (UserSystemCouponRecord couponRecord : listRecordPDD) {
+ if (order.getOrderNo().equals(couponRecord.getOrderNo())) {
+ String systemCouponType = couponRecord.getCouponType();
+ Integer couponState = couponRecord.getState();
+ if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
+ || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
+ if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
+ // 鍏嶅崟鎴愬姛
+ order.setOtherState(2);
+ } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
+ order.setOtherState(1);
+ }
+ }
+ break;
+ }
+ }
+ }
}
return list;
@@ -802,24 +1219,23 @@
@Override
public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
- String startTime, String endTime) throws CommonOrderException {
- return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime);
+ String startTime, String endTime, Integer source) 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);
}
@Override
- public CommonOrderVO getInfoByOrderNo(Long uid,String orderNo) throws CommonOrderException{
- List<CommonOrderVO> list = getOrderByUid(1, uid, null, null, null, orderNo, null, null, null);
- if (list == null || list.size() == 0) {
- return null;
- } else {
- return list.get(0);
+ public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState, Integer sourceType)
+ throws CommonOrderException {
+
+ if (sourceType == null) {
+ sourceType = Constant.SOURCE_TYPE_TAOBAO;
}
- }
-
- @Override
- public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState) throws CommonOrderException {
- CommonOrderVO commonOrderVO = commonOrderMapper.getCommonOrderByOrderNo(uid, orderNo, orderState);
+ CommonOrderVO commonOrderVO = commonOrderMapper.getCommonOrderByOrderNo(uid, orderNo, orderState, sourceType);
// 璁㈠崟淇℃伅涓虹┖
if (commonOrderVO == null) {
return null;
@@ -844,13 +1260,13 @@
}
String orderNo1 = commonOrder.getOrderNo();
- Integer sourceType = commonOrder.getSourceType();
+ Integer sourceType1 = commonOrder.getSourceType();
String orderNo2 = commonOrderVO.getOrderNo();
Integer sourceType2 = commonOrderVO.getSourceType();
// 鏉ユ簮銆佽鍗曞彿鐩稿悓
- if (sourceType.equals(sourceType2) && orderNo1.equals(orderNo2)) {
+ if (sourceType1.equals(sourceType2) && orderNo1.equals(orderNo2)) {
// 鍔犲叆鍟嗗搧淇℃伅
List<CommonOrderGoodsVO> listOrderGoods = commonOrderVO.getListOrderGoods();
@@ -887,7 +1303,7 @@
totalSettlement = commonOrder.getTotalPayment();
}
// 瀹炰粯娆�
- commonGoodsVO.setActualPay("瀹炰粯娆撅細楼" + totalSettlement);
+ commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
listOrderGoods.add(commonGoodsVO);
@@ -907,63 +1323,83 @@
return commonOrderVO;
}
-
- @Override
- public List<CommonOrderVO> getCouponHongbaoByOrderNo(Long uid, Integer hongBaoState, String orderNo) throws CommonOrderException {
- List<CommonOrderVO> listOrder = commonOrderMapper.getCouponHongbaoByOrderNo(uid, hongBaoState, orderNo);
-
- // 璁㈠崟淇℃伅涓虹┖
- if (listOrder == null || listOrder.size() == 0) {
- listOrder = new ArrayList<CommonOrderVO>();
- return listOrder;
- }
-
- // 鍟嗗搧淇℃伅
- List<CommonOrderVO> listGoods = commonOrderMapper.listOrderGoodsInfo(listOrder);
- // 璁㈠崟鍟嗗搧涓虹┖
- if (listGoods == null || listGoods.size() == 0) {
- return listOrder;
- }
-
- // 鏁版嵁鍔犲伐閲嶆柊缁勭粐
- listDataFactory(listOrder, listGoods, uid);
-
- return listOrder;
- }
-
-
@Override
public JSONObject getRewardJumpInfo(String orderNo) {
-
+
JSONObject map = new JSONObject();
// 璁㈠崟鏍囪瘑
List<String> signList = new ArrayList<String>();
signList.add(CommonOrder.TYPE_FANLI);
signList.add(PIC_REWARD); // 鍔犲叆濂栧姳鎴愬姛鍥剧墖
map.put("signList", signList);
-
-
+
ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
// 濂栧姳鍒歌繘搴﹁鎯�
rewardStyleVO.setContent("杩斿埄濂栧姳 >");
- rewardStyleVO.setColor( "#E5005C");
+ rewardStyleVO.setColor("#E5005C");
rewardStyleVO.setBottomColor("#FFDCEA");
-
- Map<String, Object> jumpLink = new HashMap<String,Object>();
+
+ Map<String, Object> jumpLink = new HashMap<String, Object>();
jumpLink.put("orderNo", orderNo);
-
- Map<String, Object> jump = new HashMap<String,Object>();
- jump.put("type", 1);
- 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);
-
- map.put("rewardDetail", rewardMap);
-
+
+ Map<String, Object> jump = new HashMap<String, Object>();
+ jump.put("type", 1);
+ 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);
+
+ map.put("rewardDetail", rewardMap);
+
return map;
}
+
+ @Override
+ public CommonOrder selectBySourceTypeAndTradeId(int sourceType, String tradeId) {
+ return commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId);
+ }
+
+ @Transactional
+ @Override
+ public void deleteErrorCommonOrder(Long coId) {
+ // 鏌ヨ鏄惁杩斿埄鍒拌处
+ HongBaoOrder hongBaoOrder = hongBaoOrderService.selectDetailByCommonOrderId(coId);
+ if (hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_YILINGQU)
+ return;
+ List<HongBaoV2> hongBaoList = hongBaoV2Service.listChildrenById(hongBaoOrder.getHongBaoV2().getId());
+ boolean canDelete = true;
+ for (HongBaoV2 child : hongBaoList)
+ if (child.getState() == HongBaoV2.STATE_YILINGQU) {
+ canDelete = false;
+ break;
+ }
+ // 涓嶈兘鍒犻櫎
+ if (!canDelete)
+ return;
+
+ // 鍒犻櫎child
+ for (HongBaoV2 child : hongBaoList)
+ hongBaoV2Service.deleteByPrimaryKey(child.getId());
+ // 鍒犻櫎涓荤孩鍖�
+ hongBaoV2Service.deleteByPrimaryKey(hongBaoOrder.getHongBaoV2().getId());
+ // 鍒犻櫎hongbaoOrder
+ hongBaoOrderService.deleteByPrimaryKey(hongBaoOrder.getId());
+ // 鍒犻櫎CommonOrder
+ commonOrderMapper.deleteByPrimaryKey(hongBaoOrder.getCommonOrder().getId());
+ }
+
+ @Override
+ public List<CommonOrder> listBySourceTypeAndTradeId(int sourceType, String tradeId) {
+ return commonOrderMapper.listBySourceTypeAndTradeId(sourceType, tradeId);
+ }
+
+ @Override
+ public List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime,
+ Long maxTime, int page, int pageSize) {
+ return commonOrderMapper.listBySourceTypeAndStateAndThirdCrateTime(sourceType, state, minTime, maxTime,
+ (page - 1) * pageSize, pageSize);
+ }
}
--
Gitblit v1.8.0