From 8e5fb7b57899c25ff0e5fe251f684691039f72e0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 15 八月 2019 09:34:13 +0800
Subject: [PATCH] 口令记录
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 68 ++++++++++++++++++----------------
1 files changed, 36 insertions(+), 32 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 5575df9..1defb88 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
@@ -330,7 +330,7 @@
// 鏄惁瀛樺湪濂栧姳鍒�
boolean hasRewardCoupon = userSystemCouponService.hasRewardCoupon(uid);
-
+
// 2019.8.1寮�濮嬭繑鍥炵淮鏉冧俊鎭�
Date august = null;
try {
@@ -390,7 +390,7 @@
if (hongBao == null) {
hongBao = new BigDecimal(0);
}
-
+
if (CommonOrder.STATE_FK == orderState) {
orderStateContent = "宸蹭粯娆�";
} else if (CommonOrder.STATE_JS == orderState) {
@@ -422,7 +422,7 @@
isPart = true;
}
}
-
+
if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
if (isPart) {
hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 閮ㄥ垎澶辨晥
@@ -438,11 +438,14 @@
if (isPart) {
// 缁存潈澶辨晥閲戦=缁存潈鐨勯噾棰�*鑾峰緱鐨勭孩鍖�/缁撶畻閲戦
BigDecimal settlement = order.getSettlement();
- BigDecimal wqHongbao = MoneyBigDecimalUtil.div(MoneyBigDecimalUtil.mul(hongBao, settlement), settlement);
- weiQuanInfo.setWqHongBao("缁存潈锛�-楼" + wqHongbao.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ 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());
+ weiQuanInfo
+ .setWqHongBao("缁存潈锛�-楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
hongBao = new BigDecimal(0);
}
order.setWeiQuanInfo(weiQuanInfo);
@@ -533,7 +536,6 @@
hongbaoInfo = hongBaoState_Str + hongbaoInfo;
-
Map<String, String> hongBaoMap = new HashMap<String, String>();
hongBaoMap.put("content", hongbaoInfo + " 楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
hongBaoMap.put("fontColor", hongbaoInfoFontColor);
@@ -557,9 +559,9 @@
}
// 鍒嗕韩銆侀個璇� 闅愯棌璁㈠崟鍙�
- 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) {
+ 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()));
}
}
@@ -793,16 +795,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));
@@ -848,6 +840,9 @@
if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
{
JDGoods goods = JDApiUtil.getGoodsDetail(itemOrder.getSkuId());
+ if (goods == null) {
+ goods = JDUtil.getGoodsFromWeb(itemOrder.getSkuId());
+ }
if (goods != null) {
cog = CommonOrderGoodsFactory.create(goods);
@@ -856,14 +851,7 @@
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));
@@ -925,6 +913,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;
}
@@ -1040,8 +1029,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>();
@@ -1172,6 +1167,8 @@
|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
// 鍏嶅崟鎴愬姛
+ order.setOtherState(2);
+ } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
order.setOtherState(1);
}
}
@@ -1187,6 +1184,8 @@
|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
// 鍏嶅崟鎴愬姛
+ order.setOtherState(2);
+ } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
order.setOtherState(1);
}
}
@@ -1202,6 +1201,8 @@
|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
// 鍏嶅崟鎴愬姛
+ order.setOtherState(2);
+ } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
order.setOtherState(1);
}
}
@@ -1218,7 +1219,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
@@ -1396,5 +1401,4 @@
return commonOrderMapper.listBySourceTypeAndStateAndThirdCrateTime(sourceType, state, minTime, maxTime,
(page - 1) * pageSize, pageSize);
}
-
}
--
Gitblit v1.8.0