From 1f72bcfde298ce2eb4107acc4ff8ed031056f95e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 12 十一月 2019 10:01:09 +0800
Subject: [PATCH] 订单找回 文字
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 539 ++++++++++++-----------------------------------------------
1 files changed, 108 insertions(+), 431 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 cca4d2b..35fc123 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
@@ -1,7 +1,6 @@
package com.yeshi.fanli.service.impl.order;
import java.math.BigDecimal;
-import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -201,414 +200,7 @@
return listOrder;
}
- @Override
- public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day, Integer source) {
- return commonOrderMapper.countHistoryOrder(uid, day, source);
- }
-
- @Override
- 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) {
- 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, Integer source) {
- return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime, source);
- }
-
- @Override
- public Long countUserOrderToApp(Long uid, Integer type, String startTime, String endTime,
- Integer day, Integer source, Integer state, Integer stateOrder) {
- return commonOrderMapper.countUserOrderToApp(uid, type, startTime, endTime, day, source, state, stateOrder);
- }
-
- private BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid) {
- BigDecimal weiQuanMoney = new BigDecimal(0);
- if (listWQ != null && listWQ.size() > 0) {
- for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) {
- String tradeId = weiQuanOrder.getOrderItemId();
- // 鏌ヨ绾㈠寘
- List<String> tradeList = new ArrayList<>();
- tradeList.add(tradeId);
- List<HongBaoV2> hongBaoList = hongBaoV2Service.listBySourceTypeAndTradeIdListAndUid(sourceType, uid,
- tradeList);
- if (hongBaoList != null && hongBaoList.size() > 0) {
- CommonOrder commonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId);
- if (commonOrder != null && commonOrder.getSettlement().compareTo(new BigDecimal(0)) > 0) {
- BigDecimal wqMoney = MoneyBigDecimalUtil
- .mul(hongBaoList.get(0).getMoney(), weiQuanOrder.getMoney())
- .divide(commonOrder.getSettlement(), 2, BigDecimal.ROUND_UP);
- if (wqMoney.compareTo(hongBaoList.get(0).getMoney()) > 0)
- wqMoney = hongBaoList.get(0).getMoney();
- weiQuanMoney = weiQuanMoney.add(wqMoney);
- }
- }
- }
- }
- return weiQuanMoney;
- }
-
- 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>();
- List<String> listPDD = new ArrayList<String>();
- for (CommonOrderVO commonOrderVO : listOrder) {
- Integer sourceType = commonOrderVO.getSourceType();
- if (sourceType == null) {
- continue;
- } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- listTB.add(commonOrderVO.getOrderNo());
- } else if (sourceType == Constant.SOURCE_TYPE_JD) {
- listJD.add(commonOrderVO.getOrderNo());
- } else if (sourceType == Constant.SOURCE_TYPE_PDD) {
- listPDD.add(commonOrderVO.getOrderNo());
- }
- }
-
- List<UserSystemCouponRecord> listRecordTB = null;
- if (listTB.size() > 0) {
- listRecordTB = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_TAOBAO, listTB);
- }
-
- 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();
- if (goods == null) {
- continue;
- }
-
- String orderNo1 = commonOrder.getOrderNo();
- Integer sourceType = commonOrder.getSourceType();
- for (CommonOrderVO order : listOrder) {
- String orderNo2 = order.getOrderNo();
- Integer sourceType2 = order.getSourceType();
-
- // 鏉ユ簮銆佽鍗曞彿鐩稿悓
- if (sourceType.equals(sourceType2) && orderNo1.equals(orderNo2)) {
- // 鍔犲叆鍟嗗搧淇℃伅
- List<CommonOrderGoodsVO> listOrderGoods = order.getListOrderGoods();
-
- CommonOrderGoodsVO commonGoodsVO = new CommonOrderGoodsVO();
- try {
- PropertyUtils.copyProperties(commonGoodsVO, goods);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- commonGoodsVO.setGoodsType(sourceType2);
-
- 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
- || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
- || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
- Map<String, String> titleMap = new HashMap<String, String>();
- titleMap.put("content", "涓轰繚闅滅敤鎴烽殣绉侊紝鍟嗗搧淇℃伅宸查殣钘�!");
- titleMap.put("fontColor", "#888888");
- titleMap.put("bottomColor", "#E9E9E9");
- commonGoodsVO.setTitle(null);
- commonGoodsVO.setGoodsTitle(titleMap);
- }
-
- // 璐拱鏁伴噺
- commonGoodsVO.setActualCount(commonOrder.getTotalCount() + "浠�");
-
- BigDecimal totalSettlement = commonOrder.getTotalSettlement();
- if (totalSettlement == null || totalSettlement.compareTo(new BigDecimal(0)) <= 0) {
- totalSettlement = commonOrder.getTotalPayment();
- }
- // 瀹炰粯娆�
- commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
-
- Integer orderType = order.getOrderType();
- if (orderType == null) {
- String shopType = commonGoodsVO.getShopType();
- if (CommonOrderGoodsVO.TYPE_TAOBAO.equalsIgnoreCase(shopType)) {
- order.setOrderType(1);
- } else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {
- order.setOrderType(2);
- }
- }
- listOrderGoods.add(commonGoodsVO);
- break;
- }
- }
- }
-
- SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
- SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");
-
- // 鏄惁瀛樺湪濂栧姳鍒�
- // boolean hasRewardCoupon =
- // userSystemCouponService.hasRewardCoupon(uid);
- boolean hasRewardCoupon = userSystemCouponService.getIncludeNotExchange(uid);
- boolean exchangeCoupon = userSystemCouponService.getIncludeExchange(uid);
-
- // 2019.8.1寮�濮嬭繑鍥炵淮鏉冧俊鎭�
- Date august = null;
- try {
- august = TimeUtil.parse("2019-08-01");
- } catch (ParseException e) {
- e.printStackTrace();
- }
-
- /* 缁勭粐璁㈠崟鐘舵�� 绛変俊鎭� */
- for (CommonOrderVO order : listOrder) {
-
- Date thirdCreateTime = order.getThirdCreateTime();
- if (thirdCreateTime != null) {
- order.setDownTime("涓嬪崟鏃堕棿锛�" + format.format(thirdCreateTime));
- order.setObtainTime(thirdCreateTime.getTime());
- }
-
- 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);
- }
-
- /* 璁㈠崟鐘舵�� 杞崲澶勭悊 */
- String orderStateContent = "";
- Map<String, String> orderStateMap = new HashMap<String, String>();
-
- // 璁㈠崟鐘舵��
- Integer orderState = order.getState();
- // 绾㈠寘鐘舵��
- Integer hongBaoState = order.getHongBaoState();
-
- Integer stateWholeOrder = order.getStateWholeOrder();
- if (CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO == stateWholeOrder) {
- // 鏁翠釜璁㈠崟閮ㄥ垎澶辨晥锛氬垽鏂湡瀹炵姸鎬� 璁㈠崟銆佺孩鍖�
- CommonOrderVO buFenOrder = commonOrderMapper.getBuFenOrderState(uid, order.getOrderNo());
- if (buFenOrder != null) {
- // 鏈夋晥鐨勮鍗曠姸鎬�
- orderState = buFenOrder.getState();
- // 鏈夋晥鐨勭孩鍖呯姸鎬�
- hongBaoState = buFenOrder.getHongBaoState();
- }
- }
-
- BigDecimal hongBao = order.getHongBao();
- if (hongBao == null) {
- hongBao = new BigDecimal(0);
- }
-
- if (CommonOrder.STATE_FK == orderState) {
- orderStateContent = "宸蹭粯娆�";
- } else if (CommonOrder.STATE_JS == orderState) {
- orderStateContent = "宸叉敹璐�";
- } else if (CommonOrder.STATE_SX == orderState) {
- orderStateContent = "鏈粯娆�/宸查��娆�";
- } else if (CommonOrder.STATE_WQ == orderState) {
- orderStateContent = "宸茬淮鏉�";
-
- Integer sourceType = order.getSourceType();
- if (sourceType != null && sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- /* 璁㈠崟缁存潈 鍒ゆ柇鏄惁鍏ㄩ儴缁存潈 */
- List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper
- .selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛");
-
- boolean isPart = false;// 榛樿澶辨晥
- BigDecimal weiQuanMoney = getWeiQuanMoney(listWQ, sourceType, uid);
-
- if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
- if (isPart) {
- hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 閮ㄥ垎澶辨晥
- } else {
- hongBaoState = HongBaoV2.STATE_SHIXIAO; // 鍏ㄩ儴澶辨晥
- }
- } else {
- // 2019.8.1 杩斿洖缁存潈淇℃伅
- if (settleTime != null && august != null && settleTime.getTime() > august.getTime()) {
- orderStateContent = "缁存潈鎴愬姛";
- WeiQuanInfo weiQuanInfo = new WeiQuanInfo();
- weiQuanInfo.setOldHongBao("楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
- // if (isPart) {
- weiQuanInfo
- .setWqHongBao("缁存潈锛�-楼" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
- hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
- // } else {
- // weiQuanInfo
- // .setWqHongBao("缁存潈锛�-楼" + weiQuanMoney.setScale(2,
- // BigDecimal.ROUND_DOWN).toString());
- // hongBao = MoneyBigDecimalUtil.sub(hongBao,
- // weiQuanMoney);
- // }
- order.setWeiQuanInfo(weiQuanInfo);
- }
- }
- }
- }
- orderStateMap.put("content", orderStateContent);
- orderStateMap.put("fontColor", "#666666");
- order.setOrderState(orderStateMap);
-
- String hongbaoInfo = "";
- // 璁㈠崟鏍囪瘑
- List<String> signList = new ArrayList<String>();
-
- Integer hongBaoType = order.getHongBaoType();
- if (HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) { // 鑷喘
- hongbaoInfo = "杩斿埄";
- order.setOrderOrigin("1");
- order.setHongBaoTypePic(CommonOrder.TYPE_FANLI);
- signList.add(CommonOrder.TYPE_FANLI);
- } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) { // 鍒嗕韩
- hongbaoInfo = "濂栭噾";
- order.setOrderOrigin("2");
- order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);
- signList.add(CommonOrder.TYPE_SHARE);
- } else if (HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
- // 閭�璇疯鍗� (涓嬬骇鐨勫垎浜鍗�)
- hongbaoInfo = "濂栭噾";
- order.setOrderOrigin("3");
- order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
- signList.add(CommonOrder.TYPE_INVITE);
- } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
- || HongBaoV2.TYPE_ERJI == hongBaoType) { // 閭�璇疯鍗�
- hongbaoInfo = "濂栭噾";
- order.setOrderOrigin("3");
- order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
- signList.add(CommonOrder.TYPE_INVITE);
-
- // 鐗堟湰鍖哄垎锛�2-0-2
- if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
- InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(), sourceType2);
- if (orderSubsidy != null) {
- ClientTextStyleVO subsidyInfo = new ClientTextStyleVO();
- if (orderSubsidy.getState() == InviteOrderSubsidy.STATE_SUBSIDIZED) {
- subsidyInfo.setColor("#E5005C");
- subsidyInfo.setContent("宸茶ˉ璐绰�" + orderSubsidy.getMoney());
- } else {
- subsidyInfo.setColor("#888888");
- subsidyInfo.setContent("琛ヨ创楼" + orderSubsidy.getMoney());
-
- // 瑙ｉ噴淇℃伅锛堥棶鍙凤級
- List<String> subsidyList = new ArrayList<String>();
- subsidyList.add("棰濆琛ヨ创鑳藉惁鑾峰緱鐢辩郴缁熺畻娉曡嚜鍔ㄥ垽鏂紝浜轰负鏃犳硶骞叉秹锛�");
- subsidyList.add("棰濆琛ヨ创鍒拌处鏃堕棿浠ュ強閲戦璇蜂互瀹為檯鍒拌处涓哄噯锛�");
- subsidyList.add("棰濆琛ヨ创浜х敓鍚庡皢浼氬湪娑堟伅-璧勯噾娑堟伅涓彁閱掍綘銆�");
- order.setSubsidyList(subsidyList);
- }
- order.setSubsidy(subsidyInfo);
- }
- }
- }
-
- String hongBaoDate = null;
- String hongBaoState_Str = "";
- String hongbaoInfoFontColor = "#E5005C";
- String stateContent = "";
- String stateFontColor = "#E5005C";
- Integer orderHongBaoState = null;
-
- if (HongBaoV2.STATE_KELINGQU == hongBaoState || HongBaoV2.STATE_BUKELINGQU == hongBaoState) {
- orderHongBaoState = 1;
- stateContent = "鏈埌璐�";
- hongBaoState_Str = "棰勪及";
- Date preAccountTime = order.getPreAccountTime();
- if (preAccountTime != null)
- hongBaoDate = "棰勮鍒拌处鏃堕棿锛�" + formatday.format(preAccountTime);
- } else if (HongBaoV2.STATE_YILINGQU == hongBaoState) {
- orderHongBaoState = 3;
- stateContent = "宸插埌璐�";
- Date accountTime = order.getAccountTime();
- if (accountTime != null)
- hongBaoDate = "鍒拌处鏃堕棿锛�" + formatday.format(accountTime);
- } else if (HongBaoV2.STATE_BUFENSHIXIAO == hongBaoState) {
- stateContent = "閮ㄥ垎澶辨晥";
- orderHongBaoState = 3;
- Date accountTime = order.getAccountTime();
- if (accountTime != null)
- hongBaoDate = "鍒拌处鏃堕棿锛�" + formatday.format(accountTime);
- } else if (HongBaoV2.STATE_SHIXIAO == hongBaoState) {
- orderHongBaoState = 4;
- stateContent = "宸插け鏁�";
- hongbaoInfoFontColor = "#888888";
- }
- order.setHongBaoState(orderHongBaoState);
- order.setHongBaoDate(hongBaoDate);
-
- if (!StringUtil.isNullOrEmpty(order.getStateDesc()))
- stateContent = stateContent + "-" + order.getStateDesc();
-
- Map<String, String> stateMap = new HashMap<String, String>();
- stateMap.put("content", stateContent);
- stateMap.put("fontColor", stateFontColor);
- order.setAccountState(stateMap);
-
- 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);
- order.setHongBaoInfo(hongBaoMap);
-
- Integer sourceType = order.getSourceType();
- // 闈炶嚜璐殑璁㈠崟 涓嶆樉绀鸿繑鍒┿�佸厤鍗曡鎯�
- if (HongBaoV2.TYPE_ZIGOU != hongBaoType) {
- order.setSignList(signList);
- } else {
- // 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
- if (sourceType == null) {
- setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, null,
- signList, acceptData);
- } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
- listRecordTB, signList, acceptData);
- } else if (sourceType == Constant.SOURCE_TYPE_JD) {
- setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
- listRecordJD, signList, acceptData);
- } else if (sourceType == Constant.SOURCE_TYPE_PDD) {
- setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
- listRecordPDD, signList, acceptData);
- }
- }
-
- // 鍒嗕韩銆侀個璇� 闅愯棌璁㈠崟鍙�
- 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()));
- }
- }
- }
-
+
/**
* 璁㈠崟锛� 鍏嶅崟鏍囪瘑 濂栧姳鏍囪瘑
*
@@ -683,11 +275,11 @@
}
boolean rewardOrder = false;
-
int type = 1; // 1 甯歌璺宠浆椤甸潰 2寮瑰嚭閫夐」锛堝鍔卞埜锛�
if (rewardSuccess) {
- // 濂栧姳鎴愬姛
- rewardOrder = true;
+ if (!VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ rewardOrder = true; //濂栧姳鎴愬姛 2.0.2 娑堝け
+ }
} else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
&& HongBaoV2.STATE_YILINGQU == hongBaoState) {
// 鏈夊彲鐢ㄧ殑濂栧姳鍒� 銆侀潪鍏嶅崟璁㈠崟 銆佷笖宸插埌璐︾殑 銆佽繑鍒╄鍗�
@@ -707,7 +299,7 @@
Date thirdCreateTime = order.getThirdCreateTime();
if (thirdCreateTime != null) {
long downOrderTime = thirdCreateTime.getTime();
- long limitDate = Long.parseLong("1573315200000"); // TODO 鏃ユ湡寰呯‘瀹�2019-11-10
+ long limitDate = Long.parseLong("1571760000000"); // TODO 鏃ユ湡寰呯‘瀹�2019-11-10
if (downOrderTime > limitDate) {
newEdition = true;
Date endDay = DateUtil.plusDayDate(4, thirdCreateTime);
@@ -752,9 +344,13 @@
rewardStyleVO.setColor("#E5005C");
rewardStyleVO.setBottomColor("#FFDCEA");
if (!newEdition) {
- rewardStyleVO.setContent("杩斿埄濂栧姳 >");
+ if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ rewardStyleVO.setContent("浣跨敤濂栧姳鍒� >");
+ } else {
+ rewardStyleVO.setContent("杩斿埄濂栧姳 >");
+ }
} else if (canUse) {
- rewardStyleVO.setContent("杩斿埄濂栧姳 ");
+ rewardStyleVO.setContent("浣跨敤濂栧姳鍒�");
ClientTextStyleVO txt1 = new ClientTextStyleVO();
txt1.setContent("鍓�");
@@ -765,6 +361,7 @@
txt2.setContent(num);
txt2.setColor("#E5005C");
txt2.setBottomColor("#FFDCEA");
+ txt2.setFontSize("1.33");
ClientTextStyleVO txt3 = new ClientTextStyleVO();
txt3.setContent(unit + "鍏抽棴 >");
@@ -1065,21 +662,20 @@
InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(), sourceType);
if (orderSubsidy != null) {
ClientTextStyleVO subsidyInfo = new ClientTextStyleVO();
+ subsidyInfo.setContent("(琛ヨ创楼" + orderSubsidy.getMoney() + ")");
if (orderSubsidy.getState() == InviteOrderSubsidy.STATE_SUBSIDIZED) {
subsidyInfo.setColor("#E5005C");
- subsidyInfo.setContent("宸茶ˉ璐绰�" + orderSubsidy.getMoney());
} else {
subsidyInfo.setColor("#888888");
- subsidyInfo.setContent("琛ヨ创楼" + orderSubsidy.getMoney());
-
- // 瑙ｉ噴淇℃伅锛堥棶鍙凤級
- List<String> subsidyList = new ArrayList<String>();
- subsidyList.add("棰濆琛ヨ创鑳藉惁鑾峰緱鐢辩郴缁熺畻娉曡嚜鍔ㄥ垽鏂紝浜轰负鏃犳硶骞叉秹锛�");
- subsidyList.add("棰濆琛ヨ创鍒拌处鏃堕棿浠ュ強閲戦璇蜂互瀹為檯鍒拌处涓哄噯锛�");
- subsidyList.add("棰濆琛ヨ创浜х敓鍚庡皢浼氬湪娑堟伅-璧勯噾娑堟伅涓彁閱掍綘銆�");
- order.setSubsidyList(subsidyList);
}
order.setSubsidy(subsidyInfo);
+
+ // 瑙ｉ噴淇℃伅锛堥棶鍙凤級
+ List<String> subsidyList = new ArrayList<String>();
+ subsidyList.add("棰濆琛ヨ创鑳藉惁鑾峰緱鐢辩郴缁熺畻娉曡嚜鍔ㄥ垽鏂紝浜轰负鏃犳硶骞叉秹锛�");
+ subsidyList.add("棰濆琛ヨ创鍒拌处鏃堕棿浠ュ強閲戦璇蜂互瀹為檯鍒拌处涓哄噯锛�");
+ subsidyList.add("棰濆琛ヨ创浜х敓鍚庡皢浼氬湪娑堟伅-璧勯噾娑堟伅涓彁閱掍綘銆�");
+ order.setSubsidyList(subsidyList);
}
}
}
@@ -1172,6 +768,64 @@
}
}
}
+
+ @Override
+ public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day, Integer source) {
+ return commonOrderMapper.countHistoryOrder(uid, day, source);
+ }
+
+ @Override
+ 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) {
+ 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, Integer source) {
+ return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime, source);
+ }
+
+ @Override
+ public Long countUserOrderToApp(Long uid, Integer type, String startTime, String endTime,
+ Integer day, Integer source, Integer state, Integer stateOrder) {
+ return commonOrderMapper.countUserOrderToApp(uid, type, startTime, endTime, day, source, state, stateOrder);
+ }
+
+ private BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid) {
+ BigDecimal weiQuanMoney = new BigDecimal(0);
+ if (listWQ != null && listWQ.size() > 0) {
+ for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) {
+ String tradeId = weiQuanOrder.getOrderItemId();
+ // 鏌ヨ绾㈠寘
+ List<String> tradeList = new ArrayList<>();
+ tradeList.add(tradeId);
+ List<HongBaoV2> hongBaoList = hongBaoV2Service.listBySourceTypeAndTradeIdListAndUid(sourceType, uid,
+ tradeList);
+ if (hongBaoList != null && hongBaoList.size() > 0) {
+ CommonOrder commonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId);
+ if (commonOrder != null && commonOrder.getSettlement().compareTo(new BigDecimal(0)) > 0) {
+ BigDecimal wqMoney = MoneyBigDecimalUtil
+ .mul(hongBaoList.get(0).getMoney(), weiQuanOrder.getMoney())
+ .divide(commonOrder.getSettlement(), 2, BigDecimal.ROUND_UP);
+ if (wqMoney.compareTo(hongBaoList.get(0).getMoney()) > 0)
+ wqMoney = hongBaoList.get(0).getMoney();
+ weiQuanMoney = weiQuanMoney.add(wqMoney);
+ }
+ }
+ }
+ }
+ return weiQuanMoney;
+ }
+
+
+
@Override
@@ -1523,7 +1177,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)
+ Integer type, Integer orderState, String startTime, String endTime, Integer source,List<Long> listShopId,
+ List<Long> listGoodsId, Date minTime, BigDecimal money)
throws CommonOrderException {
List<CommonOrderVO> list = null;
@@ -1531,10 +1186,11 @@
if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗�
list = commonOrderMapper.listQueryWithNoChild(start, count, keyType, key, state, type, orderState,
startTime, endTime, source);
- } else
+ } else {
list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState, startTime, endTime,
- source);
-
+ source, listShopId, listGoodsId, minTime, money);
+ }
+
if (list == null) {
list = new ArrayList<CommonOrderVO>();
}
@@ -1718,12 +1374,15 @@
@Override
public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
- String startTime, String endTime, Integer source) throws CommonOrderException {
+ String startTime, String endTime, Integer source, List<Long> listShopId, List<Long> listGoodsId,
+ Date minTime, BigDecimal money) throws CommonOrderException {
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);
+ } else {
+ return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source, listShopId,
+ listGoodsId, minTime,money);
+ }
}
@Override
@@ -1919,4 +1578,22 @@
return commonOrderList.get(0);
}
+
+
+ @Override
+ public CommonOrderVO firstValidOrderByUid(Long uid) {
+ return commonOrderMapper.firstValidOrderByUid(uid, null, null);
+ }
+
+ @Override
+ public CommonOrderVO firstValidOrderByUidAndType(Long uid, Integer type) {
+ return commonOrderMapper.firstValidOrderByUid(uid, type, null);
+ }
+
+
+ @Override
+ public CommonOrderVO firstValidOrderLastMonthByUidAndType(Long uid, Integer type) {
+ return commonOrderMapper.firstValidOrderByUid(uid, type, 4);
+ }
+
}
--
Gitblit v1.8.0