From 075f6eceec6908178ba53b40b7794e2f90f74c92 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 09 一月 2019 17:40:10 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 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 0db452f..a398442 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
@@ -17,7 +17,6 @@
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
-import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.order.CommonOrder;
@@ -82,14 +81,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.listGroupOrderNoByUid(start, count, uid, state, type, orderState, orderNo, startTime,
+ 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.countGroupOrderNoByUid(uid, state, type, orderState, orderNo, startTime, endTime,
+ return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime,
dateType);
}
@@ -109,7 +108,7 @@
}
// 鍟嗗搧淇℃伅
- List<CommonOrderVO> listGoods = commonOrderMapper.listByOrderNoAndType(listOrder);
+ List<CommonOrderVO> listGoods = commonOrderMapper.listOrderGoodsInfo(listOrder);
// 璁㈠崟鍟嗗搧涓虹┖
if (listGoods == null || listGoods.size() == 0) {
return listOrder;
@@ -122,18 +121,18 @@
}
@Override
- public Map<String, BigDecimal> countOrderByHongBaoType(Long uid, Integer day) {
- return commonOrderMapper.countOrderByHongBaoType(uid, day);
+ public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day) {
+ return commonOrderMapper.countHistoryOrder(uid, day);
}
@Override
- public long countOrder(Long uid, Integer type, Integer day) {
- return commonOrderMapper.countBonusOrder(uid, type, day);
+ public long countBonusOrderNumber(Long uid, Integer type, Integer day, String startTime, String endTime) {
+ return commonOrderMapper.countBonusOrderNumber(uid, type, day, startTime, endTime);
}
@Override
- public BigDecimal countOrderMoney(Long uid, Integer type, Integer day) {
- return commonOrderMapper.countBonusOrderMoney(uid, type, day);
+ public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer day, String startTime, String endTime) {
+ return commonOrderMapper.countBonusOrderMoney(uid, type, day, startTime, endTime);
}
@Override
@@ -174,7 +173,8 @@
Integer hongBaoType = order.getHongBaoType();
// 閭�璇疯鍗曚俊鎭繚鎶�
if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
- || HongBaoV2.TYPE_ERJI == 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");
@@ -183,10 +183,16 @@
commonGoodsVO.setGoodsTitle(titleMap);
}
+ // 璐拱鏁伴噺
commonGoodsVO.setActualCount(commonOrder.getTotalCount() + "浠�");
- String settlement = commonOrder.getTotalSettlement().setScale(2, BigDecimal.ROUND_DOWN).toString();
- commonGoodsVO.setActualPay("瀹炰粯娆撅細楼" + settlement);
-
+
+ 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();
@@ -277,14 +283,14 @@
hongbaoInfo = "杩斿埄";
order.setOrderOrigin("1");
order.setHongBaoTypePic(CommonOrder.TYPE_FANLI);
- } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
- || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
+ } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {
// 鍒嗕韩
hongbaoInfo = "濂栭噾";
order.setOrderOrigin("2");
order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);
} else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
- || HongBaoV2.TYPE_ERJI == hongBaoType) {
+ || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
+ || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
// 閭�璇�
hongbaoInfo = "濂栭噾";
order.setOrderOrigin("3");
@@ -421,11 +427,6 @@
return commonOrderList;
}
- @Override
- public Map<String, Object> countMoneyGroupOrderNoByUid(Long uid, Integer type, String orderNo, String startTime,
- String endTime, Integer day) {
- return commonOrderMapper.countMoneyGroupOrderNoByUid(uid, type, orderNo, startTime, endTime, day);
- }
@Override
public long countByUidAndOrderStateWithOrderBalanceTime(Long uid, int state, Date minDate, Date maxDate) {
--
Gitblit v1.8.0