sql 报错
This commit is contained in:
@@ -6,6 +6,7 @@ import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.modules.pay.dao.PayDetailsDao;
|
||||
import com.sqx.modules.pay.entity.PayDetails;
|
||||
import com.sqx.modules.pay.service.PayDetailsService;
|
||||
import com.sqx.modules.utils.TimeCompleteUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@@ -30,15 +31,15 @@ public class PayDetailsServiceImpl extends ServiceImpl<PayDetailsDao, PayDetails
|
||||
if (state != null && state == -1) {
|
||||
state = null;
|
||||
}
|
||||
return new PageUtils(payDetailsDao.selectPayDetails(pages, startTime, endTime, userId, state,userName,orderId));
|
||||
return new PageUtils(payDetailsDao.selectPayDetails(pages, TimeCompleteUtils.completeStartTime(startTime), TimeCompleteUtils.completeEndTime(endTime), userId, state,userName,orderId));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Double selectSumPay(String createTime, String endTime, Long userId) {
|
||||
if (userId == null || userId == -1) {
|
||||
return payDetailsDao.selectSumPay(createTime, endTime, null);
|
||||
return payDetailsDao.selectSumPay(TimeCompleteUtils.completeStartTime(createTime), TimeCompleteUtils.completeEndTime(endTime), null);
|
||||
}
|
||||
return payDetailsDao.selectSumPay(createTime, endTime, userId);
|
||||
return payDetailsDao.selectSumPay(TimeCompleteUtils.completeStartTime(createTime), TimeCompleteUtils.completeEndTime(endTime), userId);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -23,28 +23,6 @@
|
||||
update pay_details set `state`=#{state},pay_time=#{time},trade_no=#{tradeNo} where id=#{id}
|
||||
</update>
|
||||
|
||||
<select id=" selectPayDetails" resultType="Map">
|
||||
select s.id,s.classify,s.order_id as orderId,s.money,s.user_id as userId,
|
||||
s.state,s.create_time as createTime,s.pay_time as payTime,u.user_name as userName,u.phone
|
||||
from pay_details s
|
||||
left join tb_user u on u.user_id=s.user_id
|
||||
where 1=1
|
||||
<if test="startTime!=null and startTime!=''and endTime!=null and endTime!='' ">
|
||||
and str_to_date(s.create_time, '%Y-%m-%d') between str_to_date(#{startTime}, '%Y-%m-%d') AND str_to_date(#{endTime}, '%Y-%m-%d')
|
||||
</if>
|
||||
<if test="userId!=null">
|
||||
and u.user_id=#{userId}
|
||||
</if>
|
||||
<if test="state!=null and state!=-1">
|
||||
and s.state=#{state}
|
||||
</if>
|
||||
<if test="state==null or state==-1">
|
||||
and s.state!=-1
|
||||
</if>
|
||||
group by s.id
|
||||
order by s.create_time desc
|
||||
</select>
|
||||
|
||||
<select id="selectPayDetails" resultType="Map">
|
||||
select s.id,s.classify,s.order_id as orderId,s.money,s.user_id as userId,s.pay_diamond as payDiamond,s.diamond,
|
||||
s.state,s.create_time as createTime,s.pay_time as payTime,u.user_name as userName,u.phone
|
||||
@@ -52,8 +30,7 @@
|
||||
left join tb_user u on u.user_id=s.user_id
|
||||
where 1=1
|
||||
<if test="startTime!=null and startTime!=''and endTime!=null and endTime!='' ">
|
||||
and str_to_date(s.create_time, '%Y-%m-%d') between str_to_date(#{startTime}, '%Y-%m-%d') AND
|
||||
str_to_date(#{endTime}, '%Y-%m-%d')
|
||||
and s.create_time between #{startTime} AND #{endTime}
|
||||
</if>
|
||||
<if test="userName!=null and userName!=''">
|
||||
and u.user_name like concat("%",#{userName},"%")
|
||||
@@ -77,7 +54,7 @@
|
||||
|
||||
<select id="selectSumPay" resultType="Double">
|
||||
select sum(money) from pay_details
|
||||
where str_to_date(create_time, '%Y-%m-%d') BETWEEN str_to_date(#{createTime}, '%Y-%m-%d') AND str_to_date(#{endTime}, '%Y-%m-%d')
|
||||
where create_time BETWEEN #{createTime} AND #{endTime}
|
||||
<if test="userId!=null">
|
||||
and user_id=#{userId}
|
||||
</if>
|
||||
|
||||
Reference in New Issue
Block a user