From 31c87f9868f01facd0c360ab49e3970beca9988d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 22 三月 2019 09:27:39 +0800
Subject: [PATCH] Bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
index 28b1cc5..b7dfe1a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.hongbao;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
@@ -19,7 +20,6 @@
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;
import com.yeshi.fanli.dao.mybatis.order.HongBaoOrderMapper;
-import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;
import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
@@ -66,9 +66,6 @@
private TaoBaoOrderMapper taoBaoOrderMapper;
@Resource
- private OrderItemMapper orderItemMapper;
-
- @Resource
private CommonOrderMapper commonOrderMapper;
@Resource
@@ -91,7 +88,6 @@
@Resource
private UserShareGoodsGroupService userShareGoodsGroupService;
-
@Resource
private HongBaoManageService hongBaoManageService;
@@ -149,7 +145,6 @@
public HongBaoV2 selectByPrimaryKey(Long id) {
return hongBaoV2Mapper.selectByPrimaryKey(id);
}
-
@Transactional
@Override
@@ -833,4 +828,15 @@
else
return money;
}
+
+ @Override
+ public BigDecimal computeMoneyByUidAndState(Long uid, int state) {
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add(state);
+ BigDecimal money = hongBaoV2Mapper.computeMoneyByUidAndState(uid, stateList);
+ if (money == null)
+ return new BigDecimal(0);
+ else
+ return money;
+ }
}
--
Gitblit v1.8.0