From 13ec337a0d24485d9f006cfd44ea5d69c00540f3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 一月 2019 16:21:22 +0800
Subject: [PATCH] 资金统计修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 102 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 94 insertions(+), 8 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 a398442..44c7a85 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
@@ -13,6 +13,7 @@
import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.yeshi.utils.taobao.TbImgUtil;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;
@@ -29,6 +30,7 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.CommonOrderGoodsFactory;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -81,15 +83,14 @@
public List<CommonOrderVO> listGroupOrderNoByUid(long start, int count, Long uid, Integer state, Integer type,
Integer orderState, String orderNo, String startTime, String endTime, Integer dateType)
throws CommonOrderException {
- return commonOrderMapper.listUserOrder(start, count, uid, state, type, orderState, orderNo, startTime,
- endTime, dateType);
+ return commonOrderMapper.listUserOrder(start, count, uid, state, type, orderState, orderNo, startTime, endTime,
+ dateType);
}
@Override
public long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
String startTime, String endTime, Integer dateType) throws CommonOrderException {
- return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime,
- dateType);
+ return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime, dateType);
}
@Override
@@ -170,6 +171,11 @@
e.printStackTrace();
}
+ String picture = commonGoodsVO.getPicture();
+ if (!StringUtil.isNullOrEmpty(picture) && !picture.contains("320x320")) {
+ commonGoodsVO.setPicture(TbImgUtil.getTBSize320Img(picture));
+ }
+
Integer hongBaoType = order.getHongBaoType();
// 閭�璇疯鍗曚俊鎭繚鎶�
if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
@@ -185,14 +191,14 @@
// 璐拱鏁伴噺
commonGoodsVO.setActualCount(commonOrder.getTotalCount() + "浠�");
-
+
BigDecimal totalSettlement = commonOrder.getTotalSettlement();
if (totalSettlement == null || totalSettlement.compareTo(new BigDecimal(0)) <= 0) {
totalSettlement = commonOrder.getTotalPayment();
}
// 瀹炰粯娆�
commonGoodsVO.setActualPay("瀹炰粯娆撅細楼" + totalSettlement);
-
+
listOrderGoods.add(commonGoodsVO);
Integer orderType = commonOrder.getOrderType();
@@ -369,6 +375,23 @@
@Override
public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid) throws CommonOrderException {
List<CommonOrder> commonOrderList = new ArrayList<>();
+ // 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
+ int invalidCount = 0;
+ for (TaoBaoOrder tb : taoBaoOrders) {
+ if ("璁㈠崟澶辨晥".equalsIgnoreCase(tb.getOrderState())) {
+ invalidCount++;
+ }
+ }
+
+ // 鑾峰彇鏁翠綋璁㈠崟鐨勭姸鎬�
+ int wholeOrderState = 0;
+ if (taoBaoOrders.size() == invalidCount)
+ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_SHIXIAO;
+ else if (invalidCount == 0)
+ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_YOUXIAO;
+ else
+ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO;
+
for (TaoBaoOrder taoBaoOrder : taoBaoOrders) {
CommonOrder commonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(taoBaoOrder.getOrderId(),
Constant.SOURCE_TYPE_TAOBAO, taoBaoOrder.getOrderBy());
@@ -378,6 +401,7 @@
CommonOrderGoods goods = new CommonOrderGoods();
goods.setGoodsId(taoBaoOrder.getAuctionId() + "");
goods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
+
// 鍟嗗搧鏄惁宸茬粡鎻掑叆
List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper
.listByGoodsIdAndGoodsType(goods.getGoodsId(), goods.getGoodsType());
@@ -400,6 +424,7 @@
commonOrder.setCommonOrderGoods(goods);
commonOrder.setUserInfo(new UserInfo(uid));
commonOrder.setCreateTime(new Date());
+ commonOrder.setStateWholeOrder(wholeOrderState);
commonOrderMapper.insertSelective(commonOrder);
commonOrderList.add(commonOrder);
@@ -418,6 +443,7 @@
updateCommonOrder.setSettlement(newCommonOrder.getSettlement());
updateCommonOrder.setSettleTime(newCommonOrder.getSettleTime());
updateCommonOrder.setState(newCommonOrder.getState());
+ updateCommonOrder.setStateWholeOrder(wholeOrderState);
updateCommonOrder.setUpdateTime(new Date());
commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);
commonOrderList.add(commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId()));
@@ -427,10 +453,70 @@
return commonOrderList;
}
-
@Override
public long countByUidAndOrderStateWithOrderBalanceTime(Long uid, int state, Date minDate, Date maxDate) {
-
return commonOrderMapper.countByUidAndOrderStateWithOrderBalanceTime(uid, state, minDate, maxDate);
}
+
+
+ @Override
+ public List<CommonOrderVO> listQueryByUid(long start, int count, Long uid, Integer state, Integer type,
+ Integer orderState, String orderNo, String startTime, String endTime, Integer dateType)
+ throws CommonOrderException {
+
+
+ List<CommonOrderVO> list = commonOrderMapper.listQueryByUid(start, count, uid, state, type,
+ orderState, orderNo, startTime, endTime, dateType);
+
+ if (list == null) {
+ list = new ArrayList<CommonOrderVO>();
+ }
+
+ if (list.size() == 0) {
+ return list;
+ }
+
+ for (CommonOrderVO order : list) {
+
+ /* 璁㈠崟杩斿埄绫诲瀷 杞崲 */
+ Integer hongBaoType = order.getHongBaoType();
+ if (HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) {
+ // 鑷喘
+ order.setHongBaoType(1);
+ } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {
+ // 鍒嗕韩
+ order.setHongBaoType(2);
+ } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
+ || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
+ || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
+ // 閭�璇�
+ order.setHongBaoType(3);
+ }
+
+ Integer hongBaoState = order.getHongBaoState();
+ if (HongBaoV2.STATE_KELINGQU == hongBaoState || HongBaoV2.STATE_BUKELINGQU == hongBaoState) {
+ // 鏈埌璐�
+ order.setHongBaoState(1);
+
+ } else if (HongBaoV2.STATE_YILINGQU == hongBaoState) {
+ // 宸插埌璐�
+ order.setHongBaoState(2);
+
+ } else if (HongBaoV2.STATE_SHIXIAO == hongBaoState) {
+ // 宸插け鏁�
+ order.setHongBaoState(3);
+ }
+ }
+
+ return list;
+
+ }
+
+ @Override
+ public long countQueryByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
+ String startTime, String endTime, Integer dateType) throws CommonOrderException {
+ return commonOrderMapper.countQueryByUid(uid, state, type, orderState, orderNo, startTime, endTime, dateType);
+ }
+
+
}
--
Gitblit v1.8.0