From d88c167fc5973a2c15ff1539e4cdab36e4a7842c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 28 八月 2019 14:47:15 +0800
Subject: [PATCH] 奖励券使用区分订单下单三方日期
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 190 +++++++++++++++++++++++++++++++++--------------
1 files changed, 132 insertions(+), 58 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 93915b6..d17a644 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;
@@ -52,6 +53,9 @@
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;
@@ -63,6 +67,7 @@
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;
@@ -324,7 +329,17 @@
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);
+
+ // 2019.8.1寮�濮嬭繑鍥炵淮鏉冧俊鎭�
+ Date august = null;
+ try {
+ august = TimeUtil.parse("2019-08-01");
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
/* 缁勭粐璁㈠崟鐘舵�� 绛変俊鎭� */
for (CommonOrderVO order : listOrder) {
@@ -373,6 +388,11 @@
}
}
+ BigDecimal hongBao = order.getHongBao();
+ if (hongBao == null) {
+ hongBao = new BigDecimal(0);
+ }
+
if (CommonOrder.STATE_FK == orderState) {
orderStateContent = "宸蹭粯娆�";
} else if (CommonOrder.STATE_JS == orderState) {
@@ -389,7 +409,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) {
@@ -397,17 +417,41 @@
if (fanMoney != null) {
fanTotalMoney = MoneyBigDecimalUtil.add(fanTotalMoney, fanMoney);
}
+ weiQuanMoney = MoneyBigDecimalUtil.add(weiQuanOrder.getMoney(), weiQuanMoney);
}
- if (fanTotalMoney.compareTo(order.getHongBao()) < 0) {
+ if (fanTotalMoney.compareTo(hongBao) < 0) {
isPart = true;
}
}
- if (isPart) {
- hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 閮ㄥ垎澶辨晥
+ if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (isPart) {
+ hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 閮ㄥ垎澶辨晥
+ } else {
+ hongBaoState = HongBaoV2.STATE_SHIXIAO; // 鍏ㄩ儴澶辨晥
+ }
} else {
- hongBaoState = HongBaoV2.STATE_SHIXIAO; // 鍏ㄩ儴澶辨晥
+ // 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);
+ }
}
}
}
@@ -494,43 +538,33 @@
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 {
- Integer sourceType = order.getSourceType();
// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
if (sourceType == null) {
- setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, null, signList);
+ setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, null, signList, acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, signList);
+ setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, listRecordTB, signList, acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_JD) {
- setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, signList);
+ setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, listRecordJD, signList, acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
- setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, signList);
+ setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, listRecordPDD, signList, acceptData);
}
}
- // 閭�璇� 闅愯棌璁㈠崟鍙�
- if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {
- String orderNo = order.getOrderNo();
- orderNo = orderNo.substring(0, orderNo.length() - 6);
- order.setOrderNo(orderNo + "******");
- } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
- || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
- || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
- String orderNo = order.getOrderNo();
- orderNo = orderNo.substring(0, orderNo.length() - 6);
- order.setOrderNo(orderNo + "******");
+ // 鍒嗕韩銆侀個璇� 闅愯棌璁㈠崟鍙�
+ 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()));
}
}
}
@@ -544,8 +578,8 @@
* @param list
* @param signList
*/
- public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState,
- Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList) {
+ public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, boolean exchangeCoupon, Integer hongBaoState,
+ Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList, AcceptData acceptData) {
// 鏄惁鍏嶅崟鍟嗗搧
boolean freeOrder = false;
@@ -565,7 +599,8 @@
signList.add(PIC_REWARD); // 鍔犲叆濂栧姳鎴愬姛鍥剧墖
} else if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
- || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
+ || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
+ || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
if (UserSystemCouponRecord.STATE_FREE_ON == state) {
// 鍏嶅崟涓�
@@ -591,6 +626,21 @@
// 璁㈠崟鏍囪瘑
order.setSignList(signList);
+ // 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 )
+ hasRewardCoupon = true;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
boolean rewardOrder = false;
int type = 1; // 1 甯歌璺宠浆椤甸潰 2寮瑰嚭閫夐」锛堝鍔卞埜锛�
@@ -602,7 +652,7 @@
// 鏈夊彲鐢ㄧ殑濂栧姳鍒� 銆侀潪鍏嶅崟璁㈠崟 銆佷笖宸插埌璐︾殑 銆佽繑鍒╄鍗�
type = 2;
rewardOrder = true;
- }
+ }
if (rewardOrder) {
ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
@@ -613,6 +663,9 @@
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());
+ }
Map<String, Object> jump = new HashMap<String, Object>();
jump.put("type", type);
@@ -635,6 +688,9 @@
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());
+ }
Map<String, Object> jump = new HashMap<String, Object>();
jump.put("type", 1); // 椤甸潰璺宠浆
@@ -757,16 +813,6 @@
commonOrderGoodsMapper.insertSelective(cog);
newCommonOrder.setCommonOrderGoods(cog);
} else {
- if (!Constant.IS_OUTNET) {
- PDDGoodsDetail pddGoods = null;
- pddGoods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(cog.getGoodsId()));
- if (pddGoods != null) {
- cog = CommonOrderGoodsFactory.create(pddGoods);
- commonGoodsList.get(0).setPicture(cog.getPicture());
- commonOrderGoodsMapper.updateByPrimaryKeySelective(commonGoodsList.get(0));
- }
- }
-
}
newCommonOrder.setUserInfo(new UserInfo(uid));
commonOrderList.add(addCommonOrder(newCommonOrder));
@@ -812,22 +858,26 @@
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 {
- if (!Constant.IS_OUTNET) {
- JDGoods goods = JDApiUtil.getGoodsDetail(itemOrder.getSkuId());
- if(goods==null)
- goods=JDUtil.getGoodsFromWeb(itemOrder.getSkuId());
- commonGoodsList.get(0).setTitle(goods.getSkuName());
- commonGoodsList.get(0).setPicture(goods.getPicUrl());
- commonOrderGoodsMapper.updateByPrimaryKeySelective(commonGoodsList.get(0));
- }
+
}
newCommonOrder.setUserInfo(new UserInfo(uid));
commonOrderList.add(addCommonOrder(newCommonOrder));
@@ -874,10 +924,9 @@
if (!StringUtil.isNullOrEmpty(commonOrder.getTradeId()))
oldCommonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(commonOrder.getSourceType(),
commonOrder.getTradeId());
- else
- oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(),
- commonOrder.getSourceType(), commonOrder.getOrderBy());
-
+ else {
+ throw new CommonOrderException(10, "浜ゆ槗ID涓虹┖");
+ }
if (oldCommonOrder == null)// 鏂板
{
commonOrder.setCreateTime(new Date());
@@ -889,6 +938,7 @@
} else {// 淇敼
// 宸茬粡缁撶畻锛屽凡缁忓け鏁堬紝鐘舵�佹湭鏀瑰彉鐨勮鍗曚笉澶勭悊
if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX
+ || oldCommonOrder.getState() == CommonOrder.STATE_WQ
|| (oldCommonOrder.getState().intValue() == commonOrder.getState())) {
return oldCommonOrder;
}
@@ -1004,8 +1054,14 @@
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, source);
+ 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>();
@@ -1133,9 +1189,12 @@
String systemCouponType = couponRecord.getCouponType();
Integer couponState = couponRecord.getState();
if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
- || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
+ || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
+ || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
// 鍏嶅崟鎴愬姛
+ order.setOtherState(2);
+ } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
order.setOtherState(1);
}
}
@@ -1148,9 +1207,12 @@
String systemCouponType = couponRecord.getCouponType();
Integer couponState = couponRecord.getState();
if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
- || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
+ || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
+ || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
// 鍏嶅崟鎴愬姛
+ order.setOtherState(2);
+ } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
order.setOtherState(1);
}
}
@@ -1163,9 +1225,12 @@
String systemCouponType = couponRecord.getCouponType();
Integer couponState = couponRecord.getState();
if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
- || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
+ || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
+ || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
// 鍏嶅崟鎴愬姛
+ order.setOtherState(2);
+ } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
order.setOtherState(1);
}
}
@@ -1182,7 +1247,11 @@
@Override
public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
String startTime, String endTime, Integer source) throws CommonOrderException {
- return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source);
+ 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
@@ -1360,5 +1429,10 @@
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);
+ }
}
--
Gitblit v1.8.0