From b8b373ab3ba3e8cadc241cce78ecca9594bdc68f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 02 八月 2019 11:30:12 +0800
Subject: [PATCH] 消息订单搜索框订单号显示规则更改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 138 +++++++++++++++++++++++++++------------------
1 files changed, 83 insertions(+), 55 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 de252c8..93915b6 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
@@ -55,6 +55,7 @@
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;
@@ -153,12 +154,14 @@
@Override
public long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException {
- return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime, dateType, source);
+ return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime, dateType,
+ source);
}
@Override
- 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 {
+ 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;
@@ -190,19 +193,21 @@
}
@Override
- public long countBonusOrderNumber(Long uid, Integer type, Integer day, String startTime, String endTime, Integer source) {
+ 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, Integer source) {
+ 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
@@ -211,7 +216,8 @@
return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime, day, source);
}
- public void listDataFactory(AcceptData acceptData, List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid) {
+ public void listDataFactory(AcceptData acceptData, List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods,
+ Long uid) {
List<String> listTB = new ArrayList<String>();
List<String> listJD = new ArrayList<String>();
@@ -233,17 +239,17 @@
if (listTB.size() > 0) {
listRecordTB = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_TAOBAO, listTB);
}
-
- List<UserSystemCouponRecord> listRecordJD = null;
+
+ 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();
@@ -270,7 +276,7 @@
}
commonGoodsVO.setGoodsType(sourceType2);
-
+
String picture = commonGoodsVO.getPicture();
if (!StringUtil.isNullOrEmpty(picture) && !picture.contains("320x320")) {
commonGoodsVO.setPicture(TbImgUtil.getTBSize320Img(picture));
@@ -299,8 +305,6 @@
// 瀹炰粯娆�
commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
- listOrderGoods.add(commonGoodsVO);
-
Integer orderType = order.getOrderType();
if (orderType == null) {
String shopType = commonGoodsVO.getShopType();
@@ -308,15 +312,9 @@
order.setOrderType(1);
} else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {
order.setOrderType(2);
- }
-
- if (Constant.SOURCE_TYPE_JD == sourceType2) {
- order.setOrderType(3);
- } else if (Constant.SOURCE_TYPE_PDD == sourceType2) {
- order.setOrderType(4);
}
}
-
+ listOrderGoods.add(commonGoodsVO);
break;
}
}
@@ -340,6 +338,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);
}
/* 璁㈠崟鐘舵�� 杞崲澶勭悊 */
@@ -509,33 +519,33 @@
setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, signList);
}
}
-
+
// 閭�璇� 闅愯棌璁㈠崟鍙�
if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {
- String orderNo = order.getOrderNo();
- orderNo = orderNo.substring(0, orderNo.length()-6);
- order.setOrderNo(orderNo + "******");
+ 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 + "******");
+ String orderNo = order.getOrderNo();
+ orderNo = orderNo.substring(0, orderNo.length() - 6);
+ order.setOrderNo(orderNo + "******");
}
}
}
-
-
+
/**
- * 璁㈠崟锛� 鍏嶅崟鏍囪瘑 濂栧姳鏍囪瘑
+ * 璁㈠崟锛� 鍏嶅崟鏍囪瘑 濂栧姳鏍囪瘑
+ *
* @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) {
+ public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState,
+ Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList) {
// 鏄惁鍏嶅崟鍟嗗搧
boolean freeOrder = false;
@@ -746,6 +756,17 @@
cog.setUpdateTime(new Date());
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));
@@ -798,6 +819,15 @@
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));
@@ -971,7 +1001,8 @@
@Override
public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
- Integer type, Integer orderState, String startTime, String endTime, Integer source) 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, source);
@@ -983,7 +1014,7 @@
if (list.size() == 0) {
return list;
}
-
+
List<String> listTB = new ArrayList<String>();
List<String> listJD = new ArrayList<String>();
List<String> listPDD = new ArrayList<String>();
@@ -1004,17 +1035,17 @@
if (listTB.size() > 0) {
listRecordTB = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_TAOBAO, listTB);
}
-
- List<UserSystemCouponRecord> listRecordJD = null;
+
+ 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");
for (CommonOrderVO order : list) {
@@ -1091,12 +1122,11 @@
}
}
}
-
-
+
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())) {
@@ -1104,10 +1134,10 @@
Integer couponState = couponRecord.getState();
if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
- if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
+ if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
// 鍏嶅崟鎴愬姛
- order.setOtherState(1);
- }
+ order.setOtherState(1);
+ }
}
break;
}
@@ -1119,10 +1149,10 @@
Integer couponState = couponRecord.getState();
if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
- if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
+ if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
// 鍏嶅崟鎴愬姛
- order.setOtherState(1);
- }
+ order.setOtherState(1);
+ }
}
break;
}
@@ -1134,10 +1164,10 @@
Integer couponState = couponRecord.getState();
if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
- if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
+ if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
// 鍏嶅崟鎴愬姛
- order.setOtherState(1);
- }
+ order.setOtherState(1);
+ }
}
break;
}
@@ -1155,7 +1185,6 @@
return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source);
}
-
@Override
public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState, Integer sourceType)
throws CommonOrderException {
@@ -1163,7 +1192,7 @@
if (sourceType == null) {
sourceType = Constant.SOURCE_TYPE_TAOBAO;
}
-
+
CommonOrderVO commonOrderVO = commonOrderMapper.getCommonOrderByOrderNo(uid, orderNo, orderState, sourceType);
// 璁㈠崟淇℃伅涓虹┖
if (commonOrderVO == null) {
@@ -1252,7 +1281,6 @@
return commonOrderVO;
}
-
@Override
public JSONObject getRewardJumpInfo(String orderNo) {
--
Gitblit v1.8.0