From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 11:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShamUserServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShamUserServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShamUserServiceImpl.java
index 38eb477..82bf8cb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShamUserServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShamUserServiceImpl.java
@@ -57,7 +57,7 @@
public List<ShamUser> doInHibernate(Session session)
throws HibernateException {
- SQLQuery query = session.createSQLQuery("SELECT * FROM yeshi_ec_demouser ORDER BY id desc").addEntity(ShamUser.class);
+ SQLQuery query = session.createSQLQuery("SELECT * FROM yeshi_ec_sham_user").addEntity(ShamUser.class);
query.setFirstResult(0);
query.setMaxResults(sum);
List<ShamUser> list = query.list();
@@ -190,6 +190,15 @@
return shamUserMapper.listByDistinctPicUrl(start, count);
}
+ @Override
+ public int insertBatch(List<ShamUser> list) {
+ return shamUserMapper.insertBatch(list);
+ }
+
+ @Override
+ public int updateBatchSelective(List<ShamUser> list) {
+ return shamUserMapper.updateBatchSelective(list);
+ }
@Override
public List<ShamUser> listRandCouponUser(int count, int smallTime, int largeTime) {
@@ -253,7 +262,8 @@
}
BigDecimal money = shareMoney.multiply(new BigDecimal(((Integer) listMultiple.get(i)).intValue())).setScale(2, 1);
- shamUser.setMsg("鍒嗕韩浜嗚繖涓晢鍝�,绱鑾峰緱<font color=\"red\">濂栭噾" + money + "</font>");
+ // 蹇呴』鍖呭惈 銆愬閲懧ャ�� 杩�3涓鍙凤紝 鐢ㄤ簬鍓嶇棰滆壊鍖哄垎
+ shamUser.setMsg("鍒嗕韩浜嗚繖涓晢鍝�,绱鑾峰緱濂栭噾楼" + money);
}
return listRand;
--
Gitblit v1.8.0