cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

调整用户账单页面

Browse Source
This commit is contained in:
xuwenbo
2020-09-05 17:46:57 +08:00
parent 88ea4ced2b
commit 5e57a726fe
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yshop-mall/src/main/java/co/yixiang/modules/user/service/dto/YxUserBillQueryCriteria.java
View File

@ -5,6 +5,7 @@
*/ */
package co.yixiang.modules.user.service.dto; package co.yixiang.modules.user.service.dto;
import co.yixiang.annotation.Query;
import lombok.Data; import lombok.Data;
/** /**
@ -16,4 +17,11 @@ public class YxUserBillQueryCriteria{
private String nickname; private String nickname;
private String category; private String category;
private String type; private String type;
@Query(type = Query.Type.EQUAL)
private Integer pm;
@Query(type = Query.Type.EQUAL)
private String title;
private String startTime;
private String endTime;
} }

20
yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java
View File

@ -24,6 +24,8 @@ import co.yixiang.modules.user.service.mapper.UserBillMapper;
import co.yixiang.modules.user.vo.BillVo; import co.yixiang.modules.user.vo.BillVo;
import co.yixiang.modules.user.vo.YxUserBillQueryVo; import co.yixiang.modules.user.vo.YxUserBillQueryVo;
import co.yixiang.utils.FileUtil; import co.yixiang.utils.FileUtil;
import co.yixiang.utils.OrderUtil;
import co.yixiang.utils.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -38,6 +40,8 @@ import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -269,7 +273,21 @@ public class YxUserBillServiceImpl extends BaseServiceImpl<UserBillMapper, YxUse
@Override @Override
public List<YxUserBillDto> queryAll(YxUserBillQueryCriteria criteria){ public List<YxUserBillDto> queryAll(YxUserBillQueryCriteria criteria){
return baseMapper.findAllByQueryCriteria(criteria.getCategory(),criteria.getType(),criteria.getNickname()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Integer date =null;
Integer date1 = null;
if(StringUtils.isNotEmpty(criteria.getStartTime())){
try {
date = OrderUtil.dateToTimestamp(sdf.parse(criteria.getStartTime()));
if(StringUtils.isNotEmpty(criteria.getEndTime())){
date1 = OrderUtil.dateToTimestamp(sdf.parse(criteria.getEndTime()))+24*60*60;
}
} catch (ParseException e) {
e.printStackTrace();
}
}
return baseMapper.findAllByQueryCriteria(criteria.getCategory(),criteria.getType(),criteria.getNickname(),criteria.getPm(),date,date1,criteria.getTitle());
} }

9
yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java
View File

@ -78,11 +78,14 @@ public interface UserBillMapper extends CoreMapper<YxUserBill> {
"and uid=#{uid} and TO_DAYS(NOW()) - TO_DAYS(create_time) <= 1") "and uid=#{uid} and TO_DAYS(NOW()) - TO_DAYS(create_time) <= 1")
double sumYesterdayPrice(@Param("uid") Long uid); double sumYesterdayPrice(@Param("uid") Long uid);
@Select("<script> select b.title,b.pm,b.category,b.type,b.number,b.create_time ,u.nickname " + @Select("<script> select b.title,b.pm,b.category,b.type,b.number,b.add_time ,u.nickname " +
"from yx_user_bill b left join yx_user u on u.uid=b.uid where 1=1 " + "from yx_user_bill b left join yx_user u on u.uid=b.uid where 1=1 " +
"<if test =\"category !=''\">and b.category=#{category}</if> " + "<if test =\"category !=''\">and b.category=#{category}</if> " +
"<if test =\"type !=''\">and b.type=#{type}</if> " + "<if test =\"type !=''\">and b.type=#{type}</if> " +
"<if test =\"title !=''\">and b.title=#{title}</if> " +
"<if test =\"pm !=null\">and b.pm=#{pm}</if> " +
"<if test =\"date !=null\">and b.add_time &gt;= ${date}</if> " +
"<if test =\"date1 !=null\">and b.add_time &lt;= ${date1}</if> " +
"<if test =\"nickname !=''\">and u.nickname LIKE CONCAT('%',#{nickname},'%')</if> </script> ") "<if test =\"nickname !=''\">and u.nickname LIKE CONCAT('%',#{nickname},'%')</if> </script> ")
List<YxUserBillDto> findAllByQueryCriteria(@Param("category") String category, @Param("type") String type, List<YxUserBillDto> findAllByQueryCriteria(@Param("category") String category, @Param("type") String type, @Param("nickname") String nickname, @Param("pm") Integer pm, @Param("date")Integer date, @Param("date1")Integer date1,@Param("title")String title);
@Param("nickname") String nickname);
} }