From 92c681fabac989d1a9f16fa13202d7f5ccac52d9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 10:22:22 +0800
Subject: [PATCH] 订单优化 + 后台提现曲线图
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 100 insertions(+), 5 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 ec1d2b1..4aced39 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;
@@ -133,6 +135,12 @@
public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer day, String startTime, String endTime) {
return commonOrderMapper.countBonusOrderMoney(uid, type, day, startTime, endTime);
}
+
+ @Override
+ public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day,
+ String startTime, String endTime) {
+ return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime);
+ }
@Override
public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime,
@@ -169,6 +177,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
@@ -213,14 +226,11 @@
SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");
for (CommonOrderVO order : listOrder) {
- Date createTime = order.getCreateTime();
- if (createTime != null) {
- order.setObtainTime(createTime.getTime());
- }
Date thirdCreateTime = order.getThirdCreateTime();
if (thirdCreateTime != null) {
order.setDownTime("涓嬪崟鏃堕棿锛�" + format.format(thirdCreateTime));
+ order.setObtainTime(thirdCreateTime.getTime());
}
Date settleTime = order.getSettleTime();
@@ -448,7 +458,92 @@
@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;
+ }
+
+ SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+ for (CommonOrderVO order : list) {
+
+ // 涓嬪崟鏃堕棿
+ Date thirdCreateTime = order.getThirdCreateTime();
+ if (thirdCreateTime != null) {
+ order.setDownTime(format.format(thirdCreateTime));
+ }
+ // 鏀惰揣鏃堕棿
+ Date settleTime = order.getSettleTime();
+ if (settleTime != null) {
+ order.setReceiveTime(format.format(settleTime));
+ }
+
+ // 鍒拌处鏃堕棿
+ Date accountTime = order.getAccountTime();
+ if (accountTime != null) {
+ order.setHongBaoDate(format.format(accountTime));
+ }
+
+ BigDecimal settlement = order.getSettlement();
+ if (settlement != null && settlement.compareTo(new BigDecimal(0)) > 0) {
+ order.setPayment(settlement); // 瀹為檯浠樻閲戦
+ }
+
+ /* 璁㈠崟杩斿埄绫诲瀷 杞崲 */
+ 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