Selaa lähdekoodia

修改申请参会接口

huwhois 5 vuotta sitten
vanhempi
commit
fc9a80d3d5

+ 8 - 0
src/main/java/io/renren/modules/admin/entity/PaymentEntity.java

36
	 * 参会人员id
36
	 * 参会人员id
37
	 */
37
	 */
38
	private Long attendersId;
38
	private Long attendersId;
39
	/**
40
	 * 费用类型id
41
	 */
42
	private Long feeId;
39
	/**
43
	/**
40
	 * 缴费时间
44
	 * 缴费时间
41
	 */
45
	 */
52
	 * 金额
56
	 * 金额
53
	 */
57
	 */
54
	private BigDecimal money;
58
	private BigDecimal money;
59
	/**
60
	 * 发票抬头
61
	 */
62
	private Integer taxType;
55
	/**
63
	/**
56
	 * 发票抬头
64
	 * 发票抬头
57
	 */
65
	 */

+ 5 - 3
src/main/java/io/renren/modules/app/controller/OrderController.java

73
        attendersEntity.setName(user.getUsername());
73
        attendersEntity.setName(user.getUsername());
74
        attendersEntity.setPhone(user.getPhone());
74
        attendersEntity.setPhone(user.getPhone());
75
        attendersEntity.setEmail(user.getEmail());
75
        attendersEntity.setEmail(user.getEmail());
76
        Long typeId = params.containsKey("typeId") ? Long.valueOf(params.get("typeId").toString()) : 0L ;
77
        attendersEntity.setTypeId(typeId);
78
        Integer room = params.containsKey("room") ? Integer.valueOf(params.get("room").toString()) : 0 ;
76
        Integer room = params.containsKey("room") ? Integer.valueOf(params.get("room").toString()) : 0 ;
79
        attendersEntity.setRoom(room);
77
        attendersEntity.setRoom(room);
80
        Integer transfer = params.containsKey("transfer") ? Integer.valueOf(params.get("transfer").toString()) : 0 ;
78
        Integer transfer = params.containsKey("transfer") ? Integer.valueOf(params.get("transfer").toString()) : 0 ;
89

87

90
        // 付款信息
88
        // 付款信息
91
        PaymentEntity paymentEntity = new PaymentEntity();
89
        PaymentEntity paymentEntity = new PaymentEntity();
92

90
        
93
        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddhhmmss");
91
        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddhhmmss");
94
        String nowtime = sdf.format(new Date());
92
        String nowtime = sdf.format(new Date());
95
        // System.out.println(time);
93
        // System.out.println(time);
97
        paymentEntity.setOrderId("FY" + nowtime + fourRandom);
95
        paymentEntity.setOrderId("FY" + nowtime + fourRandom);
98
        paymentEntity.setMeetingId(meetingId);
96
        paymentEntity.setMeetingId(meetingId);
99
        paymentEntity.setAttendersId(attendersEntity.getId());
97
        paymentEntity.setAttendersId(attendersEntity.getId());
98
        Long feeId = params.containsKey("feeId") ? Long.valueOf(params.get("feeId").toString()) : 0L ;
99
        attendersEntity.setTypeId(feeId);
100
        paymentEntity.setPayType(1);
100
        paymentEntity.setPayType(1);
101
        Integer taxType = params.containsKey("taxType") ? Integer.valueOf(params.get("taxType").toString()) : 0;
102
        paymentEntity.setTaxType(taxType);
101
        String taxTitle = params.containsKey("taxTitle") ? params.get("taxTitle").toString() : "";
103
        String taxTitle = params.containsKey("taxTitle") ? params.get("taxTitle").toString() : "";
102
        paymentEntity.setTaxTitle(taxTitle);
104
        paymentEntity.setTaxTitle(taxTitle);
103
        String taxNumber = params.containsKey("taxNumber") ? params.get("taxNumber").toString() : "";
105
        String taxNumber = params.containsKey("taxNumber") ? params.get("taxNumber").toString() : "";

+ 47 - 0
src/main/java/io/renren/modules/app/controller/TypesOfFee.java

1
package io.renren.modules.app.controller;
2
3
import java.math.BigDecimal;
4
import java.util.Arrays;
5
import java.util.Map;
6
7
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
8
9
import java.util.Date;
10
import java.util.List;
11
12
import org.springframework.beans.factory.annotation.Autowired;
13
import org.springframework.web.bind.annotation.PathVariable;
14
import org.springframework.web.bind.annotation.RequestMapping;
15
import org.springframework.web.bind.annotation.GetMapping;
16
import org.springframework.web.bind.annotation.RestController;
17
18
import io.renren.modules.admin.entity.TypesOfFeeEntity;
19
import io.renren.modules.admin.service.TypesOfFeeService;
20
import io.renren.common.utils.R;
21
22
23
24
/**
25
 * 费用类型表
26
 *
27
 * @author chenshun
28
 * @email sunlightcs@gmail.com
29
 * @date 2020-02-24 10:38:03
30
 */
31
@RestController
32
@RequestMapping("app/typesoffee")
33
public class TypesOfFee {
34
    @Autowired
35
    private TypesOfFeeService typesOfFeeService;
36
37
    /**
38
     * 列表
39
     */
40
    @GetMapping("/list/{mid}")
41
    public R list(@PathVariable("mid") Long mid){
42
        List<TypesOfFeeEntity> feeList = typesOfFeeService.list(
43
            new QueryWrapper<TypesOfFeeEntity>().eq("meeting_id", mid));
44
            
45
        return R.ok().put("feeList", feeList);
46
    }
47
}