From 32f925357776c46bd9e35cf9aad4fdd0f6535d1d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 22 十月 2019 09:21:35 +0800
Subject: [PATCH] 订单奖励修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 317 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 232 insertions(+), 85 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 d17a644..95b073c 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
@@ -14,12 +14,15 @@
import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.yeshi.utils.DateUtil;
+import org.yeshi.utils.entity.DateInfo;
import org.yeshi.utils.taobao.TbImgUtil;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;
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.order.CommonOrderAddResultDTO;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
@@ -33,6 +36,7 @@
import com.yeshi.fanli.entity.order.CommonOrderGoods;
import com.yeshi.fanli.entity.order.CommonOrderTradeIdMap;
import com.yeshi.fanli.entity.order.HongBaoOrder;
+import com.yeshi.fanli.entity.order.OrderSubsidy;
import com.yeshi.fanli.entity.pdd.PDDOrder;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -45,9 +49,10 @@
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.order.HongBaoV2Service;
+import com.yeshi.fanli.service.inter.order.OrderSubsidyService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.Constant;
@@ -109,6 +114,10 @@
@Resource
private HongBaoOrderService hongBaoOrderService;
+
+ @Resource
+ private OrderSubsidyService orderSubsidyService;
+
// 濂栧姳璁㈠崟鍥剧墖
public final static String PIC_REWARD = "http://img.flqapp.com/resource/order/order_state_reward.png";
@@ -216,9 +225,35 @@
}
@Override
- public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime,
- Integer day, Integer source) {
- return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime, day, source);
+ public Long countUserOrderToApp(Long uid, Integer type, String startTime, String endTime,
+ Integer day, Integer source, Integer state, Integer stateOrder) {
+ return commonOrderMapper.countUserOrderToApp(uid, type, startTime, endTime, day, source, state, stateOrder);
+ }
+
+ private BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid) {
+ BigDecimal weiQuanMoney = new BigDecimal(0);
+ if (listWQ != null && listWQ.size() > 0) {
+ for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) {
+ String tradeId = weiQuanOrder.getOrderItemId();
+ // 鏌ヨ绾㈠寘
+ List<String> tradeList = new ArrayList<>();
+ tradeList.add(tradeId);
+ List<HongBaoV2> hongBaoList = hongBaoV2Service.listBySourceTypeAndTradeIdListAndUid(sourceType, uid,
+ tradeList);
+ if (hongBaoList != null && hongBaoList.size() > 0) {
+ CommonOrder commonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId);
+ if (commonOrder != null && commonOrder.getSettlement().compareTo(new BigDecimal(0)) > 0) {
+ BigDecimal wqMoney = MoneyBigDecimalUtil
+ .mul(hongBaoList.get(0).getMoney(), weiQuanOrder.getMoney())
+ .divide(commonOrder.getSettlement(), 2, BigDecimal.ROUND_UP);
+ if (wqMoney.compareTo(hongBaoList.get(0).getMoney()) > 0)
+ wqMoney = hongBaoList.get(0).getMoney();
+ weiQuanMoney = weiQuanMoney.add(wqMoney);
+ }
+ }
+ }
+ }
+ return weiQuanMoney;
}
public void listDataFactory(AcceptData acceptData, List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods,
@@ -329,7 +364,8 @@
SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");
// 鏄惁瀛樺湪濂栧姳鍒�
- //boolean hasRewardCoupon = userSystemCouponService.hasRewardCoupon(uid);
+ // boolean hasRewardCoupon =
+ // userSystemCouponService.hasRewardCoupon(uid);
boolean hasRewardCoupon = userSystemCouponService.getIncludeNotExchange(uid);
boolean exchangeCoupon = userSystemCouponService.getIncludeExchange(uid);
@@ -409,21 +445,7 @@
.selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛");
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 (fanTotalMoney.compareTo(hongBao) < 0) {
- isPart = true;
- }
- }
+ BigDecimal weiQuanMoney = getWeiQuanMoney(listWQ, sourceType, uid);
if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
if (isPart) {
@@ -437,19 +459,17 @@
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);
- }
+ // if (isPart) {
+ weiQuanInfo
+ .setWqHongBao("缁存潈锛�-楼" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
+ // } else {
+ // weiQuanInfo
+ // .setWqHongBao("缁存潈锛�-楼" + weiQuanMoney.setScale(2,
+ // BigDecimal.ROUND_DOWN).toString());
+ // hongBao = MoneyBigDecimalUtil.sub(hongBao,
+ // weiQuanMoney);
+ // }
order.setWeiQuanInfo(weiQuanInfo);
}
}
@@ -477,14 +497,42 @@
order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);
signList.add(CommonOrder.TYPE_SHARE);
- } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
- || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
- || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
- // 閭�璇�
+ } else if (HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
+ // 涓嬬骇鐨勫垎浜鍗曪細 鏄剧ず閭�璇�
hongbaoInfo = "濂栭噾";
order.setOrderOrigin("3");
order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
signList.add(CommonOrder.TYPE_INVITE);
+ } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
+ || HongBaoV2.TYPE_ERJI == hongBaoType) {
+ // 閭�璇疯鍗�
+ hongbaoInfo = "濂栭噾";
+ order.setOrderOrigin("3");
+ order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
+ signList.add(CommonOrder.TYPE_INVITE);
+
+ // 鐗堟湰鍖哄垎锛�2-0-2
+ if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ OrderSubsidy orderSubsidy = orderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(), sourceType2);
+ if (orderSubsidy != null) {
+ ClientTextStyleVO subsidyInfo = new ClientTextStyleVO();
+ if (orderSubsidy.getState() == OrderSubsidy.STATE_SUBSIDIZED) {
+ subsidyInfo.setColor("#E5005C");
+ subsidyInfo.setContent("宸茶ˉ璐绰�" + orderSubsidy.getMoney());
+ } else {
+ subsidyInfo.setColor("#888888");
+ subsidyInfo.setContent("琛ヨ创楼" + orderSubsidy.getMoney());
+
+ // 瑙ｉ噴淇℃伅锛堥棶鍙凤級
+ List<String> subsidyList = new ArrayList<String>();
+ subsidyList.add("棰濆琛ヨ创鑳藉惁鑾峰緱鐢辩郴缁熺畻娉曡嚜鍔ㄥ垽鏂紝浜轰负鏃犳硶骞叉秹锛�");
+ subsidyList.add("棰濆琛ヨ创鍒拌处鏃堕棿浠ュ強閲戦璇蜂互瀹為檯鍒拌处涓哄噯锛�");
+ subsidyList.add("棰濆琛ヨ创浜х敓鍚庡皢浼氬湪娑堟伅-璧勯噾娑堟伅涓彁閱掍綘銆�");
+ order.setSubsidyList(subsidyList);
+ }
+ order.setSubsidy(subsidyInfo);
+ }
+ }
}
String hongBaoDate = null;
@@ -531,6 +579,10 @@
order.setHongBaoState(orderHongBaoState);
order.setHongBaoDate(hongBaoDate);
+ if (!StringUtil.isNullOrEmpty(order.getStateDesc())) {
+ stateContent = stateContent + "-" + order.getStateDesc();
+ }
+
Map<String, String> stateMap = new HashMap<String, String>();
stateMap.put("content", stateContent);
stateMap.put("fontColor", stateFontColor);
@@ -550,13 +602,17 @@
} else {
// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
if (sourceType == null) {
- setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, null, signList, acceptData);
+ setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, null,
+ signList, acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, listRecordTB, signList, acceptData);
+ setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
+ listRecordTB, signList, acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_JD) {
- setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, listRecordJD, signList, acceptData);
+ setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
+ listRecordJD, signList, acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
- setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, listRecordPDD, signList, acceptData);
+ setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
+ listRecordPDD, signList, acceptData);
}
}
@@ -578,11 +634,12 @@
* @param list
* @param signList
*/
- public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, boolean exchangeCoupon, Integer hongBaoState,
- Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList, AcceptData acceptData) {
+ public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, boolean exchangeCoupon,
+ Integer hongBaoState, Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList,
+ AcceptData acceptData) {
// 鏄惁鍏嶅崟鍟嗗搧
- boolean freeOrder = false;
+ boolean freeOrder = false;
// 鏄惁濂栧姳鎴愬姛
boolean rewardSuccess = false;
@@ -629,18 +686,18 @@
// 1.6.5 鏄惁瀛樺湪鏂板厬鎹㈢殑鍒�
if (!hasRewardCoupon && exchangeCoupon) {
try {
- String downTime = order.getDownTime();
- if (!StringUtil.isNullOrEmpty(downTime)) {
- long downOrderTime = TimeUtil.convertDateToTemp2(downTime);
- long limitDate = TimeUtil.convertDateToTemp("2019-09-01");
- if (downOrderTime > limitDate )
+ Date thirdCreateTime = order.getThirdCreateTime();
+ if (thirdCreateTime != null) {
+ long downOrderTime = thirdCreateTime.getTime();
+ long limitDate = TimeUtil.convertDateToTemp("2019-09-10");
+ if (downOrderTime > limitDate)
hasRewardCoupon = true;
}
} catch (Exception e) {
e.printStackTrace();
}
}
-
+
boolean rewardOrder = false;
int type = 1; // 1 甯歌璺宠浆椤甸潰 2寮瑰嚭閫夐」锛堝鍔卞埜锛�
@@ -652,31 +709,106 @@
// 鏈夊彲鐢ㄧ殑濂栧姳鍒� 銆侀潪鍏嶅崟璁㈠崟 銆佷笖宸插埌璐︾殑 銆佽繑鍒╄鍗�
type = 2;
rewardOrder = true;
- }
+ }
if (rewardOrder) {
- ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
- // 濂栧姳鍒歌繘搴﹁鎯�
- rewardStyleVO.setContent("杩斿埄濂栧姳 >");
- rewardStyleVO.setColor("#E5005C");
- rewardStyleVO.setBottomColor("#FFDCEA");
+ try {
+ boolean newEdition = false;
+ String num = null;
+ String unit = null;
+ boolean canUse = false;
+
+ // 鐗堟湰鍖哄垎锛�2.0.2
+ if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ Date thirdCreateTime = order.getThirdCreateTime();
+ if (thirdCreateTime != null) {
+ long downOrderTime = thirdCreateTime.getTime();
+ long limitDate = Long.parseLong("1573315200000"); // TODO 鏃ユ湡寰呯‘瀹�2019-11-10
+ if (downOrderTime > limitDate) {
+ newEdition = true;
+ Date endDay = DateUtil.plusDayDate(4, thirdCreateTime);
+ long currentTime = java.lang.System.currentTimeMillis();
+ if (endDay.getTime() > currentTime) {
+ DateInfo dateInfo = DateUtil.dateDiff3(currentTime, endDay.getTime());
+ if (dateInfo != null) {
+ if (dateInfo.getDay() > 0) {
+ canUse = true;
+ unit = "澶�";
+ num = dateInfo.getDay().toString();
+ }
- Map<String, Object> jumpLink = new HashMap<String, Object>();
- jumpLink.put("orderNo", order.getOrderNo());
- if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
- jumpLink.put("goodsType", order.getSourceType());
+ if (!canUse && dateInfo.getHour() > 0) {
+ canUse = true;
+ unit = "灏忔椂";
+ num = dateInfo.getHour().toString();
+ }
+
+ if (!canUse && dateInfo.getMinute() > 0) {
+ canUse = true;
+ unit = "鍒�";
+ num = dateInfo.getMinute().toString();
+ }
+
+ if (!canUse && dateInfo.getSecond() > 0) {
+ canUse = true;
+ unit = "绉�";
+ num = dateInfo.getSecond().toString();
+ }
+ }
+ }
+ }
+ }
+ }
+
+ if (newEdition && !canUse) {
+ // 鏂扮増涓嶅彲浣跨敤
+ } else {
+ Map<String, Object> rewardMap = new HashMap<String, Object>();
+ ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
+ rewardStyleVO.setColor("#E5005C");
+ rewardStyleVO.setBottomColor("#FFDCEA");
+ if (!newEdition) {
+ rewardStyleVO.setContent("杩斿埄濂栧姳 >");
+ } else if (canUse) {
+ rewardStyleVO.setContent("杩斿埄濂栧姳 ");
+
+ ClientTextStyleVO txt1 = new ClientTextStyleVO();
+ txt1.setContent("鍓�");
+ txt1.setColor("#666666");
+ txt1.setBottomColor("#FFDCEA");
+
+ ClientTextStyleVO txt2 = new ClientTextStyleVO();
+ txt2.setContent(num);
+ txt2.setColor("#E5005C");
+ txt2.setBottomColor("#FFDCEA");
+
+ ClientTextStyleVO txt3 = new ClientTextStyleVO();
+ txt3.setContent(unit + "鍏抽棴 >");
+ txt3.setColor("#666666");
+ txt3.setBottomColor("#FFDCEA");
+
+ List<ClientTextStyleVO> ticking = new ArrayList<ClientTextStyleVO>();
+ ticking.add(txt1);
+ ticking.add(txt2);
+ ticking.add(txt3);
+ rewardMap.put("ticking", ticking);
+ }
+ rewardMap.put("text", rewardStyleVO);
+
+ Map<String, Object> jumpLink = new HashMap<String, Object>();
+ jumpLink.put("orderNo", order.getOrderNo());
+ jumpLink.put("goodsType", order.getSourceType() + "");
+
+ Map<String, Object> jump = new HashMap<String, Object>();
+ jump.put("type", type);
+ jump.put("params", jumpLink);
+ jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
+ rewardMap.put("jump", jump);
+ order.setRewardDetail(rewardMap);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
}
-
- 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) {
@@ -689,7 +821,7 @@
Map<String, Object> jumpLink = new HashMap<String, Object>();
jumpLink.put("orderNo", order.getOrderNo());
if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
- jumpLink.put("goodsType", order.getSourceType());
+ jumpLink.put("goodsType", order.getSourceType()+"");
}
Map<String, Object> jump = new HashMap<String, Object>();
@@ -712,8 +844,9 @@
@Transactional
@Override
- public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid) throws CommonOrderException {
- List<CommonOrder> commonOrderList = new ArrayList<>();
+ public List<CommonOrderAddResultDTO> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid)
+ throws CommonOrderException {
+ List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();
// 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
int invalidCount = 0;
for (TaoBaoOrder tb : taoBaoOrders) {
@@ -773,8 +906,9 @@
@Transactional
@Override
- public List<CommonOrder> addPDDOrder(List<PDDOrder> pddOrderList, Long uid) throws CommonOrderException {
- List<CommonOrder> commonOrderList = new ArrayList<>();
+ public List<CommonOrderAddResultDTO> addPDDOrder(List<PDDOrder> pddOrderList, Long uid)
+ throws CommonOrderException {
+ List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();
// 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
int invalidCount = 0;
for (PDDOrder order : pddOrderList) {
@@ -822,8 +956,8 @@
@Transactional
@Override
- public List<CommonOrder> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException {
- List<CommonOrder> commonOrderList = new ArrayList<>();
+ public List<CommonOrderAddResultDTO> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException {
+ List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();
// 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
int invalidCount = 0;
for (JDOrderItem tb : jdOrder.getOrderItemList()) {
@@ -891,7 +1025,7 @@
* @param commonOrder
*/
@Transactional
- private CommonOrder addCommonOrder(CommonOrder commonOrder) throws CommonOrderException {
+ private CommonOrderAddResultDTO addCommonOrder(CommonOrder commonOrder) throws CommonOrderException {
// 鍒ゆ柇鍟嗗搧鏄惁瀛樺湪
if (commonOrder == null)
throw new CommonOrderException(1, "璁㈠崟涓虹┖");
@@ -934,13 +1068,13 @@
// 鎻掑叆鏄犲皠锛屼繚璇佷氦鏄揑D鐨勫畬鏁存��
commonOrderTradeIdMapMapper.insertSelective(new CommonOrderTradeIdMap(commonOrder.getId(),
commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));
- return commonOrder;
+ return new CommonOrderAddResultDTO(commonOrder, CommonOrderAddResultDTO.TYPE_ADD);
} else {// 淇敼
// 宸茬粡缁撶畻锛屽凡缁忓け鏁堬紝鐘舵�佹湭鏀瑰彉鐨勮鍗曚笉澶勭悊
if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX
|| oldCommonOrder.getState() == CommonOrder.STATE_WQ
|| (oldCommonOrder.getState().intValue() == commonOrder.getState())) {
- return oldCommonOrder;
+ return new CommonOrderAddResultDTO(oldCommonOrder, CommonOrderAddResultDTO.TYPE_NOUPDATE);
}
// 浜ゆ槗ID涓�鑷存墠淇敼
if (commonOrder.getTradeId() != null
@@ -956,9 +1090,10 @@
updateCommonOrder.setUpdateTime(new Date());
updateCommonOrder.setTradeId(commonOrder.getTradeId());
commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);
- return commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId());
+ return new CommonOrderAddResultDTO(commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId()),
+ CommonOrderAddResultDTO.TYPE_UPDATE);
} else
- return oldCommonOrder;
+ return new CommonOrderAddResultDTO(oldCommonOrder, CommonOrderAddResultDTO.TYPE_NOUPDATE);
}
}
@@ -1352,7 +1487,7 @@
}
@Override
- public JSONObject getRewardJumpInfo(String orderNo) {
+ public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType) {
JSONObject map = new JSONObject();
// 璁㈠崟鏍囪瘑
@@ -1369,6 +1504,7 @@
Map<String, Object> jumpLink = new HashMap<String, Object>();
jumpLink.put("orderNo", orderNo);
+ jumpLink.put("goodsType", goodsType == null? goodsType: goodsType +"");
Map<String, Object> jump = new HashMap<String, Object>();
jump.put("type", 1);
@@ -1429,10 +1565,21 @@
return commonOrderMapper.listBySourceTypeAndStateAndThirdCrateTime(sourceType, state, minTime, maxTime,
(page - 1) * pageSize, pageSize);
}
-
+
@Override
public List<CommonOrder> getByOrderNo(Long uid, String orderNO) {
return commonOrderMapper.getByOrderNo(uid, orderNO);
}
+ @Override
+ public CommonOrder selectLatestValidByUid(Long uid) {
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add(CommonOrder.STATE_FK);
+ stateList.add(CommonOrder.STATE_JS);
+ List<CommonOrder> commonOrderList = commonOrderMapper.listByUid(uid, stateList, 0, 1);
+ if (commonOrderList == null || commonOrderList.size() == 0)
+ return null;
+ return commonOrderList.get(0);
+ }
+
}
--
Gitblit v1.8.0