huwhois лет назад: 5
Родитель
Сommit
7845f8c960

+ 8 - 6
src/main/java/io/renren/modules/admin/controller/PaymentController.java

@ -5,7 +5,9 @@ import java.util.Map;
5 5
6 6
import org.apache.shiro.authz.annotation.RequiresPermissions;
7 7
import org.springframework.beans.factory.annotation.Autowired;
8
import org.springframework.web.bind.annotation.GetMapping;
8 9
import org.springframework.web.bind.annotation.PathVariable;
10
import org.springframework.web.bind.annotation.PostMapping;
9 11
import org.springframework.web.bind.annotation.RequestBody;
10 12
import org.springframework.web.bind.annotation.RequestMapping;
11 13
import org.springframework.web.bind.annotation.RequestParam;
@ -32,10 +34,10 @@ public class PaymentController {
32 34
    /**
33 35
     * 列表
34 36
     */
35
    @RequestMapping("/list")
37
    @GetMapping("/list")
36 38
    @RequiresPermissions("admin:payment:list")
37 39
    public R list(@RequestParam Map<String, Object> params){
38
        PageUtils page = paymentService.queryPage(params);
40
        PageUtils page = paymentService.myQueryPage(params);
39 41
40 42
        return R.ok().put("page", page);
41 43
    }
@ -43,7 +45,7 @@ public class PaymentController {
43 45
    /**
44 46
     * 信息
45 47
     */
46
    @RequestMapping("/info/{id}")
48
    @GetMapping("/info/{id}")
47 49
    @RequiresPermissions("admin:payment:info")
48 50
    public R info(@PathVariable("id") Long id){
49 51
		PaymentEntity payment = paymentService.getById(id);
@ -54,7 +56,7 @@ public class PaymentController {
54 56
    /**
55 57
     * 保存
56 58
     */
57
    @RequestMapping("/save")
59
    @PostMapping("/save")
58 60
    @RequiresPermissions("admin:payment:save")
59 61
    public R save(@RequestBody PaymentEntity payment){
60 62
		paymentService.save(payment);
@ -65,7 +67,7 @@ public class PaymentController {
65 67
    /**
66 68
     * 修改
67 69
     */
68
    @RequestMapping("/update")
70
    @PostMapping("/update")
69 71
    @RequiresPermissions("admin:payment:update")
70 72
    public R update(@RequestBody PaymentEntity payment){
71 73
		paymentService.updateById(payment);
@ -76,7 +78,7 @@ public class PaymentController {
76 78
    /**
77 79
     * 删除
78 80
     */
79
    @RequestMapping("/delete")
81
    @PostMapping("/delete")
80 82
    @RequiresPermissions("admin:payment:delete")
81 83
    public R delete(@RequestBody Long[] ids){
82 84
		paymentService.removeByIds(Arrays.asList(ids));

+ 8 - 0
src/main/java/io/renren/modules/admin/dao/PaymentDao.java

@ -3,6 +3,10 @@ package io.renren.modules.admin.dao;
3 3
import io.renren.modules.admin.entity.PaymentEntity;
4 4
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5 5
import org.apache.ibatis.annotations.Mapper;
6
import org.apache.ibatis.annotations.Select;
7
8
import java.util.List;
9
import java.util.Map;
6 10
7 11
/**
8 12
 * 
@ -13,5 +17,9 @@ import org.apache.ibatis.annotations.Mapper;
13 17
 */
14 18
@Mapper
15 19
public interface PaymentDao extends BaseMapper<PaymentEntity> {
20
    @Select("select p.id, p.order_id orderId, mem.truename, mem.organization, p.pay_type payType, mem.phone, mem.email, p.pay_time payTime,p.is_check isPay from attenders join payment p on attenders.id=p.attenders_id join member mem on mem.id=attenders.member_id where p.meeting_id=#{meetingId} and attenders.is_del=0 and p.is_del=0 and (mem.truename like '%${name}%' or p.order_id like '%${order}%') limit #{page},#{limit};")
21
    List<Map<String, Object>> myQueryPage(Long meetingId, String name, String order, int page, int limit);
16 22
23
    @Select("select count(*) from attenders join payment p on attenders.id=p.attenders_id join member mem on mem.id=attenders.member_id where p.meeting_id=#{meetingId} and attenders.is_del=0 and p.is_del=0 and (mem.truename like '%${name}%' or p.order_id like '%${order}%');")
24
    int myQueryPageCounts(Long meetingId, String name, String order);
17 25
}

+ 2 - 0
src/main/java/io/renren/modules/admin/service/PaymentService.java

@ -17,6 +17,8 @@ public interface PaymentService extends IService<PaymentEntity> {
17 17
18 18
    PageUtils queryPage(Map<String, Object> params);
19 19
20
    PageUtils myQueryPage(Map<String, Object> params);
21
20 22
	void savePayment(PaymentEntity payment);
21 23
}
22 24

+ 13 - 0
src/main/java/io/renren/modules/admin/service/impl/PaymentServiceImpl.java

@ -4,6 +4,7 @@ import org.springframework.stereotype.Service;
4 4
5 5
import java.text.SimpleDateFormat;
6 6
import java.util.Date;
7
import java.util.List;
7 8
import java.util.Map;
8 9
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
9 10
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -29,6 +30,18 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentDao, PaymentEntity> i
29 30
        return new PageUtils(page);
30 31
    }
31 32
33
    @Override
34
    public PageUtils myQueryPage(Map<String, Object> params) {
35
        Long meetingId = Long.valueOf(params.get("meetingId").toString());
36
        String key = (String) params.get("key");
37
        int page = Integer.valueOf((String) params.get("page"));
38
        int limit = Integer.valueOf((String) params.get("limit"));
39
        List<Map<String, Object>> list = baseMapper.myQueryPage(meetingId, key, key, page, limit); 
40
        int total = baseMapper.myQueryPageCounts(meetingId, key, key);
41
42
        return new PageUtils(list, total, limit, page);
43
    }
44
32 45
    @Override
33 46
    public void savePayment(PaymentEntity payment) {
34 47
        payment.setCreateTime(new Date());

+ 1 - 1
src/main/resources/application-dev.yml

@ -3,7 +3,7 @@ spring:
3 3
        type: com.alibaba.druid.pool.DruidDataSource
4 4
        druid:
5 5
            driver-class-name: com.mysql.cj.jdbc.Driver
6
            url: jdbc:mysql://121.42.53.174:3306/meeting?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
6
            url: jdbc:mysql://121.42.53.174:3306/meeting?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
7 7
            username: root
8 8
            password: root001
9 9
            initial-size: 10