修改申请参会接口

src/main/java/io/renren/modules/admin/entity/PaymentEntity.java

@@ -36,6 +36,10 @@ public class PaymentEntity implements Serializable {
	 * 参会人员id
	 */
	private Long attendersId;
	/**
	 * 费用类型id
	 */
	private Long feeId;
	/**
	 * 缴费时间
	 */
@@ -52,6 +56,10 @@ public class PaymentEntity implements Serializable {
	 * 金额
	 */
	private BigDecimal money;
	/**
	 * 发票抬头
	 */
	private Integer taxType;
	/**
	 * 发票抬头
	 */

src/main/java/io/renren/modules/app/controller/OrderController.java

@@ -73,8 +73,6 @@ public class OrderController {
        attendersEntity.setName(user.getUsername());
        attendersEntity.setPhone(user.getPhone());
        attendersEntity.setEmail(user.getEmail());
        Long typeId = params.containsKey("typeId") ? Long.valueOf(params.get("typeId").toString()) : 0L ;
        attendersEntity.setTypeId(typeId);
        Integer room = params.containsKey("room") ? Integer.valueOf(params.get("room").toString()) : 0 ;
        attendersEntity.setRoom(room);
        Integer transfer = params.containsKey("transfer") ? Integer.valueOf(params.get("transfer").toString()) : 0 ;
@@ -89,7 +87,7 @@ public class OrderController {
        // 付款信息
        PaymentEntity paymentEntity = new PaymentEntity();
        
        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddhhmmss");
        String nowtime = sdf.format(new Date());
        // System.out.println(time);
@@ -97,7 +95,11 @@ public class OrderController {
        paymentEntity.setOrderId("FY" + nowtime + fourRandom);
        paymentEntity.setMeetingId(meetingId);
        paymentEntity.setAttendersId(attendersEntity.getId());
        Long feeId = params.containsKey("feeId") ? Long.valueOf(params.get("feeId").toString()) : 0L ;
        attendersEntity.setTypeId(feeId);
        paymentEntity.setPayType(1);
        Integer taxType = params.containsKey("taxType") ? Integer.valueOf(params.get("taxType").toString()) : 0;
        paymentEntity.setTaxType(taxType);
        String taxTitle = params.containsKey("taxTitle") ? params.get("taxTitle").toString() : "";
        paymentEntity.setTaxTitle(taxTitle);
        String taxNumber = params.containsKey("taxNumber") ? params.get("taxNumber").toString() : "";

src/main/java/io/renren/modules/app/controller/TypesOfFee.java

@@ -0,0 +1,47 @@
package io.renren.modules.app.controller;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.util.Date;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import io.renren.modules.admin.entity.TypesOfFeeEntity;
import io.renren.modules.admin.service.TypesOfFeeService;
import io.renren.common.utils.R;
/**
 * 费用类型表
 *
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-02-24 10:38:03
 */
@RestController
@RequestMapping("app/typesoffee")
public class TypesOfFee {
    @Autowired
    private TypesOfFeeService typesOfFeeService;
    /**
     * 列表
     */
    @GetMapping("/list/{mid}")
    public R list(@PathVariable("mid") Long mid){
        List<TypesOfFeeEntity> feeList = typesOfFeeService.list(
            new QueryWrapper<TypesOfFeeEntity>().eq("meeting_id", mid));
            
        return R.ok().put("feeList", feeList);
    }
}