From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 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 af88de3..36c0d49 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
@@ -89,6 +89,7 @@
import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
import com.yeshi.fanli.util.suning.SuningApiUtil;
+import com.yeshi.fanli.util.suning.SuningUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.user.UserLevelUtil;
@@ -1269,7 +1270,7 @@
{
SuningGoodsInfo pddGoods = null;
// TODO 闇�瑕佽幏鍙�
- pddGoods = SuningApiUtil.getGoodsDetail(suningOrderInfo.getGoodsNum(), "00000000");
+ pddGoods = SuningApiUtil.getGoodsDetail(suningOrderInfo.getGoodsNum(), suningOrderInfo.getSellerCode());
if (pddGoods != null) {
cog = CommonOrderGoodsFactory.create(pddGoods);
}
@@ -1943,12 +1944,12 @@
@Override
public List<CommonOrderVO> getOrderList(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
Integer orderState, String orderNo, String startTime, String endTime, Integer dateType,
- List<Integer> listSource, boolean notBackSuVip) throws CommonOrderException, Exception {
+ List<Integer> listSource) throws CommonOrderException, Exception {
int pageSize = Constant.PAGE_SIZE;
List<CommonOrderVO> listOrder = commonOrderMapper.getOrderList((page - 1) * pageSize, pageSize, uid, state,
- type, orderState, orderNo, startTime, endTime, dateType, listSource, notBackSuVip);
+ type, orderState, orderNo, startTime, endTime, dateType, listSource);
// 璁㈠崟淇℃伅涓虹┖
if (listOrder == null || listOrder.size() == 0) {
@@ -1970,10 +1971,9 @@
@Override
public long countOrderList(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
- String startTime, String endTime, Integer dateType, List<Integer> listSource, boolean notBackSuVip)
- throws CommonOrderException {
+ String startTime, String endTime, Integer dateType, List<Integer> listSource) {
return commonOrderMapper.countOrderList(uid, state, type, orderState, orderNo, startTime, endTime, dateType,
- listSource, notBackSuVip);
+ listSource);
}
/**
@@ -1989,6 +1989,8 @@
List<String> listTB = new ArrayList<String>();
List<String> listJD = new ArrayList<String>();
List<String> listPDD = new ArrayList<String>();
+ List<String> listVIP = new ArrayList<String>();
+ List<String> listSuNing = new ArrayList<String>();
for (CommonOrderVO order : listOrder) {
if (order.getHongBaoType() == HongBaoV2.TYPE_YIJI || order.getHongBaoType() == HongBaoV2.TYPE_ERJI
|| order.getHongBaoType() == HongBaoV2.TYPE_SHARE_YIJI
@@ -2012,6 +2014,10 @@
listJD.add(order.getOrderNo());
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
listPDD.add(order.getOrderNo());
+ } else if (sourceType == Constant.SOURCE_TYPE_VIP) {
+ listVIP.add(order.getOrderNo());
+ } else if (sourceType == Constant.SOURCE_TYPE_SUNING) {
+ listSuNing.add(order.getOrderNo());
}
}
@@ -2030,6 +2036,17 @@
listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);
}
+ List<UserSystemCouponRecord> listRecordVIP = null;
+ if (listVIP.size() > 0) {
+ listRecordVIP = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_VIP, listVIP);
+ }
+
+ List<UserSystemCouponRecord> listRecordSuNing = null;
+ if (listSuNing.size() > 0) {
+ listRecordSuNing = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_SUNING, listSuNing);
+ }
+
+
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");
// 鏄惁瀛樺湪濂栧姳鍒�
@@ -2092,6 +2109,10 @@
Integer goodsType = commonGoodsVO.getGoodsType();
if (goodsType != null & goodsType == Constant.SOURCE_TYPE_ELME) {
order.setOrderType(Constant.SOURCE_TYPE_ELME); // 楗夸簡涔堣鍗�
+ }
+
+ if (goodsType == Constant.SOURCE_TYPE_SUNING) {
+ commonGoodsVO.setGoodsId(SuningUtil.getConcatGoodsIId(commonGoodsVO.getShopId() +"", commonGoodsVO.getGoodsId()));
}
order.getListOrderGoods().add(commonGoodsVO);
}
@@ -2208,6 +2229,10 @@
couponUseFactory(order, listRecordJD);
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
couponUseFactory(order, listRecordPDD);
+ } else if (sourceType == Constant.SOURCE_TYPE_VIP) {
+ couponUseFactory(order, listRecordVIP);
+ } else if (sourceType == Constant.SOURCE_TYPE_SUNING) {
+ couponUseFactory(order, listRecordSuNing);
}
} else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {
// 鍒嗕韩
--
Gitblit v1.8.0