From c9f28b430799cc8d40c7a7d99fd0f0eeecff6a5c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 14:26:10 +0800
Subject: [PATCH] 删除老版密码输入错误的相关代码
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ScanHistoryServiceImpl.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ScanHistoryServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ScanHistoryServiceImpl.java
index 46f74e1..6242209 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ScanHistoryServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ScanHistoryServiceImpl.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.user;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Calendar;
@@ -21,7 +22,7 @@
import com.yeshi.fanli.dao.user.ScanHistoryDao;
import com.yeshi.fanli.entity.admin.ScanHistoryAdmin;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.ScanHistory;
import com.yeshi.fanli.entity.taobao.SearchFilter;
@@ -216,12 +217,9 @@
List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();
List<TaoBaoGoodsBriefExtra> tbbeList = new ArrayList<TaoBaoGoodsBriefExtra>();
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;
- Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal rate = hongBaoManageService.getFanLiRate();
for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {
- taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,
- fcRate, "");
+ taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, rate.toString(), "");
tbbeList.add(taoBaoGoodsBriefExtra);
}
return tbbeList;
@@ -230,7 +228,7 @@
}
- public void deleteScanHistory(final String device, final System sys, final long uid) {
+ public void deleteScanHistory(final String device, final BusinessSystem sys, final long uid) {
scanHistoryDao.excute(new HibernateCallback() {
public Object doInHibernate(Session session) throws HibernateException {
@@ -253,7 +251,7 @@
});
}
- public void deleteScanHistory(final String device, final System sys, final long auctionId, final long uid) {
+ public void deleteScanHistory(final String device, final BusinessSystem sys, final long auctionId, final long uid) {
scanHistoryDao.excute(new HibernateCallback() {
public Object doInHibernate(Session session) throws HibernateException {
--
Gitblit v1.8.0